harald/VerityBook
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

20fedorabook/pre-pivot.sh: don't create /usr/local mount by default

Browse source
This commit is contained in:
Harald Hoyer 2018-11-21 09:09:52 +01:00
parent 5cc7fabda1
commit 8f708e13bc
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
20fedorabook/pre-pivot.sh
View file

@ -111,7 +111,7 @@ mkdir -p /run/initramfs/mnt
mount -o discard $datadev /run/initramfs/mnt || die "Failed to mount $datadev" mount -o discard $datadev /run/initramfs/mnt || die "Failed to mount $datadev"
for i in var home cfg local; do for i in var home cfg; do
if ! [[ -d /run/initramfs/mnt/$i ]]; then if ! [[ -d /run/initramfs/mnt/$i ]]; then
mkdir /run/initramfs/mnt/$i mkdir /run/initramfs/mnt/$i
FIRST_TIME=1 FIRST_TIME=1
@ -123,7 +123,8 @@ done
mount -o bind /run/initramfs/mnt/var /sysroot/var mount -o bind /run/initramfs/mnt/var /sysroot/var
mount -o bind /run/initramfs/mnt/home /sysroot/home mount -o bind /run/initramfs/mnt/home /sysroot/home
mount -o bind /run/initramfs/mnt/cfg /sysroot/cfg mount -o bind /run/initramfs/mnt/cfg /sysroot/cfg
mount -o bind /run/initramfs/mnt/local /sysroot/usr/local [[ -d /run/initramfs/mnt/local ]] \
&& mount -o bind /run/initramfs/mnt/local /sysroot/usr/local
umount -l /run/initramfs/mnt &>/dev/null umount -l /run/initramfs/mnt &>/dev/null
if [[ $FIRST_TIME ]]; then if [[ $FIRST_TIME ]]; then
@ -133,13 +134,6 @@ if [[ $FIRST_TIME ]]; then
mount -o bind /sys /sysroot/sys mount -o bind /sys /sysroot/sys
mount -t selinuxfs none /sysroot/sys/fs/selinux mount -t selinuxfs none /sysroot/sys/fs/selinux
# if [ -f /etc/machine-id ]; then
# cp /etc/machine-id /sysroot/cfg/machine-id
# else
# R=$(</proc/sys/kernel/random/uuid)
# echo ${R//-} >/sysroot/cfg/machine-id
# fi
chroot /sysroot bash -c ' chroot /sysroot bash -c '
/usr/sbin/load_policy -i /usr/sbin/load_policy -i
/usr/sbin/setfiles -m -F -v \ /usr/sbin/setfiles -m -F -v \