X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-install-2;h=857afa36334935cf66a43e17a5f0f5e4bda7764c;hb=9b734560ce02e626f7ea58ea9153b5e8daa00831;hp=6f7cf5fe4636913bcc9762ea9f35c8d721c5436a;hpb=19609cec14f0e747c491985785c4d714f7f654de;p=hvlinux.git

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 6f7cf5f..857afa3 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -1,9 +1,6 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-source ../packages-list
+source ../functions/main
 
 init_log_file
 
@@ -33,12 +30,23 @@ ipkg ${PSMISC}
 ipkg ${SHADOW}
 ipkg -m noac ${SYSKLOGD}
 ipkg -m noac ${SYSVINIT}
-ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
+FORCE_UNSAFE_CONFIGURE=1 ipkg ${TAR_PACKAGE} "--bindir=/bin --libexecdir=/usr/sbin"
 ipkg ${TEXINFO}
 ipkg ${UDEV}
 ipkg -m noac ${UDEV_CONFIG}
 ipkg ${GRUB}
 ipkg -m acnb ${DHCP}
+
+if [ -n "${WIFI_SUPPORT}" ]; then
+    PREFIX=/usr ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
+    ipkg -m noac ${WPA_SUPPLICANT}
+
+    if [ -n "${B43_LPPHY}" ]; then
+        PREFIX=/usr ipkg -m noac ${B43_FWCUTTER}
+        ipkg -m noac -s firmware-b43-lpphy ${FIRMWARE_B43_LPPHY}
+    fi
+fi
+
 ipkg ${NANO}
 
 rscr once "Installing HV-utilities" install-hv-utilities