Fix umount on halt
This commit is contained in:
parent
b70b64e4e4
commit
98e69fe540
28
cgroup.diff
Normal file
28
cgroup.diff
Normal file
@ -0,0 +1,28 @@
|
|||||||
|
commit af1d17f1d3e213e41d9b320b5e2251118d463bd3
|
||||||
|
Author: Bill Nottingham <notting@redhat.com>
|
||||||
|
Date: Thu Aug 26 13:25:36 2010 -0400
|
||||||
|
|
||||||
|
Fix umount on halt for new cgroup location. (#612789)
|
||||||
|
|
||||||
|
diff --git a/rc.d/init.d/halt b/rc.d/init.d/halt
|
||||||
|
index a19c76f..cb33cbe 100755
|
||||||
|
--- a/rc.d/init.d/halt
|
||||||
|
+++ b/rc.d/init.d/halt
|
||||||
|
@@ -138,7 +138,7 @@ __umount_loop '$3 ~ /^rpc_pipefs$/ || $3 ~ /^rpc_svc_gss_pipefs$/ {print $2}' \
|
||||||
|
$"Unmounting pipe file systems (retry): " \
|
||||||
|
-f
|
||||||
|
|
||||||
|
-LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/dev/{next}
|
||||||
|
+LANG=C __umount_loop '$2 ~ /^\/$|^\/proc|^\/cgroup|^\/sys\/fs\/cgroup|^\/dev/{next}
|
||||||
|
$3 == "tmpfs" || $3 == "proc" {print $2 ; next}
|
||||||
|
/(loopfs|autofs|nfs|cifs|smbfs|ncpfs|sysfs|^none|^\/dev\/ram|^\/dev\/root$)/ {next}
|
||||||
|
{print $2}' /proc/mounts \
|
||||||
|
@@ -155,7 +155,7 @@ rm -f /.autofsck
|
||||||
|
|
||||||
|
# Try all file systems other than root, essential filesystems and RAM disks,
|
||||||
|
# one last time.
|
||||||
|
-awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /^\/dev\/ram/ { print $2 }' \
|
||||||
|
+awk '$2 !~ /\/(|dev|proc|selinux|cgroup|sys)$/ && $1 !~ /(^\/dev\/ram|cgroup)/ { print $2 }' \
|
||||||
|
/proc/mounts | sort -r | \
|
||||||
|
while read line; do
|
||||||
|
fstab-decode $UMOUNT -f $line
|
@ -6,7 +6,7 @@ Version: 9.17
|
|||||||
# ppp-watch is GPLv2+, everything else is GPLv2
|
# ppp-watch is GPLv2+, everything else is GPLv2
|
||||||
License: GPLv2 and GPLv2+
|
License: GPLv2 and GPLv2+
|
||||||
Group: System Environment/Base
|
Group: System Environment/Base
|
||||||
Release: 1%{?dist}
|
Release: 2%{?dist}
|
||||||
URL: http://fedorahosted.org/releases/i/n/initscripts/
|
URL: http://fedorahosted.org/releases/i/n/initscripts/
|
||||||
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
|
Source: http://fedorahosted.org/releases/i/n/initscripts/initscripts-%{version}.tar.bz2
|
||||||
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root
|
||||||
@ -46,6 +46,7 @@ Requires(pre): /usr/sbin/groupadd
|
|||||||
Requires(post): /sbin/chkconfig, coreutils
|
Requires(post): /sbin/chkconfig, coreutils
|
||||||
Requires(preun): /sbin/chkconfig
|
Requires(preun): /sbin/chkconfig
|
||||||
BuildRequires: glib2-devel popt-devel gettext pkgconfig
|
BuildRequires: glib2-devel popt-devel gettext pkgconfig
|
||||||
|
Patch0: cgroup.diff
|
||||||
|
|
||||||
%description
|
%description
|
||||||
The initscripts package contains the basic system scripts used to boot
|
The initscripts package contains the basic system scripts used to boot
|
||||||
@ -66,6 +67,7 @@ Currently, this consists of various memory checking code.
|
|||||||
|
|
||||||
%prep
|
%prep
|
||||||
%setup -q
|
%setup -q
|
||||||
|
%patch0 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
make
|
make
|
||||||
@ -242,6 +244,9 @@ rm -rf $RPM_BUILD_ROOT
|
|||||||
/etc/profile.d/debug*
|
/etc/profile.d/debug*
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Thu Aug 26 2010 Bill Nottingham <notting@redhat.com> - 9.17-2
|
||||||
|
- halt: fix umount on halt for new cgroup location. (#612789)
|
||||||
|
|
||||||
* Wed Aug 25 2010 Bill Nottingham <notting@redhat.com> - 9.17-1
|
* Wed Aug 25 2010 Bill Nottingham <notting@redhat.com> - 9.17-1
|
||||||
- init.d/functions: redirect start/stop/condrestart/etc to systemctl in a systemd environment (#612728)
|
- init.d/functions: redirect start/stop/condrestart/etc to systemctl in a systemd environment (#612728)
|
||||||
- rc.sysinit: don't frob the console loglevel on boot (#621257, #626572)
|
- rc.sysinit: don't frob the console loglevel on boot (#621257, #626572)
|
||||||
|
Loading…
Reference in New Issue
Block a user