diff options
| author | Christian Neukirchen <chneukirchen@gmail.com> | 2015-10-28 18:28:14 +0100 |
|---|---|---|
| committer | Christian Neukirchen <chneukirchen@gmail.com> | 2015-10-28 18:28:14 +0100 |
| commit | 5dd08e2bbb2d34d0f1c3fda9fc8c21117a16e349 (patch) | |
| tree | b3a53f5868af58229853824d9cd6426d92673f84 /mklive.sh.in | |
| parent | 8bbf3c52cb83d1dc7a46bf0a96362845c39e584d (diff) | |
| parent | f0722b06e5f2e3831b19114509ddfca70bcffee0 (diff) | |
| download | hrmpf-5dd08e2bbb2d34d0f1c3fda9fc8c21117a16e349.tar.gz hrmpf-5dd08e2bbb2d34d0f1c3fda9fc8c21117a16e349.tar.xz hrmpf-5dd08e2bbb2d34d0f1c3fda9fc8c21117a16e349.zip | |
Merge branch 'master' of https://github.com/voidlinux/void-mklive
* 'master' of https://github.com/voidlinux/void-mklive: installer: remove liveuser from /etc/sudoers in local installation. installer: get rid of unused systemd checks. installer: detect cciss partitions correctly (3/3). installer: detect cciss partitions correctly (2/2). mklive: make -r append repo to the head rather than replacing. installer: detect ciss(4) devices/partitions correctly (#44).
Diffstat (limited to 'mklive.sh.in')
| -rw-r--r-- | mklive.sh.in | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/mklive.sh.in b/mklive.sh.in index 4838449..63cd510 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -271,7 +271,7 @@ generate_iso_image() { } BOOT_FILES= -XBPS_REPOSITORY= +XBPS_REPOSITORY="--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current" # # main() # @@ -280,7 +280,7 @@ while getopts "a:b:B:r:c:C:T:Kk:l:i:s:S:o:p:h" opt; do a) BASE_ARCH="$OPTARG";; b) BASE_SYSTEM_PKG="$OPTARG";; B) BOOT_FILES="$BOOT_FILES $OPTARG";; - r) XBPS_REPOSITORY="$XBPS_REPOSITORY --repository=$OPTARG ";; + r) XBPS_REPOSITORY="--repository=$OPTARG $XBPS_REPOSITORY";; c) XBPS_CACHEDIR="--cachedir=$OPTARG";; K) readonly KEEP_BUILDDIR=1;; k) KEYMAP="$OPTARG";; @@ -335,7 +335,6 @@ ISOLINUX_DIR="$BOOT_DIR/isolinux" GRUB_DIR="$BOOT_DIR/grub" ISOLINUX_CFG="$ISOLINUX_DIR/isolinux.cfg" -: ${XBPS_REPOSITORY:=--repository=http://repo.voidlinux.eu/current --repository=http://muslrepo.voidlinux.eu/current} : ${SYSLINUX_DATADIR:=$VOIDHOSTDIR/usr/share/syslinux} : ${GRUB_DATADIR:=$VOIDHOSTDIR/usr/share/grub} : ${SPLASH_IMAGE:=data/splash.png} |