From 6927ad29c1225a28ee5a498539d239d61d64fef4 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Jun 23 2016 14:57:01 +0000 Subject: import dracut-033-360.el7_2.1 --- diff --git a/SOURCES/0378-shutdown-guard-against-read-only-run.patch b/SOURCES/0378-shutdown-guard-against-read-only-run.patch new file mode 100644 index 0000000..651ffdc --- /dev/null +++ b/SOURCES/0378-shutdown-guard-against-read-only-run.patch @@ -0,0 +1,41 @@ +From 8fb06a05624d8aaa067b61b70ecbbbd90fc0f88e Mon Sep 17 00:00:00 2001 +From: Harald Hoyer +Date: Mon, 30 Nov 2015 11:27:03 +0100 +Subject: [PATCH] shutdown: guard against read-only /run + +remount the switch rooted /run writeable again. + +(cherry picked from commit 54e09dfb72b557ac8ccd48f5d37089287d272ec7) +--- + modules.d/99shutdown/module-setup.sh | 2 +- + modules.d/99shutdown/shutdown.sh | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/modules.d/99shutdown/module-setup.sh b/modules.d/99shutdown/module-setup.sh +index 5361936..bdb3373 100755 +--- a/modules.d/99shutdown/module-setup.sh ++++ b/modules.d/99shutdown/module-setup.sh +@@ -13,7 +13,7 @@ depends() { + + install() { + local _d +- inst_multiple umount poweroff reboot halt losetup ++ inst_multiple umount poweroff reboot halt losetup stat + inst_multiple -o kexec + inst "$moddir/shutdown.sh" "$prefix/shutdown" + [ -e "${initdir}/lib" ] || mkdir -m 0755 -p ${initdir}/lib +diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh +index 1daf2ca..bcb191b 100755 +--- a/modules.d/99shutdown/shutdown.sh ++++ b/modules.d/99shutdown/shutdown.sh +@@ -14,6 +14,10 @@ export TERM=linux + export PATH=/usr/sbin:/usr/bin:/sbin:/bin + . /lib/dracut-lib.sh + ++if [ "$(stat -c '%T' -f /)" = "tmpfs" ]; then ++ mount -o remount,rw / ++fi ++ + mkdir /oldsys + for i in sys proc run dev; do + mkdir /oldsys/$i diff --git a/SPECS/dracut.spec b/SPECS/dracut.spec index e75a054..e44c5c1 100644 --- a/SPECS/dracut.spec +++ b/SPECS/dracut.spec @@ -10,7 +10,7 @@ Name: dracut Version: 033 -Release: 360%{?dist} +Release: 360%{?dist}.1 Summary: Initramfs generator using udev %if 0%{?fedora} || 0%{?rhel} @@ -389,7 +389,7 @@ Patch357: 0357-network-ifup.sh-skip-empty-nameserver-values.patch Patch358: 0358-write-ifcfg-fix-creating-configuration-for-VLAN.patch Patch359: 0359-90qemu-also-add-ibmvscsi-on-qemu.patch Patch360: 0360-Don-t-call-udevadm-control-exit-in-systemd-mode.patch - +Patch378: 0378-shutdown-guard-against-read-only-run.patch BuildRequires: bash git @@ -816,6 +816,10 @@ rm -rf -- $RPM_BUILD_ROOT %endif %changelog +* Wed Jun 08 2016 Harald Hoyer - 033-360.1 +- handle read-only /run on shutdown +Resolves: rhbz#1338759 + * Thu Nov 26 2015 Harald Hoyer - 033-360 - don't call udevadm control --exit in systemd mode Resolves: rhbz#1285686