From 1c38e273b3b2114ae9525f1ad28ad4f44ce6bf55 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Mon, 19 Dec 2011 14:52:58 -0500
Subject: Don't exit with an error if SEinux isn't active. (#768628)

---
 systemd/fedora-readonly | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

(limited to 'systemd/fedora-readonly')

diff --git a/systemd/fedora-readonly b/systemd/fedora-readonly
index 4e8003a2..13172892 100755
--- a/systemd/fedora-readonly
+++ b/systemd/fedora-readonly
@@ -16,6 +16,12 @@ if [ -e "/sys/fs/selinux/enforce" ] && [ "$(cat /proc/self/attr/current)" != "ke
 	fi
 fi
 
+selinux_fixup() {
+	if [ -n "$SELINUX_STATE" ] && [ -e "$1" ]; then
+		restorecon -R "$1"
+	fi
+}
+
 # Only read this once.
 [ -z "${cmdline}" ] && cmdline=$(cat /proc/cmdline)
 
@@ -91,7 +97,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
 				*)
 					;;
 			esac
-			[ -n "$SELINUX_STATE" ] && [ -e "$path" ] && restorecon -R "$path"
+			selinux_fixup "$path"
 		done
 	done
 
@@ -153,14 +159,14 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
 
 			for path in $(grep -v "^#" "$file" 2>/dev/null); do
 				mount_state "$path"
-				[ -n "$SELINUX_STATE" ] && [ -e "$path" ] && restorecon -R "$path"
+				selinux_fixup "$path"
 			done
 		done
 
 		if [ -f "$STATE_MOUNT/files" ] ; then
 			for path in $(grep -v "^#" "$STATE_MOUNT/files" 2>/dev/null); do
 				mount_state "$path"
-				[ -n "$SELINUX_STATE" ] && [ -e "$path" ] && restorecon -R "$path"
+				selinux_fixup "$path"
 			done
 		fi
 	fi
-- 
cgit v1.2.1


From a93d20bb3604bed86e3d1bb74513e428b21242cd Mon Sep 17 00:00:00 2001
From: Will Woods <wwoods@redhat.com>
Date: Thu, 8 Mar 2012 15:13:02 -0500
Subject: Use /run/initramfs instead of /dev/.initramfs

Current dracut saves state to /run/initramfs, since /run is standard
now.

This patch makes rc.sysinit and fedora-readonly check for files in
/run/initramfs/rwtab and /run/initramfs/state (which is where dracut
writes them).

It also makes ifup-eth look for lease files in /run/initramfs.
---
 systemd/fedora-readonly | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'systemd/fedora-readonly')

diff --git a/systemd/fedora-readonly b/systemd/fedora-readonly
index 13172892..0690cd45 100755
--- a/systemd/fedora-readonly
+++ b/systemd/fedora-readonly
@@ -81,7 +81,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
 		mount -n -t tmpfs $RW_OPTIONS $mountopts none "$RW_MOUNT"
 	fi
 
-	for file in /etc/rwtab /etc/rwtab.d/* /dev/.initramfs/rwtab ; do
+	for file in /etc/rwtab /etc/rwtab.d/* /run/initramfs/rwtab ; do
 		is_ignored_file "$file" && continue
 	[ -f $file ] && cat $file | while read type path ; do
 			case "$type" in
@@ -102,7 +102,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
 	done
 
 	# Use any state passed by initramfs
-	[ -d /dev/.initramfs/state ] && cp -a /dev/.initramfs/state/* $RW_MOUNT
+	[ -d /run/initramfs/state ] && cp -a /run/initramfs/state/* $RW_MOUNT
 
 	# In theory there should be no more than one network interface active
 	# this early in the boot process -- the one we're booting from.
-- 
cgit v1.2.1