Attachment 671430 Details for Bug 890577 – Proposed patch

[patch] Proposed patch

dracut-subvol.patch (text/plain), 1.23 KB, created by Harald Hoyer on 2013-01-02 12:45:12 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Harald Hoyer

Created: 2013-01-02 12:45:12 UTC

Size: 1.23 KB

patch

obsolete

>commit 47086d5206dc3f5269c219515ba753b41421059e
>Author: Harald Hoyer <harald@redhat.com>
>Date:   Wed Jan 2 13:43:56 2013 +0100
>
>    usrmount/mount-usr.sh: filter "subvol=" from root rflags
>
>diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
>index cca41c3..5aaefbc 100755
>--- a/modules.d/98usrmount/mount-usr.sh
>+++ b/modules.d/98usrmount/mount-usr.sh
>@@ -5,6 +5,21 @@
> type info >/dev/null 2>&1 || . /lib/dracut-lib.sh
> type fsck_single >/dev/null 2>&1 || . /lib/fs-lib.sh
> 
>+filtersubvol() {
>+    local _oldifs
>+    _oldifs="$IFS"
>+    IFS=","
>+    set $*
>+    IFS="$_oldifs"
>+    while [ $# -gt 0 ]; do
>+        case $1 in
>+            subvol\=*) :;;
>+            *) echo -n "${1}," ;;
>+        esac
>+        shift
>+    done
>+}
>+
> fsck_usr()
> {
>     local _dev=$1
>@@ -56,6 +71,8 @@ mount_usr()
>                 [ "${root#block:}" -ef $_dev ]
>                 [ -n "$rflags" ]; then
>                 # for btrfs subvolumes we have to mount /usr with the same rflags
>+                rflags=$(filtersubvol "$rflags")
>+                rflags=${rflags%%,}
>                 _opts="${_opts:+${_opts},}${rflags}"
>             elif getargbool 0 ro; then
>                 # if "ro" is specified, we want /usr to be mounted read-only

Actions: View | Diff

Attachments on bug 890577: 669715 | 669716 | 671430