Move the fs errors -> panic to the mount options
Previously, we used mkfs options to ensure that the ext4 filesystem
paniced the kernel upon a serious error. With RAUC, we no longer have a
direct control over how the filesystem is created.
This patch ensures that we panic via the mount options instead of mkfs
options. That way we can ensure that this preference is respected no
matter how the FS image was created.
Change-Id: Ie83b299a80960f6ad9e23fdd86552706c71515a4
diff --git a/board/czechlight/common/mk-empty-cfg-fs.sh b/board/czechlight/common/mk-empty-cfg-fs.sh
index 90966c7..f4cbe1a 100755
--- a/board/czechlight/common/mk-empty-cfg-fs.sh
+++ b/board/czechlight/common/mk-empty-cfg-fs.sh
@@ -2,4 +2,4 @@
CFG_FS=${BINARIES_DIR}/cfg.ext4
rm -f ${CFG_FS}
-${HOST_DIR}/sbin/mkfs.ext4 -L cfg -O ^64bit -e panic ${CFG_FS} 256M
+${HOST_DIR}/sbin/mkfs.ext4 -L cfg ${CFG_FS} 256M
diff --git a/board/czechlight/common/overlay/etc/fstab b/board/czechlight/common/overlay/etc/fstab
index 92681bd..7517ca9 100644
--- a/board/czechlight/common/overlay/etc/fstab
+++ b/board/czechlight/common/overlay/etc/fstab
@@ -1,3 +1,3 @@
-/dev/root / auto ro 0 1
+/dev/root / auto ro,errors=panic 0 1
tmpfs /var tmpfs mode=1777 0 0
tmpfs /.ov tmpfs mode=0700 0 0
diff --git a/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service b/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service
index e1256a8..4ec5cde 100644
--- a/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service
+++ b/board/czechlight/common/overlay/usr/lib/systemd/system/cfg-storage.service
@@ -9,4 +9,4 @@
Type=oneshot
# This is ugly, but required due to the limitations of the mount units' names
# (I need two "duplicates" which differ in the ConditionKernelCommandLine)
-ExecStart=/bin/sh -c '(grep -q rauc.slot=A /proc/cmdline && mount -o relatime,nodev,nosuid /dev/mmcblk0p2 /cfg) || (grep -q rauc.slot=B /proc/cmdline && mount -o relatime,nodev,nosuid /dev/mmcblk0p4 /cfg)'
+ExecStart=/bin/sh -c '(grep -q rauc.slot=A /proc/cmdline && mount -o relatime,nodev,nosuid,errors=panic /dev/mmcblk0p2 /cfg) || (grep -q rauc.slot=B /proc/cmdline && mount -o relatime,nodev,nosuid,errors=panic /dev/mmcblk0p4 /cfg)'
diff --git a/configs/czechlight_clearfog_defconfig b/configs/czechlight_clearfog_defconfig
index 103a262..f051c82 100644
--- a/configs/czechlight_clearfog_defconfig
+++ b/configs/czechlight_clearfog_defconfig
@@ -39,7 +39,6 @@
BR2_TARGET_ROOTFS_EXT2=y
BR2_TARGET_ROOTFS_EXT2_4=y
BR2_TARGET_ROOTFS_EXT2_SIZE="256M"
-BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O ^64bit -e panic"
BR2_TARGET_ROOTFS_TAR_XZ=y
BR2_TARGET_UBOOT=y
BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y