| @@ -71,13 +71,15 @@ _EOF · 70 unmodified lines |
| 71 | 71 | } |
| 72 | 72 | |
| 73 | 73 | copy_void_keys() { |
| 74 | | − if [ ! -d "$1"/var/db/xbps/keys ]; then |
| 75 | | − mkdir -p "$1"/var/db/xbps/keys |
| 76 | | − cp keys/*.plist "$1"/var/db/xbps/keys |
| 77 | | − fi |
| 74 | + mkdir -p "$1"/var/db/xbps/keys |
| 75 | + cp keys/*.plist "$1"/var/db/xbps/keys |
| 76 | +} |
| 77 | +copy_void_conf() { |
| 78 | + install -Dm644 data/void-vpkgs.conf "$1"/etc/xbps/virtualpkg.d/void.conf |
| 78 | 79 | } |
| 79 | 80 | |
| 80 | 81 | install_prereqs() { |
| 82 | + copy_void_conf $VOIDHOSTDIR |
| 81 | 83 | $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y ${REQUIRED_PKGS} >> $LOGFILE 2>&1 |
| 82 | 84 | if [ $? -ne 0 ]; then |
| 83 | 85 | info_msg "Failed to install required software, exiting..." |
| @@ -89,12 +91,14 @@ install_packages() { · 5 unmodified lines |
| 89 | 91 | if [ -n "$BASE_ARCH" ]; then |
| 90 | 92 | export XBPS_ARCH="$BASE_ARCH" |
| 91 | 93 | fi |
| 94 | + copy_void_conf $ROOTFS |
| 92 | 95 | # Check that all pkgs are reachable. |
| 93 | 96 | ${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -yn ${PACKAGE_LIST} >>$LOGFILE 2>&1 |
| 94 | 97 | if [ $? -ne 0 ]; then |
| 95 | 98 | info_msg "Missing required binary packages, exiting..." |
| 96 | 99 | error_out |
| 97 | 100 | fi |
| 101 | + |
| 98 | 102 | ${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -y ${PACKAGE_LIST} >>$LOGFILE 2>&1 |
| 99 | 103 | ${XBPS_INSTALL_CMD} -r $ROOTFS $XBPS_REPOSITORY $XBPS_CACHEDIR -yu >>$LOGFILE 2>&1 |
| 100 | 104 | ${XBPS_REMOVE_CMD} -r $ROOTFS $XBPS_CACHEDIR -o >>$LOGFILE 2>&1 |
| @@ -125,6 +129,7 @@ generate_initramfs() { · 24 unmodified lines |
| 125 | 129 | # Install required pkgs in a temporary rootdir to create |
| 126 | 130 | # the initramfs and to copy required files. |
| 127 | 131 | copy_dracut_files $VOIDHOSTDIR |
| 132 | + copy_void_conf $VOIDHOSTDIR |
| 128 | 133 | $XBPS_INSTALL_CMD -r $VOIDHOSTDIR $XBPS_REPOSITORY $XBPS_CACHEDIR -y base-system xz lz4 >>$LOGFILE 2>&1 |
| 129 | 134 | |
| 130 | 135 | if [ "$BASE_SYSTEM_PKG" = "base-system-systemd" ]; then |
| @@ -323,13 +328,13 @@ install_prereqs · 192 unmodified lines |
| 323 | 328 | # |
| 324 | 329 | # Install live system and specified packages. |
| 325 | 330 | # |
| 326 | | −info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..." |
| 327 | | −install_packages |
| 328 | | − |
| 329 | 331 | mkdir -p "$ROOTFS"/etc |
| 330 | 332 | [ -s data/motd ] && cp data/motd $ROOTFS/etc |
| 331 | 333 | [ -s data/issue ] && cp data/issue $ROOTFS/etc |
| 332 | 334 | |
| 335 | +info_msg "[3/9] Installing void pkgs into the rootfs: ${PACKAGE_LIST} ..." |
| 336 | +install_packages |
| 337 | + |
| 333 | 338 | export PATH=$VOIDHOSTDIR/usr/bin:$VOIDHOSTDIR/usr/sbin:$PATH |
| 334 | 339 | export LD_LIBRARY_PATH=$VOIDHOSTDIR/usr/lib |
| 335 | 340 | # |