[PATCH 1/7] 95rootfs-block: fix left fsck rel. checks

[PATCH 1/7] 95rootfs-block: fix left fsck rel. checks

[Amadeusz Żołnowski]

---
 modules.d/95rootfs-block/mount-root.sh |   14 ++++++++------
 1 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index 670f6e3..ef8ca3c 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -52,11 +52,11 @@ mount_root() {
         fastboot=yes
     fi
 
-    if [ -f "$NEWROOT"/fsckoptions ]; then
-        fsckoptions=$(cat "$NEWROOT"/fsckoptions)
-    fi
-
     if ! getargbool 0 rd.skipfsck; then
+        if [ -f "$NEWROOT"/fsckoptions ]; then
+            fsckoptions=$(cat "$NEWROOT"/fsckoptions)
+        fi
+
         if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
             fsckoptions="-f $fsckoptions"
         elif [ -f "$NEWROOT"/.autofsck ]; then
@@ -130,8 +130,10 @@ mount_root() {
         mount -o remount "$NEWROOT" 2>&1 | vinfo
     fi
 
-    [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
-    [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
+    if ! getargbool 0 rd.skipfsck; then
+        [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
+        [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
+    fi
 }
 
 if [ -n "$root" -a -z "${root%%block:*}" ]; then
-- 
1.7.8.6

[PATCH 2/7] 98usrmount: use rw and ro options instead of rd.usrmount.ro

[Amadeusz Żołnowski]

In result /usr is forced to be mounted ro or rw along with /.
---
 dracut.cmdline.7.asc              |   12 ++++++++----
 modules.d/98usrmount/mount-usr.sh |   18 +++++++++---------
 2 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
index 755d641..8f642f3 100644
--- a/dracut.cmdline.7.asc
+++ b/dracut.cmdline.7.asc
@@ -61,6 +61,14 @@ rootfstype=ext3
     _/etc/fstab_ of the real root will be parsed for special mount options and
     mounted accordingly.
 
+**ro**::
+    force mounting _/_ and _/usr_ (if it is a separate device) read-only.  If
+    none of ro and rw is present, both are mounted according to _/etc/fstab_.
+
+**rw**::
+    force mounting _/_ and _/usr_ (if it is a separate device) read-write.
+    See also ro option.
+
 **rd.fstab=0**::
     do not honor special mount options for the root filesystem found in
     _/etc/fstab_ of the real root.
@@ -81,10 +89,6 @@ resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7
     the init system performs fsck before remount, you might want to use this
     option to avoid duplication.
 
-**rd.usrmount.ro**:
-    force mounting _/usr_ read-only.  Use this option if your init system
-    performs remount of _/usr_ the same as it does with rootfs.
-
 
 Misc
 ~~~~
diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
index c277d74..98e08e3 100755
--- a/modules.d/98usrmount/mount-usr.sh
+++ b/modules.d/98usrmount/mount-usr.sh
@@ -57,9 +57,12 @@ mount_usr()
                 [ -n "$rflags" ]; then
                 # for btrfs subvolumes we have to mount /usr with the same rflags
                 _opts="${_opts:+${_opts},}${rflags}"
-            elif getarg ro; then
-                # if "ro" is specified, we want /usr to be readonly, too
+            elif getargbool 0 ro; then
+                # if "ro" is specified, we want /usr to be mounted read-only
                 _opts="${_opts:+${_opts},}ro"
+            elif getargbool 0 rw; then
+                # if "rw" is specified, we want /usr to be mounted read-write
+                _opts="${_opts:+${_opts},}rw"
             fi
             echo "$_dev ${NEWROOT}${_mp} $_fs ${_opts} $_freq $_passno"
             _usr_found="1"
@@ -77,13 +80,10 @@ mount_usr()
                 [ $_fsck_ret -ne 255 ] && echo $_fsck_ret >/run/initramfs/usr-fsck
             fi
         fi
-        if getargbool 0 rd.usrmount.ro; then
-            info "Mounting /usr (read-only forced)"
-            mount -r "$NEWROOT/usr" 2>&1 | vinfo
-        else
-            info "Mounting /usr"
-            mount "$NEWROOT/usr" 2>&1 | vinfo
-        fi
+
+        info "Mounting /usr"
+        mount "$NEWROOT/usr" 2>&1 | vinfo
+
         if ! ismounted "$NEWROOT/usr"; then
             warn "Mounting /usr to $NEWROOT/usr failed"
             warn "*** Dropping you to a shell; the system will continue"
-- 
1.7.8.6

[PATCH 3/7] 98usrmount: print mount options

[Amadeusz Żołnowski]

---
 modules.d/98usrmount/mount-usr.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
index 98e08e3..f4d59b3 100755
--- a/modules.d/98usrmount/mount-usr.sh
+++ b/modules.d/98usrmount/mount-usr.sh
@@ -81,7 +81,7 @@ mount_usr()
             fi
         fi
 
-        info "Mounting /usr"
+        info "Mounting /usr with -o $_opts"
         mount "$NEWROOT/usr" 2>&1 | vinfo
 
         if ! ismounted "$NEWROOT/usr"; then
-- 
1.7.8.6

[PATCH 4/7] 98usrmount: [ "x$_usr_found" != "x" ] - removed redundant 'x'

[Amadeusz Żołnowski]

---
 modules.d/98usrmount/mount-usr.sh |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
index f4d59b3..cca41c3 100755
--- a/modules.d/98usrmount/mount-usr.sh
+++ b/modules.d/98usrmount/mount-usr.sh
@@ -70,7 +70,7 @@ mount_usr()
         fi
     done < "$NEWROOT/etc/fstab" >> /etc/fstab
 
-    if [ "x$_usr_found" != "x" ]; then
+    if [ "$_usr_found" != "" ]; then
         # we have to mount /usr
         _fsck_ret=0
         if ! getargbool 0 rd.skipfsck; then
-- 
1.7.8.6

[PATCH 5/7] dracut-lib: new functions: listlist and are_lists_eq

[Amadeusz Żołnowski]

listlist is like strstr for lists with specified separator and
are_lists_eq uses listlist to check equality of specified lists.
---
 modules.d/99base/dracut-lib.sh |   38 ++++++++++++++++++++++++++++++++++++++
 1 files changed, 38 insertions(+), 0 deletions(-)

diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
index 786661e..2eb1224 100755
--- a/modules.d/99base/dracut-lib.sh
+++ b/modules.d/99base/dracut-lib.sh
@@ -906,3 +906,41 @@ export_n()
         [ -n "$val" ] && eval $var=\"$val\"
     done
 }
+
+# returns OK if list1 contains all elements of list2, i.e. checks if list2 is a
+# sublist of list1.  An order and a duplication doesn't matter.
+#
+# $1 = separator
+# $2 = list1
+# $3 = list2
+# $4 = ignore values, separated by $1
+listlist() {
+    local _sep="$1"
+    local _list="${_sep}${2}${_sep}"
+    local _sublist="$3"
+    [ -n "$4" ] && local _iglist="${_sep}${4}${_sep}"
+    local IFS="$_sep"
+    local _v
+
+    [ "$_list" = "$_sublist" ] && return 0
+
+    for _v in $_sublist; do
+        if [ -n "$_v" ] && ! ( [ -n "$_iglist" ] && strstr "$_iglist" "$_v" )
+        then
+            strstr "$_list" "$_v" || return 1
+        fi
+    done
+
+    return 0
+}
+
+# returns OK if both lists contain the same values.  An order and a duplication
+# doesn't matter.
+# 
+# $1 = separator
+# $2 = list1
+# $3 = list2
+# $4 = ignore values, separated by $1
+are_lists_eq() {
+    listlist "$1" "$2" "$3" "$4" && listlist "$1" "$3" "$2" "$4"
+}
-- 
1.7.8.6

[PATCH 6/7] apply "ro" and "rw" options from cmdline to / mount

[Amadeusz Żołnowski]

rflags is no longer guaranteed to be non empty.  / is mounted according
to rootflags parameter but forced ro at first.  Later it is remounted
according to /etc/fstab + rootflags parameter and "ro"/"rw".  If
parameters are still the same as for first mount, / isn't remounted.

Conflicts:

    modules.d/95rootfs-block/mount-root.sh
    modules.d/99base/parse-root-opts.sh
---
 modules.d/95rootfs-block/mount-root.sh |   35 +++++++------------------------
 modules.d/99base/parse-root-opts.sh    |   11 +++------
 2 files changed, 12 insertions(+), 34 deletions(-)

diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
index ef8ca3c..de9753a 100755
--- a/modules.d/95rootfs-block/mount-root.sh
+++ b/modules.d/95rootfs-block/mount-root.sh
@@ -5,32 +5,13 @@
 type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
 type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh
 
-filter_rootopts() {
-    rootopts=$1
-    # strip ro and rw options
-    local OLDIFS="$IFS"
-    IFS=,
-    set -- $rootopts
-    IFS="$OLDIFS"
-    local v
-    while [ $# -gt 0 ]; do
-        case $1 in
-            defaults);;
-            *)
-                v="$v,${1}";;
-        esac
-        shift
-    done
-    rootopts=${v#,}
-    echo $rootopts
-}
-
 mount_root() {
     local _ret
+    local _rflags_ro="$rflags,ro"
     # sanity - determine/fix fstype
     rootfs=$(det_fs "${root#block:}" "$fstype")
-    while ! mount -t ${rootfs} -o "$rflags",ro "${root#block:}" "$NEWROOT"; do
-        warn "Failed to mount -t ${rootfs} -o $rflags,ro ${root#block:} $NEWROOT"
+    while ! mount -t ${rootfs} -o "$_rflags_ro" "${root#block:}" "$NEWROOT"; do
+        warn "Failed to mount -t ${rootfs} -o $_rflags_ro ${root#block:} $NEWROOT"
         fsck_ask_err
     done
 
@@ -96,13 +77,13 @@ mount_root() {
                 break
             fi
         done < "$NEWROOT/etc/fstab"
-
-        rootopts=$(filter_rootopts $rootopts)
     fi
 
     # we want rootflags (rflags) to take precedence so prepend rootopts to
-    # them; rflags is guaranteed to not be empty
-    rflags="${rootopts:+${rootopts},}${rflags}"
+    # them
+    rflags="${rootopts},${rflags}"
+    rflags="${rflags#,}"
+    rflags="${rflags%,}"
 
     # backslashes are treated as escape character in fstab
     # esc_root=$(echo ${root#block:} | sed 's,\\,\\\\,g')
@@ -125,7 +106,7 @@ mount_root() {
     if ! ismounted "$NEWROOT"; then
         info "Mounting ${root#block:} with -o ${rflags}"
         mount "$NEWROOT" 2>&1 | vinfo
-    else
+    elif ! are_lists_eq , "$rflags" "$_rflags_ro" defaults; then
         info "Remounting ${root#block:} with -o ${rflags}"
         mount -o remount "$NEWROOT" 2>&1 | vinfo
     fi
diff --git a/modules.d/99base/parse-root-opts.sh b/modules.d/99base/parse-root-opts.sh
index 44dcc09..7b0b758 100755
--- a/modules.d/99base/parse-root-opts.sh
+++ b/modules.d/99base/parse-root-opts.sh
@@ -4,13 +4,10 @@
 
 root=$(getarg root=)
 
-if rflags="$(getarg rootflags=)"; then
-    getarg rw && rflags="${rflags},rw"
-    getarg ro && rflags="${rflags},ro"
-else
-    getarg rw && rflags=rw
-    getarg ro && rflags=ro
-fi
+rflags="$(getarg rootflags=)"
+getargbool 0 rw && rflags="${rflags},rw"
+getargbool 0 ro && rflags="${rflags},ro"
+rflags="${rflags#,}"
 
 fstype="$(getarg rootfstype=)"
 if [ -z "$fstype" ]; then
-- 
1.7.8.6

[PATCH 7/7] modules.d/99base/mount-hook.sh is not used - removed

[Amadeusz Żołnowski]

---
 modules.d/99base/mount-hook.sh |  171 ----------------------------------------
 1 files changed, 0 insertions(+), 171 deletions(-)
 delete mode 100755 modules.d/99base/mount-hook.sh

diff --git a/modules.d/99base/mount-hook.sh b/modules.d/99base/mount-hook.sh
deleted file mode 100755
index e32ecae..0000000
--- a/modules.d/99base/mount-hook.sh
+++ /dev/null
@@ -1,171 +0,0 @@
-#!/bin/sh
-# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-# ex: ts=8 sw=4 sts=4 et filetype=sh
-
-PATH=/usr/sbin:/usr/bin:/sbin:/bin
-type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
-type det_fs >/dev/null 2>&1 || [ -f /lib/fs-lib.sh ] && . /lib/fs-lib.sh
-# If fs-lib is not included use following det_fs replacement.
-type det_fs >/dev/null 2>&1 || det_fs() { echo "${2:-auto}"; }
-
-mountpoint="$1"
-ismounted "$mountpoint" && exit 0
-
-if [ -f "$NEWROOT"/fastboot ] || getargbool 0 fastboot ; then
-    fastboot=yes
-fi
-
-filter_rootopts() {
-    rootopts=$1
-    # strip ro and rw options
-    local OLDIFS="$IFS"
-    IFS=,
-    set -- $rootopts
-    IFS="$OLDIFS"
-    local v
-    while [ $# -gt 0 ]; do
-        case $1 in
-            rw|ro);;
-            defaults);;
-            *)
-                v="$v,${1}";;
-        esac
-        shift
-    done
-    rootopts=${v#,}
-    echo $rootopts
-}
-
-mount_root() {
-    local _ret
-    # sanity - determine/fix fstype
-    rootfs=$(det_fs "${root#block:}" "$fstype")
-    mount -t ${rootfs} -o "$rflags",ro "${root#block:}" "$NEWROOT"
-
-    READONLY=
-    fsckoptions=
-    if [ -f "$NEWROOT"/etc/sysconfig/readonly-root ]; then
-        . "$NEWROOT"/etc/sysconfig/readonly-root
-    fi
-
-    if getargbool 0 "readonlyroot=" -y readonlyroot; then
-        READONLY=yes
-    fi
-
-    if getarg noreadonlyroot ; then
-        READONLY=no
-    fi
-
-    if [ -f "$NEWROOT"/fastboot ] || getargbool 0 fastboot ; then
-        fastboot=yes
-    fi
-
-    if [ -f "$NEWROOT"/fsckoptions ]; then
-        fsckoptions=$(cat "$NEWROOT"/fsckoptions)
-    fi
-
-    if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
-        fsckoptions="-f $fsckoptions"
-    elif [ -f "$NEWROOT"/.autofsck ]; then
-        [ -f "$NEWROOT"/etc/sysconfig/autofsck ] && . "$NEWROOT"/etc/sysconfig/autofsck
-        if [ "$AUTOFSCK_DEF_CHECK" = "yes" ]; then
-            AUTOFSCK_OPT="$AUTOFSCK_OPT -f"
-        fi
-        if [ -n "$AUTOFSCK_SINGLEUSER" ]; then
-            warn "*** Warning -- the system did not shut down cleanly. "
-            warn "*** Dropping you to a shell; the system will continue"
-            warn "*** when you leave the shell."
-            emergency_shell
-        fi
-        fsckoptions="$AUTOFSCK_OPT $fsckoptions"
-    fi
-
-    rootopts=
-    if getargbool 1 rd.fstab -d -n rd_NO_FSTAB \
-        && ! getarg rootflags \
-        && [ -f "$NEWROOT/etc/fstab" ] \
-        && ! [ -L "$NEWROOT/etc/fstab" ]; then
-        # if $NEWROOT/etc/fstab contains special mount options for
-        # the root filesystem,
-        # remount it with the proper options
-        rootopts="defaults"
-        while read dev mp fs opts rest; do
-            # skip comments
-            [ "${dev%%#*}" != "$dev" ] && continue
-
-            if [ "$mp" = "/" ]; then
-                # sanity - determine/fix fstype
-                rootfs=$(det_fs "${root#block:}" "$fs")
-                rootopts=$opts
-                break
-            fi
-        done < "$NEWROOT/etc/fstab"
-
-        rootopts=$(filter_rootopts $rootopts)
-    fi
-
-    # we want rootflags (rflags) to take precedence so prepend rootopts to
-    # them; rflags is guaranteed to not be empty
-    rflags="${rootopts:+"${rootopts},"}${rflags}"
-
-    umount "$NEWROOT"
-
-    # backslashes are treated as escape character in fstab
-    # esc_root=$(echo ${root#block:} | sed 's,\\,\\\\,g')
-    # printf '%s %s %s %s 1 1 \n' "$esc_root" "$NEWROOT" "$rootfs" "$rflags" >/etc/fstab
-
-    if [ -z "$fastboot" -a "$READONLY" != "yes" ] && ! strstr "${rflags},${rootopts}" _netdev; then
-        fsck_single "${root#block:}" "$rootfs" "$rflags" "$fsckoptions"
-        _ret=$?
-        [ $_ret -ne 255 ] && echo $_ret >/run/initramfs/root-fsck
-    fi
-
-    info "Remounting ${root#block:} with -o ${rflags}"
-    mount -t "$rootfs" -o "$rflags" "${root#block:}" "$NEWROOT" 2>&1 | vinfo
-
-    [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
-    [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
-}
-
-sub_mount_ready() {
-    local _dev _mp _rest
-    while read _dev _mp _rest; do
-        [ "$1" = "$_mp" ] && continue
-
-        if [ "${1##$_mp}" != "$1" ]; then
-            ismounted "$_mp" || return 1
-        fi
-    done < "/etc/fstab"
-    return 0
-}
-
-if [ "$mountpoint" = "$NEWROOT" ]; then
-    mount_root
-    exit $?
-fi
-
-while read _dev _mp _fs _opts _rest; do
-    if [ "$_mp" = "$mountpoint" ]; then
-        _found="1"
-        break
-    fi
-done < "/etc/fstab"
-
-[ "$_found" = "1" ] || exit 1
-
-sub_mount_ready "$mountpoint" || exit 1
-
-if [ -z "$fastboot" ] && ! strstr "${_opts}" _netdev; then
-    # fsck?
-    fsck_single "$_dev" "$_fs" "$_opts"
-    _ret=$?
-    if [ "${mountpoint##$NEWROOT}" != "$mountpoint" ]; then
-        echo $_ret >/run/initramfs/${mountpoint##$NEWROOT}-fsck
-    fi
-fi
-
-info "Mounting $_dev on $mountpoint"
-mount "$mountpoint" 2>&1 | vinfo
-
-ismounted "$mountpoint" || exit 1
-
-- 
1.7.8.6