From 9f809e5211749c09e05dd4647bd34bbe6676d23d Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Wed, 3 Jun 2015 14:36:04 +0200
Subject: installer: repair configuration of pkgs with network installation.

Close #28
---
 installer.sh.in | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

(limited to 'installer.sh.in')

diff --git a/installer.sh.in b/installer.sh.in
index 90a69bc..23c7583 100644
--- a/installer.sh.in
+++ b/installer.sh.in
@@ -799,16 +799,14 @@ install_packages() {
     _arch=$(xbps-uhelper arch)
 
     stdbuf -oL env XBPS_ARCH=${_arch} \
-        xbps-install  -r $TARGETDIR -Sy ${_syspkg} ${_grub} 2>&1 | \
+        xbps-install  -r $TARGETDIR -SyU ${_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
+    xbps-reconfigure -r $TARGETDIR -f base-files >/dev/null 2>&1
+    chroot $TARGETDIR xbps-reconfigure -a
 }
 
 enable_dhcpd() {
-- 
cgit 1.4.1