diff options
| author | Juan RP <xtraeme@voidlinux.eu> | 2015-05-27 17:24:48 +0200 |
|---|---|---|
| committer | Juan RP <xtraeme@voidlinux.eu> | 2015-05-27 17:24:48 +0200 |
| commit | 9b4819f33afea788b3ea8c991392db5d3b11b34f (patch) | |
| tree | e81da56c46c6efaae1c903a71626f0cbcd148045 /installer.sh.in | |
| parent | 00dda59b0ba84253af985be91613b4b5c2d17670 (diff) | |
| download | hrmpf-9b4819f33afea788b3ea8c991392db5d3b11b34f.tar.gz hrmpf-9b4819f33afea788b3ea8c991392db5d3b11b34f.tar.xz hrmpf-9b4819f33afea788b3ea8c991392db5d3b11b34f.zip | |
installer: make remote install work with musl live images.
Diffstat (limited to 'installer.sh.in')
| -rw-r--r-- | installer.sh.in | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/installer.sh.in b/installer.sh.in index 3942d49..ed2782b 100644 --- a/installer.sh.in +++ b/installer.sh.in @@ -794,12 +794,20 @@ install_packages() { cp -a /usr/share/xbps.d $TARGETDIR/usr/share/ cp /var/db/xbps/keys/*.plist $TARGETDIR/var/db/xbps/keys mkdir -p $TARGETDIR/boot/grub - stdbuf -oL xbps-install -r $TARGETDIR -Sy ${_syspkg} ${_grub} 2>&1 | \ + + _arch=$(xbps-uhelper arch) + + stdbuf -oL env XBPS_ARCH=${_arch} \ + xbps-install -r $TARGETDIR -Sy ${_syspkg} ${_grub} 2>&1 | \ DIALOG --title "Installing base system packages..." \ --programbox 24 80 if [ $? -ne 0 ]; then DIE 1 fi + # If uname -m != _arch perform a reconfiguration. + if [ "$(uname -m)" != "${_arch}" ]; then + XBPS_ARCH=${_arch} xbps-reconfigure -r $TARGETDIR -a + fi } enable_dhcpd() { |