tree: import changes from testing-devel at ef7c4b9

jlebon · Mar 24, 2021 · 5047ad1 · 5047ad1
1 parent 5cee2f0
commit 5047ad1
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-rootflags.sh b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-rootflags.sh
@@ -1,8 +1,26 @@
 #!/bin/bash
 set -euo pipefail
 
+# see related comment block in transposefs.sh re. inspecting the config directly
+ignition_cfg=/run/ignition.json
 rootpath=/dev/disk/by-label/root
 
+query_rootfs() {
+    local filter=$1
+    jq -re ".storage?.filesystems? // [] |
+                map(select(.label == \"root\" and .wipeFilesystem == true)) |
+                .[0] | $filter" "${ignition_cfg}"
+}
+
+# If the rootfs was reprovisioned, then the mountOptions from the Ignition
+# config has priority.
+if [ -d /run/ignition-ostree-transposefs/root ]; then
+    if query_rootfs 'has("mountOptions")' >/dev/null; then
+        query_rootfs '.mountOptions | join(",")'
+        exit 0
+    fi
+fi
+
 eval $(blkid -o export ${rootpath})
 if [ "${TYPE}" == "xfs" ]; then
     # We use prjquota on XFS by default to aid multi-tenant Kubernetes (and

diff --git a/tests/kola/root-reprovision/filesystem-only/config.ign b/tests/kola/root-reprovision/filesystem-only/config.ign
@@ -1,14 +1,15 @@
 {
     "ignition": {
-        "version": "3.0.0"
+        "version": "3.2.0"
     },
     "storage": {
         "filesystems": [
             {
                 "device": "/dev/disk/by-label/root",
                 "wipeFilesystem": true,
                 "format": "ext4",
-                "label": "root"
+                "label": "root",
+                "mountOptions": ["debug"]
             }
         ]
     }

diff --git a/tests/kola/root-reprovision/filesystem-only/test.sh b/tests/kola/root-reprovision/filesystem-only/test.sh
@@ -15,6 +15,12 @@ fstype=$(findmnt -nvr / -o FSTYPE)
 [[ $fstype == ext4 ]]
 ok "source is ext4"
 
+rootflags=$(findmnt /sysroot -no OPTIONS)
+if ! grep debug <<< "${rootflags}"; then
+    fatal "missing debug in root mount flags: ${rootflags}"
+fi
+ok "root mounted with debug"
+
 case "${AUTOPKGTEST_REBOOT_MARK:-}" in
   "")
       # check that the partition was grown