Unified · Split
| @@ -143,7 +143,7 @@ generate_initramfs() { · 142 unmodified lines | ||
| 143 | 143 | # Install required pkgs in a temporary rootdir to create |
| 144 | 144 | # the initramfs and to copy required files. |
| 145 | 145 | $XBPS_INSTALL_CMD -r $ROOTFS/kernel_temp -Sy \ |
| 146 | − base-system void-mklive >>$LOGFILE 2>&1 | |
| 146 | + base-system void-mklive -c $REPOSITORY_CACHE >>$LOGFILE 2>&1 | |
| 147 | 147 | |
| 148 | 148 | systemd-nspawn -D $ROOTFS/kernel_temp /usr/bin/dracut --${COMPRESSTYPE} \ |
| 149 | 149 | --force-add "vmklive" "/boot/initrd.lz" $KERNELVERSION >>$LOGFILE 2>&1 |
| @@ -315,6 +315,9 @@ fi · 165 unmodified lines | ||
| 315 | 315 | if [ -z "$COMPRESSTYPE" ]; then |
| 316 | 316 | COMPRESSTYPE=xz |
| 317 | 317 | fi |
| 318 | +if [ -z "$REPOSITORYCACHE" ]; then | |
| 319 | + REPOSITORY_CACHE="/var/cache/xbps" | |
| 320 | +fi | |
| 318 | 321 | |
| 319 | 322 | # Create or read configuration file. |
| 320 | 323 | if [ ! -r $CONFIG_FILE ]; then |
| @@ -364,11 +367,7 @@ if [ $? -ne 0 ]; then · 43 unmodified lines | ||
| 364 | 367 | fi |
| 365 | 368 | |
| 366 | 369 | XBPS_ARGS="-r $ROOTFS -y" |
| 367 | −if [ -n "$REPOSITORY_CACHE" ]; then | |
| 368 | − XBPS_ARGS="$XBPS_ARGS -c $REPOSITORY_CACHE" | |
| 369 | −else | |
| 370 | − XBPS_ARGS="$XBPS_ARGS -c /var/cache/xbps" | |
| 371 | −fi | |
| 370 | +XBPS_ARGS="$XBPS_ARGS -c $REPOSITORY_CACHE" | |
| 372 | 371 | XBPS_VERSION=$($XBPS_QUERY_CMD -V|awk '{print $2}') |
| 373 | 372 | case $XBPS_VERSION in |
| 374 | 373 | # XBPS >= 0.21 |