wip

coreos · Jul 2, 2020 · 48afbe5 · 48afbe5
1 parent d02a1ac
commit 48afbe5
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-growpart b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/coreos-growpart
@@ -8,6 +8,9 @@ set -euo pipefail
 # Growpart /, until we can fix Ignition for separate /var
 # (And eventually we want ignition-disks)
 
+echo "nope"
+exit 0
+
 path=$1
 shift
 

diff --git a/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-firstboot-uuid b/overlay.d/05core/usr/lib/dracut/modules.d/40ignition-ostree/ignition-ostree-firstboot-uuid
@@ -32,7 +32,7 @@ if [ "${TYPE}" == "${orig_type}" ] && [ "${UUID}" == "${orig_uuid}" ]; then
     # For now we need to fsck first, see https://github.com/coreos/coreos-assembler/pull/1452
     # Basically we're not passing `metadata_csum_seed` as a mkfs.ext4 option
     # because grub2 barfs on it.
-    ext4) e2fsck -y "${target}" && tune2fs -U random "${target}" ;;
+    ext4) e2fsck -fy "${target}" && tune2fs -U random "${target}" ;;
     xfs) xfs_admin -U generate "${target}" ;;
     *) echo "unexpected filesystem type ${TYPE}" 1>&2; exit 1 ;;
   esac