diff options
| author | Bill Nottingham <notting@redhat.com> | 2007-08-29 17:22:03 +0000 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2007-08-29 17:22:03 +0000 |
| commit | fbfc09e16e981513e9e4ed8cce4513798f0b1b2c (patch) | |
| tree | 34046ccfa706eae773a2abc89477bf9cdb000fa6 | |
| parent | f0258d6553a3037824f538c997f964987c10c337 (diff) | |
| download | initscripts-fbfc09e16e981513e9e4ed8cce4513798f0b1b2c.tar initscripts-fbfc09e16e981513e9e4ed8cce4513798f0b1b2c.tar.gz initscripts-fbfc09e16e981513e9e4ed8cce4513798f0b1b2c.tar.bz2 initscripts-fbfc09e16e981513e9e4ed8cce4513798f0b1b2c.tar.xz initscripts-fbfc09e16e981513e9e4ed8cce4513798f0b1b2c.zip | |
adapt to new nut usage, conflict with older packages (#252973)
| -rw-r--r-- | initscripts.spec | 2 | ||||
| -rwxr-xr-x | rc.d/init.d/halt | 10 |
2 files changed, 8 insertions, 4 deletions
diff --git a/initscripts.spec b/initscripts.spec index 19bad442..36abea5f 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -24,6 +24,8 @@ Conflicts: dhclient < 3.0.3-7 Conflicts: tcsh < 6.13-5 Conflicts: xorg-x11, glib2 < 2.11.1-2 Conflicts: alsa-utils < 1.0.14-0.5.rc2.fc7 +# http://bugzilla.redhat.com/show_bug.cgi?id=252973 +Conflicts: nut < 2.2.0 Obsoletes: rhsound sapinit Obsoletes: hotplug Prereq: /sbin/chkconfig, /usr/sbin/groupadd, /bin/sed, coreutils diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index 74bcb635..a6d719ef 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -204,12 +204,14 @@ elif [ -f /forcefsck ]; then echo $"On the next boot fsck will be forced." fi -if [ "$command" = /sbin/halt -a -r /etc/ups/upsmon.conf -a -f /etc/killpower -a -f /etc/sysconfig/ups ] ; then +# Shutdown UPS drivers +if [ "$command" = /sbin/halt -a -f /etc/sysconfig/ups ]; then . /etc/sysconfig/ups - if [ "$SERVER" = "yes" -a "$MODEL" = "upsdrvctl" ] ; then + if [ -z $POWERDOWNFLAG ]; then + POWERDOWNFLAG=/etc/killpower + fi + if [ "$SERVER" = "yes" -a -f $POWERDOWNFLAG ]; then /sbin/upsdrvctl shutdown - elif [ "$SERVER" = "yes" -a "$MODEL" != "NONE" -a -n "$MODEL" -a -n "$DEVICE" ] ; then - $MODEL $OPTIONS_HALT -k $DEVICE fi fi |