aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThan Ngo <than@redhat.com>2001-04-23 22:55:05 +0000
committerThan Ngo <than@redhat.com>2001-04-23 22:55:05 +0000
commit6b9dbd8f779ccfc8f92ff6af893f6c55d8e6f81d (patch)
tree85776296e089fe8f0234e49873404086a38ecd5b
parentbdcc326fd3a288edff95c5e0928d3a812c0a096f (diff)
downloadinitscripts-6b9dbd8f779ccfc8f92ff6af893f6c55d8e6f81d.tar
initscripts-6b9dbd8f779ccfc8f92ff6af893f6c55d8e6f81d.tar.gz
initscripts-6b9dbd8f779ccfc8f92ff6af893f6c55d8e6f81d.tar.bz2
initscripts-6b9dbd8f779ccfc8f92ff6af893f6c55d8e6f81d.tar.xz
initscripts-6b9dbd8f779ccfc8f92ff6af893f6c55d8e6f81d.zip
add shutdown UPS into haltr5-83
-rw-r--r--ChangeLog187
-rw-r--r--initscripts.spec3
-rwxr-xr-xrc.d/init.d/halt7
3 files changed, 197 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 3863e661..09fde39c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,190 @@
+2001-04-23 than <than@rom.redhat.de>
+
+ * initscripts.spec, rc.d/init.d/halt:
+ add shutdown UPS into halt
+
+2001-04-23 notting <notting@rom.redhat.de>
+
+ * rc.d/rc.sysinit:
+ don't load mixer settings; modutils does that in %post-install
+
+2001-04-22 notting <notting@rom.redhat.de>
+
+ * src/mkkerneldoth:
+ fix it for some cases (#36480)
+
+2001-04-19 notting <notting@rom.redhat.de>
+
+ * rc.d/rc.sysinit:
+ disable DMA, 32-bit IO if asked to
+
+2001-04-09 i18n <i18n@rom.redhat.de>
+
+ * po/sv.po:
+ Auto-update by menthos@menthos.com
+
+2001-04-07 i18n <i18n@rom.redhat.de>
+
+ * po/no.po:
+ Auto-update by teg@redhat.com
+
+2001-04-07 pbrown <pbrown@rom.redhat.de>
+
+ * initscripts.spec, rc.d/rc.sysinit, src/Makefile, src/mkkerneldoth:
+ broke out kernel.h symlink code from rc.sysinit into /sbin/mkkerneldoth
+
+2001-04-06 notting <notting@rom.redhat.de>
+
+ * sysconfig/network-scripts/network-functions:
+ attempt to avoid netreport killing too many random processes (#34933)
+
+ * po/sk.po, po/sl.po, po/sr.po, po/sv.po, po/tr.po, po/uk.po, po/wa.po, po/zh_CN.GB2312.po, po/zh.po, po/cs.po, po/da.po, po/de.po, po/es.po, po/eu_ES.po, po/fi.po, po/fr.po, po/gl.po, po/hu.po, po/id.po, po/is.po, po/it.po, po/ja.po, po/ko.po, po/no.po, po/pl.po, po/pt_BR.po, po/pt.po, po/ro.po, po/ru.po:
+ update-po (ssh)
+
+ * po/initscripts.pot: new ssh translations
+
+2001-04-05 i18n <i18n@rom.redhat.de>
+
+ * po/ru.po:
+ Auto-update by leon@geon.donetsk.ua
+
+2001-04-03 notting <notting@rom.redhat.de>
+
+ * ChangeLog: *** empty log message ***
+
+ * initscripts.spec: 5.82-1
+
+ * rc.d/init.d/functions: set umask to 022
+
+2001-04-02 notting <notting@rom.redhat.de>
+
+ * initscripts.spec:
+ *** empty log message ***
+
+ * initscripts.spec: fix changelog message
+
+ * ChangeLog: *** empty log message ***
+
+ * initscripts.spec: bump version
+
+ * sysconfig/network-scripts/ifup:
+ fix typo (#31627)
+ get rid of error message if ${GATEWAY} isn't set
+ fix typos (DHCPDARGS vs. DHCPCDARGS) (#26378)
+ remove old broken code
+ allow devices without an IP address (#24127)
+ don't try and run pump if it's not there
+ honor PEERDNS=no for pump and dhcpcd too (#18619)
+ fix ARP handling, allow for setting promiscuous or all-multicast mode
+ fix more ifconfig greps (patch from Conectiva)
+
+ * sysconfig/network-scripts/ifdown-ppp:
+ fix redial loop (#17380)
+
+ * sysconfig/network-scripts/network-functions:
+ handle aliases better in check_device_down (#18687)
+ fix ARP handling, allow for setting promiscuous or all-multicast mode
+ oops, put the LANG=C in the right place
+ fix the adding default route if GATEWAY" = "0.0.0.0
+
+ * sysconfig/network-scripts/ifup-post:
+ fix scoping isuse (#22547)
+ fix more ifconfig greps (patch from Conectiva)
+
+ * sysconfig/network-scripts/ifup-ipx:
+ deuglify (#23198)
+
+ * sysconfig/network-scripts/ifup-aliases:
+ fix more ifconfig greps (patch from Conectiva)
+ fix a couple of typos
+
+ * sysconfig/network-scripts/ifdown-aliases:
+ fix more ifconfig greps (patch from Conectiva)
+
+ * sysconfig/network-scripts/ifdown:
+ add ifdown-pre-local (#10936)
+ source /etc/sysconfig/network (#30595)
+ retcode wasn't used. initialize it.
+
+ * rc.d/rc.sysinit:
+ load ide-cd before ide-scsi
+ load ide-scsi if they asked for it
+
+ * rc.d/rc.sysinit:
+ do explicitly load usb-storage; it's the simplest solution for now
+ fix /boot/kernel.h generation (#32081)
+ tweak raid startup slightly to deal with /etc/raitab but no raid in the kernel (#25291)
+ avoid some error messages from USB startup (#31040)
+ run pam_console_apply on startup to reset permissions
+ insert multiple USB controllers correctly
+ mount usbdevfs before loading host controller module
+ don't run isapnp on isapnp-enabled 2.4 kernels
+ initialize multiple USB controllers if necessary
+ disable hotplug if 'nomodules' is specified
+ mon has a subdirectory in odd places as well. (#26924)
+ do USB initialization even if we don't need to load a host-controller module (#26318)
+ fix raid start if it's all modular, and no initrd (#25291)
+ add sleep 1 to avoid race (#17842)
+ add devfs to mtab (#20261)
+ deal with new location of console-tools stuff
+ turn on accounting at bootup
+ use modprobe -c to handle possible conditional modules.conf constructs (#21283)
+ don't exclude proc when you're doing mount -a -t nonfs...
+ don't remount r/w if it is r/w (#12097)
+ don't try and load fonts and keymaps on a serial console. Duh.
+
+ * rc.d/rc.local:
+ touch /var/lock/subsys/local so we only get run once
+
+ * rc.d/rc:
+ ask for startup of each network devie in CONFIRM mode. Patch from <rasmusin@wpi.edu>
+
+ * rc.d/init.d/network:
+ run *all* greps in C locale
+ don't error if kernel.hotplug isn't there (#33256)
+ disable hotplug during network initscript
+ fix network up/down logic
+ ignore backup files in /etc/sysconfig/network-scripts
+ only load the module if there is one to load.
+ only load modules for ethernet devices
+ ask for startup of each network devie in CONFIRM mode. Patch from <rasmusin@wpi.edu>
+ fix more ifconfig greps (patch from Conectiva)
+
+ * rc.d/init.d/network: remove bogus line
+
+ * rc.d/init.d/single:
+ don't explicitly kill things, init will do that
+
+ * rc.d/init.d/random:
+ use /var/lib/for random seed; /var/run is cleared at bootup (#31521)
+
+ * rc.d/init.d/netfs:
+ unmount loopback stuff before stopping netfs or shutting down
+ don't exclude proc when you're doing mount -a -t nonfs...
+
+ * rc.d/init.d/killall:
+ don't barf errors if files aren't there (say, rc.local)
+
+ * rc.d/init.d/halt:
+ change message to be less misleading (#30087)
+ unmount loopback stuff before stopping netfs or shutting down
+ add autofs (#17288)
+ do something less surprising when called with arguments (#18216)
+ read /etc/sysconfig/clock on syncing hwclock
+ sync hardware clock to system time on halt (#21187)
+
+ * rc.d/init.d/functions:
+ - --background is fundamentally broken. Remove it for now.
+ - fix some ## substitutions to be correct
+ - use 'su -' , not just 'su' (#26894)
+ - make pidofproc() and killproc() try to use the PID associated with the full
+ pathname first before killing the daemon by its basename (for daemons that
+ share the same basename, i.e. "master" in postfix and cyrus-imapd) (#19016)
+ - fix status() as well
+ - return 1 in killproc if process isn't running (#26718)
+ - various cleanups (#10761, from mjt@tls.msk.ru)
+ - for daemon(), look only at the pid file to see if it's running (#17244, others)
+
2001-04-03 Bill Nottingham <notting@redhat.com>
* initscripts.spec: 5.82-1
diff --git a/initscripts.spec b/initscripts.spec
index 28c49142..3a552195 100644
--- a/initscripts.spec
+++ b/initscripts.spec
@@ -255,6 +255,9 @@ rm -rf $RPM_BUILD_ROOT
%ghost %attr(0664,root,utmp) /var/run/utmp
%changelog
+* Tue Apr 24 2001 Than Ngo <than@redhat.com>
+- add shutdown UPS into halt (bug #34312)
+
* Sat Apr 7 2001 Preston Brown <pbrown@redhat.com>
- broke out kernel.h updater from rc.sysinit into /sbin/mkkerneldoth
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
index 566b8a60..ba102da5 100755
--- a/rc.d/init.d/halt
+++ b/rc.d/init.d/halt
@@ -184,4 +184,11 @@ if [ -f /poweroff -o ! -f /halt ]; then
HALTARGS="$HALTARGS -p"
fi
+if [ "$command" = halt ] ; then
+ if [ -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 -k $DEVICE
+ fi
+fi
+
eval $command $HALTARGS