From 0f55775b938c8a1051f18e73af63bfd9a298d890 Mon Sep 17 00:00:00 2001
From: Bill Nottingham <notting@redhat.com>
Date: Fri, 13 Apr 2007 22:48:20 +0000
Subject: add options for mounting state (#234916)

---
 rc.d/rc.sysinit         | 4 ++--
 sysconfig/readonly-root | 4 ++++
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/rc.d/rc.sysinit b/rc.d/rc.sysinit
index dff9bbe0..8b42d2f1 100755
--- a/rc.d/rc.sysinit
+++ b/rc.d/rc.sysinit
@@ -536,7 +536,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
 	elif [ x$rw_mount_dev != x ] && mount $rw_mount_dev $mountopts "$RW_MOUNT" > /dev/null 2>&1; then
 		rm -rf "$RW_MOUNT"  > /dev/null 2>&1
 	else
-		mount -n -t tmpfs $mountopts none "$RW_MOUNT"
+		mount -n -t tmpfs $RW_OPTIONS $mountopts none "$RW_MOUNT"
 	fi
 
 	for file in /etc/rwtab /etc/rwtab.d/* ; do
@@ -583,7 +583,7 @@ if [ "$READONLY" = "yes" -o "$TEMPORARY_STATE" = "yes" ]; then
 	# First try to mount persistent data from /etc/fstab, then any
 	# partition with the proper label, then fallback to NFS
 	state_mount_dev=$(blkid -t LABEL="$STATE_LABEL" -o device | awk '{ print ; exit }')
-	if mount $mountopts "$STATE_MOUNT" > /dev/null 2>&1 ; then
+	if mount $mountopts $STATE_OPTIONS "$STATE_MOUNT" > /dev/null 2>&1 ; then
 		/bin/true
 	elif [ x$state_mount_dev != x ] && mount $state_mount_dev $mountopts "$STATE_MOUNT" > /dev/null 2>&1;  then
 		/bin/true
diff --git a/sysconfig/readonly-root b/sysconfig/readonly-root
index 3eb6168e..dbf1829f 100644
--- a/sysconfig/readonly-root
+++ b/sysconfig/readonly-root
@@ -7,7 +7,11 @@ TEMPORARY_STATE=no
 RW_MOUNT=/var/lib/stateless/writable
 # Label on local filesystem which can be used for temporary scratch space
 RW_LABEL=stateless-rw
+# Options to use for temporary mount
+RW_OPTIONS=
 # Label for partition with persistent data
 STATE_LABEL=stateless-state
 # Where to mount to the persistent data
 STATE_MOUNT=/var/lib/stateless/state
+# Options to use for peristent mount
+STATE_OPTIONS=
-- 
cgit v1.2.1