diff options
| author |   Vyacheslav Yurkov <v.yurkov@precitec.de> | 2022-09-07 21:51:37 +0200 |
|---|---|---|
| committer |   Steve Sakoman <steve@sakoman.com> | 2022-10-25 04:24:45 -1000 |
| commit | a1e0ddbb7bc2c63845af67d5fd38f12be44e8775 (patch) | |
| tree | 2ba2f88dfe2b1ee921ff6fa15dd231c06cfbee69 | |
| parent | 43badfadb92a1d6684801f81fa2ed9c8b5652bb6 (diff) | |
| download | openembedded-core-a1e0ddbb7bc2c63845af67d5fd38f12be44e8775.tar.gz | |
files: overlayfs-etc: refactor preinit template
Signed-off-by: Vyacheslav Yurkov <v.yurkov@precitec.de>
Signed-off-by: Alexandre Belloni <alexandre.belloni@bootlin.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit ad5b2bffbee6ddcf51bc146d1e76c980b498b399)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
| -rw-r--r-- | meta/files/overlayfs-etc-preinit.sh.in | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meta/files/overlayfs-etc-preinit.sh.in b/meta/files/overlayfs-etc-preinit.sh.in index 43c9b04eb9..0e80849f12 100644 --- a/meta/files/overlayfs-etc-preinit.sh.in +++ b/meta/files/overlayfs-etc-preinit.sh.in @@ -15,19 +15,23 @@ mount -t sysfs sysfs /sys [ -z "$CONSOLE" ] && CONSOLE="/dev/console" +BASE_OVERLAY_ETC_DIR={OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc +UPPER_DIR=$BASE_OVERLAY_ETC_DIR/upper +WORK_DIR=$BASE_OVERLAY_ETC_DIR/work + mkdir -p {OVERLAYFS_ETC_MOUNT_POINT} if mount -n -t {OVERLAYFS_ETC_FSTYPE} \ -o {OVERLAYFS_ETC_MOUNT_OPTIONS} \ {OVERLAYFS_ETC_DEVICE} {OVERLAYFS_ETC_MOUNT_POINT} then - mkdir -p {OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper - mkdir -p {OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/work + mkdir -p $UPPER_DIR + mkdir -p $WORK_DIR mount -n -t overlay \ - -o upperdir={OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper \ + -o upperdir=$UPPER_DIR \ -o lowerdir=/etc \ - -o workdir={OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/work \ + -o workdir=$WORK_DIR \ -o index=off,xino=off,redirect_dir=off,metacopy=off \ - {OVERLAYFS_ETC_MOUNT_POINT}/overlay-etc/upper /etc || \ + $UPPER_DIR /etc || \ echo "PREINIT: Mounting etc-overlay failed!" else echo "PREINIT: Mounting </data> failed!" |