mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

mklive.sh.in: if REPOSITORY_CACHE not set use system default cachedir.

Browse Source
This commit is contained in:
Juan RP 2013-07-12 11:12:40 +02:00
parent 0fc1050790
commit d17210fb5b
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
mklive.sh.in
View File

@ -143,7 +143,7 @@ generate_initramfs() {
# Install required pkgs in a temporary rootdir to create # Install required pkgs in a temporary rootdir to create
# the initramfs and to copy required files. # the initramfs and to copy required files.
$XBPS_INSTALL_CMD -r $ROOTFS/kernel_temp -Sy \ $XBPS_INSTALL_CMD -r $ROOTFS/kernel_temp -Sy \
base-system void-mklive >>$LOGFILE 2>&1 base-system void-mklive -c $REPOSITORY_CACHE >>$LOGFILE 2>&1
systemd-nspawn -D $ROOTFS/kernel_temp /usr/bin/dracut --${COMPRESSTYPE} \ systemd-nspawn -D $ROOTFS/kernel_temp /usr/bin/dracut --${COMPRESSTYPE} \
--force-add "vmklive" "/boot/initrd.lz" $KERNELVERSION >>$LOGFILE 2>&1 --force-add "vmklive" "/boot/initrd.lz" $KERNELVERSION >>$LOGFILE 2>&1
@ -315,6 +315,9 @@ fi
if [ -z "$COMPRESSTYPE" ]; then if [ -z "$COMPRESSTYPE" ]; then
COMPRESSTYPE=xz COMPRESSTYPE=xz
fi fi
if [ -z "$REPOSITORYCACHE" ]; then
REPOSITORY_CACHE="/var/cache/xbps"
fi
# Create or read configuration file. # Create or read configuration file.
if [ ! -r $CONFIG_FILE ]; then if [ ! -r $CONFIG_FILE ]; then
@ -364,11 +367,7 @@ if [ $? -ne 0 ]; then
fi fi
XBPS_ARGS="-r $ROOTFS -y" XBPS_ARGS="-r $ROOTFS -y"
if [ -n "$REPOSITORY_CACHE" ]; then XBPS_ARGS="$XBPS_ARGS -c $REPOSITORY_CACHE"
XBPS_ARGS="$XBPS_ARGS -c $REPOSITORY_CACHE"
else
XBPS_ARGS="$XBPS_ARGS -c /var/cache/xbps"
fi
XBPS_VERSION=$($XBPS_QUERY_CMD -V|awk '{print $2}') XBPS_VERSION=$($XBPS_QUERY_CMD -V|awk '{print $2}')
case $XBPS_VERSION in case $XBPS_VERSION in
# XBPS >= 0.21 # XBPS >= 0.21