Be consistent with etc scripts, trying harder to rpm-upgrade them