Attachment 152707 Details for Bug 234916 – patch for FC-6

[patch] patch for FC-6

patch (text/plain), 2.03 KB, created by Bill Nottingham on 2007-04-16 18:06:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Bill Nottingham

Created: 2007-04-16 18:06:18 UTC

Size: 2.03 KB

patch

obsolete

>? initscripts-8.45.1.tar.bz2
>? initscripts-8.45.2.tar.bz2
>? initscripts-8.45.3.tar.bz2
>? initscripts-8.45.4.tar.bz2
>? initscripts-8.45.5.tar.bz2
>? initscripts-8.45.6.tar.bz2
>? initscripts-8.45.7.tar.bz2
>? ook
>Index: rc.d/rc.sysinit
>===================================================================
>RCS file: /usr/local/CVS/initscripts/rc.d/rc.sysinit,v
>retrieving revision 1.571.2.6
>diff -u -r1.571.2.6 rc.sysinit
>--- rc.d/rc.sysinit	30 Jan 2007 16:25:47 -0000	1.571.2.6
>+++ rc.d/rc.sysinit	16 Apr 2007 17:53:00 -0000
>@@ -536,7 +536,7 @@
> 	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 @@
> 	# 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
>Index: sysconfig/readonly-root
>===================================================================
>RCS file: /usr/local/CVS/initscripts/sysconfig/readonly-root,v
>retrieving revision 1.4
>diff -u -r1.4 readonly-root
>--- sysconfig/readonly-root	4 Oct 2006 21:53:37 -0000	1.4
>+++ sysconfig/readonly-root	16 Apr 2007 17:53:01 -0000
>@@ -7,7 +7,11 @@
> 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=/.snapshot
>+# Options to use for peristent mount
>+STATE_OPTIONS=

Actions: View | Diff

Attachments on bug 234916: 152707