aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBill Nottingham <notting@redhat.com>1999-04-15 13:53:34 +0000
committerBill Nottingham <notting@redhat.com>1999-04-15 13:53:34 +0000
commitea3bd14beeed36d0f761e3277678623cde13a586 (patch)
treeb99d057c15f5c4e2ee4ea2f9d5c808dfbb172b6e
parentec8b3f7b5048defd1506f9419392f06c3b64fcf1 (diff)
downloadinitscripts-ea3bd14beeed36d0f761e3277678623cde13a586.tar
initscripts-ea3bd14beeed36d0f761e3277678623cde13a586.tar.gz
initscripts-ea3bd14beeed36d0f761e3277678623cde13a586.tar.bz2
initscripts-ea3bd14beeed36d0f761e3277678623cde13a586.tar.xz
initscripts-ea3bd14beeed36d0f761e3277678623cde13a586.zip
dpn't run rpmnew scripts either
-rwxr-xr-xrc.d/init.d/single1
-rwxr-xr-xrc.d/rc10
2 files changed, 7 insertions, 4 deletions
diff --git a/rc.d/init.d/single b/rc.d/init.d/single
index 0f061b8a..0bcb9dab 100755
--- a/rc.d/init.d/single
+++ b/rc.d/init.d/single
@@ -42,6 +42,7 @@ for i in /etc/rc.d/rc1.d/S[0-9][0-9]*; do
# Don't run [KS]??foo.{rpmsave,rpmorig} scripts
[ "${i%.rpmsave}" != "${i}" ] && continue
[ "${i%.rpmorig}" != "${i}" ] && continue
+ [ "${i%.rpmnew}" != "${i}" ] && continue
[ "$i" = "/etc/rc.d/rc1.d/S00single" ] && continue
$i start
done
diff --git a/rc.d/rc b/rc.d/rc
index 533c4de5..bd0448c7 100755
--- a/rc.d/rc
+++ b/rc.d/rc
@@ -42,8 +42,9 @@ if [ -d /etc/rc.d/rc$runlevel.d ]; then
[ ! -f $i ] && continue
# Don't run [KS]??foo.{rpmsave,rpmorig} scripts
- [ "${1%.rpmsave}" != "${1}" ] && continue
- [ "${1%.rpmorig}" != "${1}" ] && continue
+ [ "${i%.rpmsave}" != "${i}" ] && continue
+ [ "${i%.rpmorig}" != "${i}" ] && continue
+ [ "${i%.rpmnew}" != "${i}" ] && continue
# Check if the subsystem is already up.
subsys=${i#/etc/rc.d/rc$runlevel.d/K??}
@@ -64,8 +65,9 @@ if [ -d /etc/rc.d/rc$runlevel.d ]; then
[ ! -f $i ] && continue
# Don't run [KS]??foo.{rpmsave,rpmorig} scripts
- [ "${1%.rpmsave}" != "${1}" ] && continue
- [ "${1%.rpmorig}" != "${1}" ] && continue
+ [ "${i%.rpmsave}" != "${i}" ] && continue
+ [ "${i%.rpmorig}" != "${i}" ] && continue
+ [ "${i%.rpmnew}" != "${i}" ] && continue
# Check if the subsystem is already up.
subsys=${i#/etc/rc.d/rc$runlevel.d/S??}