Blame 0002-rootfs-block-mount-root.sh-fixup-for-8b6bf0ef5.patch
|
Harald Hoyer |
fe31f8 |
From ae4758ce0d0ceeddabe4a78dd575c7b42c349a88 Mon Sep 17 00:00:00 2001
|
|
Harald Hoyer |
fe31f8 |
From: Harald Hoyer <harald@redhat.com>
|
|
Harald Hoyer |
fe31f8 |
Date: Wed, 23 Jan 2013 16:23:07 +0100
|
|
Harald Hoyer |
fe31f8 |
Subject: [PATCH] rootfs-block/mount-root.sh: fixup for 8b6bf0ef5
|
|
Harald Hoyer |
fe31f8 |
|
|
Harald Hoyer |
fe31f8 |
not only fix the warning message, but the real mount arguments, too
|
|
Harald Hoyer |
fe31f8 |
---
|
|
Harald Hoyer |
fe31f8 |
modules.d/95rootfs-block/mount-root.sh | 3 ++-
|
|
Harald Hoyer |
fe31f8 |
1 file changed, 2 insertions(+), 1 deletion(-)
|
|
Harald Hoyer |
fe31f8 |
|
|
Harald Hoyer |
fe31f8 |
diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
|
|
Harald Hoyer |
fe31f8 |
index 54d5012..c7626c3 100755
|
|
Harald Hoyer |
fe31f8 |
--- a/modules.d/95rootfs-block/mount-root.sh
|
|
Harald Hoyer |
fe31f8 |
+++ b/modules.d/95rootfs-block/mount-root.sh
|
|
Harald Hoyer |
fe31f8 |
@@ -26,9 +26,10 @@ mount_root() {
|
|
Harald Hoyer |
fe31f8 |
fi
|
|
Harald Hoyer |
fe31f8 |
|
|
Harald Hoyer |
fe31f8 |
_rflags_ro="$rflags,ro"
|
|
Harald Hoyer |
fe31f8 |
+ _rflags_ro="${_rflags_ro##,}"
|
|
Harald Hoyer |
fe31f8 |
|
|
Harald Hoyer |
fe31f8 |
while ! mount -t ${rootfs} -o "$_rflags_ro" "${root#block:}" "$NEWROOT"; do
|
|
Harald Hoyer |
fe31f8 |
- warn "Failed to mount -t ${rootfs} -o ${_rflags_ro##,} ${root#block:} $NEWROOT"
|
|
Harald Hoyer |
fe31f8 |
+ warn "Failed to mount -t ${rootfs} -o $_rflags_ro ${root#block:} $NEWROOT"
|
|
Harald Hoyer |
fe31f8 |
fsck_ask_err
|
|
Harald Hoyer |
fe31f8 |
done
|
|
Harald Hoyer |
fe31f8 |
|