mirror of
git://git.yoctoproject.org/poky.git
synced 2025-07-19 12:59:02 +02:00
9863ffc50f
/sys filesystem mounted by the preinit script causes shadowing of /sys/firmware/efi/ by double /sys mounting on systemd enabled systems [1]. As the result EFI tooling is broken [1] sysfs on /sys type sysfs (rw,nosuid,nodev,noexec,relatime) efivarfs on /sys/firmware/efi/efivars type efivarfs (rw,nosuid,nodev,noexec,relatime) sysfs on /sys type sysfs (rw,relatime) (From OE-Core rev: 94b3f86bac16ac3be468e23e1f6aad69cdf502d3) Signed-off-by: Pavel Zhukov <pavel@zhukoff.net> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
56 lines
1.3 KiB
Bash
56 lines
1.3 KiB
Bash
#!/bin/sh
|
|
|
|
echo "PREINIT: Start"
|
|
|
|
PATH=/sbin:/bin:/usr/sbin:/usr/bin
|
|
if {CREATE_MOUNT_DIRS}; then
|
|
mount -o remount,rw /
|
|
|
|
mkdir -p /proc
|
|
mkdir -p /sys
|
|
mkdir -p /run
|
|
mkdir -p /var/run
|
|
mkdir -p {OVERLAYFS_ETC_MOUNT_POINT}
|
|
fi
|
|
|
|
mount -t proc proc /proc
|
|
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
|
|
LOWER_DIR=$BASE_OVERLAY_ETC_DIR/lower
|
|
|
|
if mount -n -t {OVERLAYFS_ETC_FSTYPE} \
|
|
-o {OVERLAYFS_ETC_MOUNT_OPTIONS} \
|
|
{OVERLAYFS_ETC_DEVICE} {OVERLAYFS_ETC_MOUNT_POINT}
|
|
then
|
|
mkdir -p $UPPER_DIR
|
|
mkdir -p $WORK_DIR
|
|
|
|
if {OVERLAYFS_ETC_EXPOSE_LOWER}; then
|
|
mkdir -p $LOWER_DIR
|
|
|
|
# provide read-only access to original /etc content
|
|
mount -o bind,ro /etc $LOWER_DIR
|
|
fi
|
|
|
|
mount -n -t overlay \
|
|
-o upperdir=$UPPER_DIR \
|
|
-o lowerdir=/etc \
|
|
-o workdir=$WORK_DIR \
|
|
-o index=off,xino=off,redirect_dir=off,metacopy=off \
|
|
$UPPER_DIR /etc || \
|
|
echo "PREINIT: Mounting etc-overlay failed!"
|
|
else
|
|
echo "PREINIT: Mounting </data> failed!"
|
|
fi
|
|
|
|
umount /sys
|
|
umount /proc
|
|
|
|
echo "PREINIT: done; starting </sbin/init>"
|
|
exec {SBIN_INIT_NAME}
|