X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-install-2;h=cb11bcb80faeafce6760e192f228aa1e73c2baf4;hb=f92dd465a70fd3e2986530f26c1e73699bb0021d;hp=53184b9bf69d586d4c58f74858254568112e6625;hpb=f3c8db3027d5dc530e1f30c88e0235975211582e;p=hvlinux.git

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 53184b9..cb11bcb 100755
--- a/stage2/hv-install-2
+++ b/stage2/hv-install-2
@@ -30,15 +30,24 @@ 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}
-ipkg -m noac -s wireless-tools ${WIRELESS_TOOLS}
-ipkg -m noac ${WPA_SUPPLICANT}
+
+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}
+ipkg -m noac ${ACPID}
 
 rscr once "Installing HV-utilities" install-hv-utilities
 rscr once "Installing bootscripts"  install-bootscripts
@@ -59,4 +68,6 @@ echo "Stage2 successfully completed."
 echo "You must now compile a new kernel (go to /usr/src/linux)."
 echo "After that, you can reboot and try your new system."
 
+write_completed_stage
+
 exec /bin/bash --login