diff options
| author | Juan RP <xtraeme@voidlinux.eu> | 2015-06-04 09:13:30 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@voidlinux.eu> | 2015-06-04 09:13:30 +0200 |
| commit | 52c027ad0c9c4c35aaeae02a84244884df81c47a (patch) | |
| tree | b3b3c5298b498b0bc1479f1728276a9bf612e445 /mklive.sh.in | |
| parent | 70b6bae1e93b7f66b3aaa3ab0cb0a9872cad9503 (diff) | |
| download | hrmpf-52c027ad0c9c4c35aaeae02a84244884df81c47a.tar.gz hrmpf-52c027ad0c9c4c35aaeae02a84244884df81c47a.tar.xz hrmpf-52c027ad0c9c4c35aaeae02a84244884df81c47a.zip | |
mklive: use $BASE_ARCH where it's required.
Diffstat (limited to 'mklive.sh.in')
| -rw-r--r-- | mklive.sh.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mklive.sh.in b/mklive.sh.in index d7efb09..8d3857d 100644 --- a/mklive.sh.in +++ b/mklive.sh.in @@ -177,7 +177,7 @@ generate_isolinux_boot() { sed -i -e "s|@@SPLASHIMAGE@@|$(basename ${SPLASH_IMAGE})|" \ -e "s|@@KERNVER@@|${KERNELVERSION}|" \ -e "s|@@KEYMAP@@|${KEYMAP}|" \ - -e "s|@@ARCH@@|$(uname -m)|" \ + -e "s|@@ARCH@@|$BASE_ARCH|" \ -e "s|@@LOCALE@@|${LOCALE}|" \ -e "s|@@BOOT_TITLE@@|${BOOT_TITLE}|" \ -e "s|@@BOOT_CMDLINE@@|${BOOT_CMDLINE}|" \ @@ -190,7 +190,7 @@ generate_grub_efi_boot() { sed -i -e "s|@@SPLASHIMAGE@@|$(basename ${SPLASH_IMAGE})|" \ -e "s|@@KERNVER@@|${KERNELVERSION}|" \ -e "s|@@KEYMAP@@|${KEYMAP}|" \ - -e "s|@@ARCH@@|$(uname -m)|" \ + -e "s|@@ARCH@@|$BASE_ARCH|" \ -e "s|@@BOOT_TITLE@@|${BOOT_TITLE}|" \ -e "s|@@BOOT_CMDLINE@@|${BOOT_CMDLINE}|" \ -e "s|@@LOCALE@@|${LOCALE}|" $GRUB_DIR/grub_void.cfg @@ -351,7 +351,7 @@ _linux_series=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITOR KERNELVERSION=$(XBPS_ARCH=$BASE_ARCH $XBPS_QUERY_CMD -r $ROOTFS ${XBPS_REPOSITORY:=-R} -p pkgver ${_linux_series}) KERNELVERSION=$($XBPS_UHELPER_CMD getpkgversion $KERNELVERSION) -: ${OUTPUT_FILE="void-live-${BASE_ARCH:=$(uname -m)}-${KERNELVERSION}-$(date +%Y%m%d).iso"} +: ${OUTPUT_FILE="void-live-${BASE_ARCH}-${KERNELVERSION}-$(date +%Y%m%d).iso"} info_msg "[2/9] Installing software to generate the image: ${REQUIRED_PKGS} ..." install_prereqs |