From e758d4058576dab4a81b6fe5fb376b0ff8fd2635 Mon Sep 17 00:00:00 2001 From: Miloslav Trmac Date: Mon, 15 Jan 2007 09:15:53 +0000 Subject: * Mon Jan 15 2007 Miloslav Trmac - 7.93.27.EL-1 - Do unmount network mounts, not doing so can prevent other unmounting other filesystems Reverts: #200915 --- initscripts.spec | 7 ++++++- rc.d/init.d/halt | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/initscripts.spec b/initscripts.spec index 5f7f3785..3d380cb9 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -1,6 +1,6 @@ Summary: The inittab file and the /etc/init.d scripts. Name: initscripts -Version: 7.93.26.EL +Version: 7.93.27.EL License: GPL Group: System Environment/Base Release: 1 @@ -207,6 +207,11 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Mon Jan 15 2007 Miloslav Trmac - 7.93.27.EL-1 +- Do unmount network mounts, not doing so can prevent other unmounting other + filesystems + Reverts: #200915 + * Tue Jan 2 2007 Miloslav Trmac - 7.93.26.EL-1 - network-functions: source config before calling configure_ccwgroup_device Resolves: #199139 diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt index bfb48cf6..2a856913 100755 --- a/rc.d/init.d/halt +++ b/rc.d/init.d/halt @@ -25,7 +25,7 @@ runcmd() { halt_get_remaining() { awk '$2 ~ /^\/$|^\/proc|^\/dev/{next} $3 == "tmpfs" || $3 == "proc" {print $2 ; next} - /(^#|loopfs|autofs|nfs|cifs|ncpfs|smbfs|sysfs|devfs|^none|^\/dev\/ram|^\/dev\/root)/ {next} + /(^#|loopfs|autofs|sysfs|devfs|^none|^\/dev\/ram|^\/dev\/root)/ {next} {print $2}' /proc/mounts } -- cgit v1.2.1