aboutsummaryrefslogtreecommitdiffstats
path: root/rc.d
diff options
context:
space:
mode:
authorThan Ngo <than@redhat.com>2003-09-15 11:35:16 +0000
committerThan Ngo <than@redhat.com>2003-09-15 11:35:16 +0000
commit1c893bbe0e93dce24b7dbfb392b2964ddf73b1b7 (patch)
treec0ac47bc76938a531fe92e1b7ae9e396220e0926 /rc.d
parent903a904227ff876e31692054edf5e416679b2228 (diff)
downloadinitscripts-1c893bbe0e93dce24b7dbfb392b2964ddf73b1b7.tar
initscripts-1c893bbe0e93dce24b7dbfb392b2964ddf73b1b7.tar.gz
initscripts-1c893bbe0e93dce24b7dbfb392b2964ddf73b1b7.tar.bz2
initscripts-1c893bbe0e93dce24b7dbfb392b2964ddf73b1b7.tar.xz
initscripts-1c893bbe0e93dce24b7dbfb392b2964ddf73b1b7.zip
use upsdrvctl to start the shutdown process
Diffstat (limited to 'rc.d')
-rwxr-xr-xrc.d/init.d/halt6
1 files changed, 5 insertions, 1 deletions
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index d7d113f5..660834db 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -194,7 +194,11 @@ fi
if [ "$command" = /sbin/halt -a -r /etc/ups/upsmon.conf -a -f /etc/killpower -a -f /etc/sysconfig/ups ] ; then
. /etc/sysconfig/ups
- [ "$SERVER" = "yes" -a "$MODEL" != "NONE" -a -n "$MODEL" -a -n "$DEVICE" ] && $MODEL $OPTIONS_HALT -k $DEVICE
+ if [ "$SERVER" = "yes" -a "$MODEL" = "upsdrvctl" ] ; then
+ /sbin/upsdrvctl shutdown
+ elif [ "$SERVER" = "yes" -a "$MODEL" != "NONE" -a -n "$MODEL" -a -n "$DEVICE" ] ; then
+ $MODEL $OPTIONS_HALT -k $DEVICE
+ fi
fi
if [ -x /sbin/halt.local ]; then
class='nohover-highlight'>| | | | | (was still there in expert) * updated @locales listPablo Saratxaga2003-02-171-2/+4 | * given default size of / increased.Francois Pons2003-02-171-2/+2 | * increased /var container for suggestion (simple or with /usr).Francois Pons2003-02-171-2/+2 | * add a reboot if not enough free space is available for installation or upgrade.Francois Pons2003-02-171-1/+5 | * fixed command insmod.Francois Pons2003-02-171-1/+2 | * bump version numberThierry Vignaud2003-02-171-1/+1 | * synced with msecThierry Vignaud2003-02-171-1/+1 | * *** empty log message ***Pascal Rigaux2003-02-171-1/+39 | * add a checkbox "Force ACPI"Pascal Rigaux2003-02-171-0/+9 | * propagate /proc/cmdline acpi=xxxPascal Rigaux2003-02-171-1/+3 | * have acpi=off by defaultPascal Rigaux2003-02-171-0/+1 | * fix pop_it...Pascal Rigaux2003-02-171-1/+1 | * ensure $o->{raw_X} is not destroyed when there is no modification donePascal Rigaux2003-02-171-1/+2 | | | | | (since in that case Xconfig::main::configure_everything_or_configure_chooser() returns undef) * 9.1-0.34mdkTill Kamppeter2003-02-171-2/+5 | * *** empty log message ***Pascal Rigaux2003-02-171-1/+123 | * hopefully final fix for pop_itPascal Rigaux2003-02-171-2/+2 | * - Fixed bug of HP DeskJetb 990C being automatically installed even ifTill Kamppeter2003-02-171-11/+21 | | | | | | there is already a queue for it - Fixed checking whether a device is known to CUPS * (is_fbdev): fix typoPascal Rigaux2003-02-171-1/+1 | * (get_both): fix typoPascal Rigaux2003-02-171-1/+1 | * also ->hide in when a button is clicked in standalonePascal Rigaux2003-02-171-10/+2 | * don't security::various::config_security_user() can fail, don't let it bother usPascal Rigaux2003-02-171-1/+1 | * (to_string): simpler way to handle the "default" resolution of frame-bufferPascal Rigaux2003-02-171-1/+1 | * 9.1 rc1Florent Villard2003-02-171-0/+0 | * use fbdev when the graphic card is unknownPascal Rigaux2003-02-171-5/+9 | * warn when auto conf failPascal Rigaux2003-02-171-1/+4 | * add module2description()Pascal Rigaux2003-02-171-3/+9 | * correction for non-latin1 locales,Pablo Saratxaga2003-02-171-2/+6 | | | | | made strings "Unknown" and "unknown" translatable in device info * in the old days, on cannot disable shrink1, resize2 or shrink2 since they ↵Thierry Vignaud2003-02-171-2/+5 | | | | always were true * better sound card description in summaryPascal Rigaux2003-02-171-1/+3 | * enhance summary layoutPascal Rigaux2003-02-171-2/+4 | * fix help popping all the timePascal Rigaux2003-02-171-1/+1 | * 9.1-0.33mdkThierry Vignaud2003-02-171-1/+8 | * fix setting pop_it for wizard in standalonePascal Rigaux2003-02-171-1/+2 | * updated Russian and Arabic filesPablo Saratxaga2003-02-172-20216/+32221 | * simplify translator job by propaging pixel english typo fixThierry Vignaud2003-02-17