From 4aa87f28e032bd60f4a816e59e47f1718d57fa75 Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 13 Dec 2019 22:19:33 +0200 Subject: [PATCH] Mount fs from /etc/fstab.overlay only if overlayfs supported --- board/common/overlay/etc/fstab.disk | 1 - board/common/overlay/etc/fstab.overlay | 2 ++ board/common/overlay/etc/init.d/S01mountall | 1 + .../usr/share/dataskel/{.overlay => .overlay-usr}/.empty | 0 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 board/common/overlay/etc/fstab.overlay rename board/common/overlay/usr/share/dataskel/{.overlay => .overlay-usr}/.empty (100%) diff --git a/board/common/overlay/etc/fstab.disk b/board/common/overlay/etc/fstab.disk index dce382fda9..aac1314772 100644 --- a/board/common/overlay/etc/fstab.disk +++ b/board/common/overlay/etc/fstab.disk @@ -1,4 +1,3 @@ # /dev/mmcblk0p1 /boot vfat ro,defaults 0 0 /dev/mmcblk0p3 /data ext4 defaults,noatime 0 0 -overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay 0 0 diff --git a/board/common/overlay/etc/fstab.overlay b/board/common/overlay/etc/fstab.overlay new file mode 100644 index 0000000000..f19791e871 --- /dev/null +++ b/board/common/overlay/etc/fstab.overlay @@ -0,0 +1,2 @@ +# +overlay /usr overlay lowerdir=/usr,upperdir=/data/usr,workdir=/data/.overlay-usr 0 0 diff --git a/board/common/overlay/etc/init.d/S01mountall b/board/common/overlay/etc/init.d/S01mountall index cafa43c0b3..1fa1ac2eca 100755 --- a/board/common/overlay/etc/init.d/S01mountall +++ b/board/common/overlay/etc/init.d/S01mountall @@ -6,6 +6,7 @@ mount_fs() { msg_begin "Mounting filesystems" /bin/mount -T /etc/fstab.disk -a && /bin/mount -T /etc/fstab.extra -a && + if grep -qw overlay /proc/filesystems; then /bin/mount -T /data/etc/fstab.overlay -a; fi && if [[ -r /data/etc/fstab.user ]]; then /bin/mount -T /data/etc/fstab.user -a; fi test $? == 0 && msg_done || msg_fail diff --git a/board/common/overlay/usr/share/dataskel/.overlay/.empty b/board/common/overlay/usr/share/dataskel/.overlay-usr/.empty similarity index 100% rename from board/common/overlay/usr/share/dataskel/.overlay/.empty rename to board/common/overlay/usr/share/dataskel/.overlay-usr/.empty