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

pkglist.txt

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

pre-pivot.sh

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

prepare-root.sh

@@ -206,7 +206,7 @@ if [[ $CHECK_UPDATE ]]; then
     mkdir -p "$STATEDIR"/rpm
     mkdir -p "$sysroot"/var/lib/rpm
     mount -o bind "$STATEDIR"/rpm "$sysroot"/var/lib/rpm
-    DNF_COMMAND="check-update"
+    DNF_COMMAND="check-update --refresh"
 else
     DNF_COMMAND="install -y"
 fi
@@ -555,6 +555,15 @@ C /cfg/libvirt - - - - -
 EOF
 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
 # FIXME: reproducible