summary refs log tree commit diff
diff options
context:
space:
mode:
authorGottox <g@s01.de>2014-01-22 10:42:02 +0100
committerGottox <g@s01.de>2014-01-22 10:42:02 +0100
commitea37f5fa4e3d0e015b4487a08ea4a767678c8966 (patch)
tree21b9b1b520ef2fa7370dc82be449f00af8bea454
parent2d29c1aa7c1ee4e3550e46daeb5bbed8484ab4e7 (diff)
parente5df5f03d154efea89e48a481a834b713cdf25d8 (diff)
downloadhrmpf-ea37f5fa4e3d0e015b4487a08ea4a767678c8966.tar.gz
hrmpf-ea37f5fa4e3d0e015b4487a08ea4a767678c8966.tar.xz
hrmpf-ea37f5fa4e3d0e015b4487a08ea4a767678c8966.zip
Merge branch 'master' of https://github.com/voidlinux/void-mklive
-rw-r--r--mkrootfs.sh.in6
1 files changed, 3 insertions, 3 deletions
diff --git a/mkrootfs.sh.in b/mkrootfs.sh.in
index f51f673..ee90ac5 100644
--- a/mkrootfs.sh.in
+++ b/mkrootfs.sh.in
@@ -137,8 +137,8 @@ fi
 mkdir -p $rootfs/var/db/xbps/keys
 cp $KEYSDIR/${VOIDRSAPUBKEY}.plist $rootfs/var/db/xbps/keys
 
-run_cmd "xbps-install -S $XBPS_CONF -r $rootfs"
-run_cmd "xbps-query -r $rootfs $XBPS_CONF -ppkgver $PKGBASE"
+run_cmd "xbps-install -S $XBPS_CONFFILE -r $rootfs"
+run_cmd "xbps-query -r $rootfs $XBPS_CONFFILE -ppkgver $PKGBASE"
 
 chmod 755 $rootfs
 
@@ -149,7 +149,7 @@ mount_pseudofs
 #
 # Install base-system to the rootfs directory.
 #
-run_cmd_target "xbps-install -S $XBPS_CONF -r $rootfs -y ${PKGS}"
+run_cmd_target "xbps-install -S $XBPS_CONFFILE -r $rootfs -y ${PKGS}"
 
 # Enable en_US.UTF-8 locale and generate it into the target rootfs.
 LOCALE=en_US.UTF-8