X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Fhv-install-1;h=832b16be2ca26bf8cd083c9e4a79d8f50d10692d;hb=6815a260ef87c376463154ea869c41845b036393;hp=5f00f8a5e59f655fb98ea85cbce2cfda3b082d65;hpb=19609cec14f0e747c491985785c4d714f7f654de;p=hvlinux.git

diff --git a/stage2/hv-install-1 b/stage2/hv-install-1
index 5f00f8a..832b16b 100755
--- a/stage2/hv-install-1
+++ b/stage2/hv-install-1
@@ -1,23 +1,15 @@
 #!/bin/bash
 
-# Reading system configuration informations, functions and package versions.
-source ../sysinfos
-source ../functions
-hvtrap_setup
-source ../packages-list
+source ../functions/main
 source /etc/profile
 
-if [ "x${USER}" != "xroot" ]; then
-    echo "You must be the superuser to install hvlinux."
-    exit 1
-fi
-
+check_for_root_user
 init_log_file
 
 rscr mult "Performing pre-install" pre-install
 
 ipkg -l "${PERL}-pass1" ${PERL}
-ipkg -m noac ${KERNEL}
+ipkg -c -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
 ipkg -m noac ${MANPAGES}
 ipkg ${EGLIBC}
 rscr once "Adjusting toolchain" toolchain-adjust
@@ -46,7 +38,7 @@ rscr mult "Testing toolchain" toolchain-test
 ipkg ${SED} "--bindir=/bin"
 ipkg ${PKG_CONFIG}
 ipkg ${NCURSES}
-ipkg ${UTIL_LINUX_NG}
+ipkg ${UTIL_LINUX}
 ipkg ${E2FSPROGS}
 ipkg ${COREUTILS}
 ipkg -m noac ${IANA}