From d61552366c960cae6f5a52d493185ec8d8e716cd Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 8 Apr 2008 01:12:13 -0400 Subject: Fix various shutdown-related weirdness. (#438444) [ -f /var/lock/subsys/$subsys -o -f /var/lock/subsys/$subsys.init ] \ || continue and [ -f /var/lock/subsys/$subsys ] || continue [ -f /var/lock/subsys/$subsys.init ] || continue ? NOT EQUIVALENT. *whacks self in head* --- rc.d/rc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rc.d/rc b/rc.d/rc index 316751a4..0d1abd12 100755 --- a/rc.d/rc +++ b/rc.d/rc @@ -66,8 +66,7 @@ for i in /etc/rc$runlevel.d/K* ; do # Check if the subsystem is already up. subsys=${i#/etc/rc$runlevel.d/K??} - [ -f /var/lock/subsys/$subsys ] || continue - [ -f /var/lock/subsys/$subsys.init ] || continue + [ -f /var/lock/subsys/$subsys -o -f /var/lock/subsys/$subsys.init ] || continue check_runlevel "$i" || continue # Bring the subsystem down. -- cgit v1.2.1 From 94b44fff56db437a1888eacd9c221d5b6500c02e Mon Sep 17 00:00:00 2001 From: Bill Nottingham Date: Tue, 8 Apr 2008 01:19:13 -0400 Subject: 8.69-1 --- initscripts.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/initscripts.spec b/initscripts.spec index 6ada8419..26c00156 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -2,7 +2,7 @@ Summary: The inittab file and the /etc/init.d scripts Name: initscripts -Version: 8.68 +Version: 8.69 # ppp-watch is GPLv2+, everything else is GPLv2 License: GPLv2 and GPLv2+ Group: System Environment/Base @@ -232,6 +232,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Tue Apr 8 2008 Bill Nottingham - 8.69-1 +- Bring up lo whenever it shows up, not just in network/NM +- fix shutdown-related oddities (#438444) +- translation updates: el, sr, sr@latin, sv + * Fri Apr 4 2008 Bill Nottingham - 8.68-1 - netfs: umount 'ncp' filesystems as well (#437117) - improve performance of s390 ccw rules (#437110, ) -- cgit v1.2.1