diff options
| author | Bill Nottingham <notting@redhat.com> | 2006-02-06 20:18:34 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2006-02-06 20:18:34 +0000 |
| commit | 3ec1a6e3d9d1fe0007b41105dc8196765765d0ed (patch) | |
| tree | 2a8de9279708e64c0fdab3763327a5a49cceb802 | |
| parent | ee396b2a0571a1ecd73ed0f1a65b4d213984018e (diff) | |
| download | initscripts-3ec1a6e3d9d1fe0007b41105dc8196765765d0ed.tar initscripts-3ec1a6e3d9d1fe0007b41105dc8196765765d0ed.tar.gz initscripts-3ec1a6e3d9d1fe0007b41105dc8196765765d0ed.tar.bz2 initscripts-3ec1a6e3d9d1fe0007b41105dc8196765765d0ed.tar.xz initscripts-3ec1a6e3d9d1fe0007b41105dc8196765765d0ed.zip | |
dirty hacks to make sure hotplug doesn't run after unclean shutdown
(#177795)
| -rwxr-xr-x | rc.d/rc.sysinit | 6 | ||||
| -rwxr-xr-x | sysconfig/network-scripts/net.hotplug | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit index 1e4349d7..39031af5 100755 --- a/rc.d/rc.sysinit +++ b/rc.d/rc.sysinit @@ -153,6 +153,8 @@ if [ -f /proc/sys/kernel/modprobe ]; then fi fi +touch /dev/.in_sysinit >/dev/null 2>&1 + /sbin/start_udev # Load other user-defined modules @@ -529,7 +531,9 @@ fi rm -f /tmp/.X*-lock /tmp/.lock.* /tmp/.gdm_socket /tmp/.s.PGSQL.* rm -rf /tmp/.X*-unix /tmp/.ICE-unix /tmp/.font-unix /tmp/hsperfdata_* \ /tmp/kde-* /tmp/ksocket-* /tmp/mc-* /tmp/mcop-* /tmp/orbit-* \ - /tmp/scrollkeeper-* /tmp/ssh-* + /tmp/scrollkeeper-* /tmp/ssh-* \ + /dev/.in_sysinit + # Make ICE directory mkdir -m 1777 -p /tmp/.ICE-unix >/dev/null 2>&1 chown root:root /tmp/.ICE-unix diff --git a/sysconfig/network-scripts/net.hotplug b/sysconfig/network-scripts/net.hotplug index b59d87e4..543fb541 100755 --- a/sysconfig/network-scripts/net.hotplug +++ b/sysconfig/network-scripts/net.hotplug @@ -9,6 +9,9 @@ fi case $ACTION in add|register) # Don't do anything if the network is stopped + if [ -f /dev/.in_sysinit ] ; then + exit 0 + fi if [ ! -f /var/lock/subsys/network ]; then exit 0 fi |