Remplacé echo par msg_log

[hvlinux.git] / stage2 / hv-install-2

diff --git a/stage2/hv-install-2 b/stage2/hv-install-2
index 6f7cf5f..cb11bcb 100755 (executable)
--- 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,13 +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}
+
+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
@@ -60,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