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

Merge branch 'master' of ssh://pagure.io/Fedorabook

Browse source
This commit is contained in:
Harald Hoyer 2018-11-19 15:31:03 +01:00
parent b18c4cca69 5238f7ae4e
commit 535cd8bd83
3 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
pkglist.txt
View file

@ -54,6 +54,8 @@ geolite2-city
geolite2-country geolite2-country
gettext gettext
git git
gtk3-devel
glib2-devel
gnome-initial-setup gnome-initial-setup
gnome-remote-desktop gnome-remote-desktop
gnu-efi gnu-efi

1
pre-pivot.sh
View file

@ -120,6 +120,7 @@ for i in var home cfg; do
fi fi
done done
[ -d /run/initramfs/mnt/local ] && mount -o bind /run/initramfs/mnt/local /sysroot/usr/local
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

11
prepare-root.sh
View file

@ -206,7 +206,7 @@ if [[ $CHECK_UPDATE ]]; then
mkdir -p "$STATEDIR"/rpm mkdir -p "$STATEDIR"/rpm
mkdir -p "$sysroot"/var/lib/rpm mkdir -p "$sysroot"/var/lib/rpm
mount -o bind "$STATEDIR"/rpm "$sysroot"/var/lib/rpm mount -o bind "$STATEDIR"/rpm "$sysroot"/var/lib/rpm
DNF_COMMAND="check-update" DNF_COMMAND="check-update --refresh"
else else
DNF_COMMAND="install -y" DNF_COMMAND="install -y"
fi fi
@ -555,6 +555,15 @@ C /cfg/libvirt - - - - -
EOF EOF
fi fi
#---------------
# usr/local
mkdir -p "$sysroot"/usr/share/factory/usr/
mv "$sysroot"/usr/local "$sysroot"/usr/share/factory/usr/local
mkdir -p "$sysroot"/usr/local
cat >> "$sysroot"/usr/lib/tmpfiles.d/usrlocal.conf <<EOF
C /usr/local - - - - -
EOF
#--------------- #---------------
# brlapi # brlapi
# FIXME: reproducible # FIXME: reproducible