Attachment 102011 Details for Bug 117575 – lvm-on-root rc.sysinit fix for FC3test1

[patch] lvm-on-root rc.sysinit fix for FC3test1

sysinit.patch (text/plain), 2.19 KB, created by Alexandre Oliva on 2004-07-18 02:40:47 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alexandre Oliva

Created: 2004-07-18 02:40:47 UTC

Size: 2.19 KB

patch

obsolete

>--- /etc/rc.d/rc.sysinit.save	2004-07-01 23:30:50.000000000 -0300
>+++ /etc/rc.d/rc.sysinit	2004-07-17 23:34:22.653958415 -0300
>@@ -11,7 +11,15 @@
> fi
> 
> # If we're using devfs, start devfsd now - we need the old device names
>-[ -e /dev/.devfsd -a -x /sbin/devfsd ] && /sbin/devfsd /dev
>+if [ -e /dev/.devfsd -a -x /sbin/devfsd ]; then 
>+  /sbin/devfsd /dev
>+elif test -d /dev/initrd-dev
>+  # rhgb will attempt to mount a ramfs on /initrd, hiding the device
>+  # nodes in there we may need to fsck the rootfs logical
>+  # volume/device-mapper device, so make this subdir available
>+  # elsewhere.
>+  mount --bind /initrd/dev /dev/initrd-dev
>+fi
> 
> HOSTNAME=`/bin/hostname`
> HOSTTYPE=`uname -m`
>@@ -29,6 +37,15 @@
> mount -n -t proc /proc /proc
> mount -n -t sysfs /sys /sys >/dev/null 2>&1
> 
>+# Unmount the initrd, if necessary.  
>+if LC_ALL=C fgrep -q /initrd /proc/mounts && ! LC_ALL=C fgrep -q /initrd/loopfs /proc/mounts ; then
>+   if [ -e /initrd/dev/.devfsd ]; then
>+      umount /initrd/dev
>+   fi
>+   umount /initrd
>+   /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
>+fi
>+
> # Check SELinux status
> selinuxfs=`awk '/ selinuxfs / { print $2 }' /proc/mounts`
> SELINUX=
>@@ -289,8 +306,8 @@
>         STRING=$"Checking root filesystem"
> 	echo $STRING
> 	rootdev=`awk '/ \/ / && ($3 !~ /rootfs/) {print $1}' /proc/mounts`
>-	if [ -b /initrd/"$rootdev" ] ; then
>-		rootdev=/initrd/"$rootdev"
>+	if [ -b /dev/initrd-dev/`echo "$rootdev" | sed 's,^/dev/,,'` ] ; then
>+		rootdev=/dev/initrd-dev/`echo "$rootdev" | sed 's,^/dev/,,'`
> 	else
> 		rootdev=/
> 	fi
>@@ -333,15 +350,11 @@
> 	fi
> fi
> 
>-# Unmount the initrd, if necessary
>-if LC_ALL=C fgrep -q /initrd /proc/mounts && ! LC_ALL=C fgrep -q /initrd/loopfs /proc/mounts ; then
>-   if [ -e /initrd/dev/.devfsd ]; then
>-      umount /initrd/dev
>-   fi
>-   umount /initrd
>-   /sbin/blockdev --flushbufs /dev/ram0 >/dev/null 2>&1
>+# We no longer need device nodes from initrd, so let initrd go.
>+if LC_ALL=C fgrep -q /dev/initrd-dev /proc/mounts; then
>+  umount /dev/initrd-dev
> fi
>-                                                                                
>+
> # Possibly update quotas if fsck was run on /.
> LC_ALL=C grep -E '[[:space:]]+/[[:space:]]+' /etc/fstab | \
>     awk '{ print $4 }' | \

Actions: View | Diff

Attachments on bug 117575: 98326 | 98529 | 102011