diff options
| author | Anatoliy Guskov <anatoliy.guskov@gmail.com> | 2008-04-08 19:42:14 +0000 |
|---|---|---|
| committer | Anatoliy Guskov <anatoliy.guskov@gmail.com> | 2008-04-08 19:42:14 +0000 |
| commit | a94889e3e25b8558897de6644aec421ad41fd519 (patch) | |
| tree | 9b25187e9cad764a6d68e4846cebeece8048c4f2 | |
| parent | 14d5534f6134e7d24104581f5c4f956de580ab34 (diff) | |
| parent | 94b44fff56db437a1888eacd9c221d5b6500c02e (diff) | |
| download | initscripts-a94889e3e25b8558897de6644aec421ad41fd519.tar.gz initscripts-a94889e3e25b8558897de6644aec421ad41fd519.tar.xz initscripts-a94889e3e25b8558897de6644aec421ad41fd519.zip | |
Merge branch 'master' of ssh://git.fedorahosted.org/git/initscripts
| -rw-r--r-- | initscripts.spec | 7 | ||||
| -rwxr-xr-x | rc.d/rc | 3 |
2 files changed, 7 insertions, 3 deletions
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 <notting@redhat.com> - 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 <notting@redhat.com> - 8.68-1 - netfs: umount 'ncp' filesystems as well (#437117) - improve performance of s390 ccw rules (#437110, <mernst@de.ibm.com>) @@ -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. |