diff options
| author | Bill Nottingham <notting@redhat.com> | 2008-03-03 10:37:54 -0500 |
|---|---|---|
| committer | Bill Nottingham <notting@redhat.com> | 2008-03-03 10:37:54 -0500 |
| commit | f9aae940a735d963c8f0e1b02be0866f0746e4c8 (patch) | |
| tree | c4c271e3fddc7e4dd3c177b3abf6da5dd062b022 | |
| parent | 870f6950bfade119657658e9cf271fb599f33b91 (diff) | |
| download | initscripts-f9aae940a735d963c8f0e1b02be0866f0746e4c8.tar initscripts-f9aae940a735d963c8f0e1b02be0866f0746e4c8.tar.gz initscripts-f9aae940a735d963c8f0e1b02be0866f0746e4c8.tar.bz2 initscripts-f9aae940a735d963c8f0e1b02be0866f0746e4c8.tar.xz initscripts-f9aae940a735d963c8f0e1b02be0866f0746e4c8.zip | |
- also skip network shutdown if there is a '_rnetdev' root device (part of #435358, <pjones@redhat.com>)
| -rw-r--r-- | initscripts.spec | 5 | ||||
| -rwxr-xr-x | rc.d/init.d/network | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/initscripts.spec b/initscripts.spec index 82d9002f..88d6a87b 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 8.45.18.EL +Version: 8.45.19.EL License: GPL Group: System Environment/Base Release: 1 @@ -196,6 +196,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Mar 3 2008 Bill Nottingham <notting@redhat.com> 8.45.19.EL-1 +- also skip network shutdown if there is a '_rnetdev' root device (part of #435358, <pjones@redhat.com>) + * Thu Feb 07 2008 Bill Nottingham <notting@redhat.com>, Harald Hoyer <harald@redhat.com> 8.45.18.EL-1 - IKE_DHGROUP is now an option for IPsec configuration files, which allows to set the dh group used during PHASE 1 of IPsec SA (#251506) diff --git a/rc.d/init.d/network b/rc.d/init.d/network index c49928c2..9efb67bc 100755 --- a/rc.d/init.d/network +++ b/rc.d/init.d/network @@ -174,7 +174,7 @@ case "$1" in rootfs=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $3; }}' /etc/mtab) rootopts=$(awk '{ if ($1 !~ /^[ \t]*#/ && $2 == "/") { print $4; }}' /etc/mtab) - if [[ "$rootfs" =~ "^nfs" ]] || [[ "$rootopts" =~ "_netdev" ]] ; then + if [[ "$rootfs" =~ "^nfs" ]] || [[ "$rootopts" =~ "_netdev|_rnetdev" ]] ; then exit 1 fi |