Gentoo Archives: gentoo-catalyst

From: "Andreas K. Hüttel" <dilfridge@g.o>
To: gentoo-catalyst@l.g.o
Cc: "Andreas K. Hüttel" <dilfridge@g.o>
Subject: [gentoo-catalyst] [PATCH 2/2] Make a proper /run (and more) also in stage1 /tmp/stage1root
Date: Mon, 17 Jan 2022 14:44:12
Message-Id: 20220117144355.1292840-2-dilfridge@gentoo.org
In Reply to: [gentoo-catalyst] [PATCH 1/2] Call systemd-tmpfiles when the chroot is set up by "Andreas K. Hüttel"
1 Signed-off-by: Andreas K. Hüttel <dilfridge@g.o>
2 ---
3 targets/stage1/chroot.sh | 8 ++++++++
4 1 file changed, 8 insertions(+)
5
6 diff --git a/targets/stage1/chroot.sh b/targets/stage1/chroot.sh
7 index 08b9da46..67b06986 100755
8 --- a/targets/stage1/chroot.sh
9 +++ b/targets/stage1/chroot.sh
10 @@ -59,6 +59,11 @@ fi
11 export ROOT="${clst_root_path}"
12 mkdir -p "$ROOT"
13
14 +# Set up /run and its contents inside stage1root, see bug 816303
15 +mkdir "${ROOT}/run"
16 +mount -t tmpfs stage1run "${ROOT}/run" || die
17 +update_tmpfiles
18 +
19 ## START BUILD
20 # First, we drop in a known-good baselayout
21 [ -e ${clst_make_conf} ] && echo "USE=\"${USE} -build\"" >> ${clst_make_conf}
22 @@ -104,3 +109,6 @@ done
23 # Clear USE
24 [ -e ${clst_make_conf} ] && sed -i -e "/^CATALYST_USE/d" ${clst_make_conf}
25 [ -e ${clst_make_conf} ] && sed -i -e "/^USE=\"/s/\${CATALYST_USE} ${USE} ${BOOTSTRAP_USE}//" ${clst_make_conf}
26 +
27 +# Remove run tmpfs again, bug 816303
28 +umount "${ROOT}/run" || die
29 --
30 2.34.1