X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage2%2Finstall-1;h=94ca72f251a0e15b4fa1ba6d83ee4e988e7b880c;hb=b7d1d99f41dcf50a8635f608679947f4455a0c7c;hp=279066d346564cb2d7dc9fbd12e4485be3e0a73a;hpb=b5bfb2006502b57fab234345a2393fd04e6d55ad;p=hvlinux.git

diff --git a/stage2/install-1 b/stage2/install-1
index 279066d..94ca72f 100755
--- a/stage2/install-1
+++ b/stage2/install-1
@@ -1,15 +1,9 @@
 #!/bin/bash
 
-LFS_STAGE=stage2
-
-export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
-export LFS_LOG_DIR=/var/log/hvlinux-install/${LFS_STAGE}
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP=/tmp
-
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
+hvtrap_setup
 source ../packages-list
 source /etc/profile
 
@@ -20,8 +14,7 @@ fi
 
 init_log_file
 
-# Scripts directory
-export SCRDIR=$(pwd)
+rscr mult "Performing pre-install" pre-install
 
 ipkg -l "${PERL}-pass1" ${PERL}
 ipkg -m noac ${KERNEL}
@@ -46,7 +39,7 @@ unset CC
 unset CXX
 unset LDFLAGS
 
-ipkg ${ZLIB}
+ipkg -m acnb ${ZLIB}
 ipkg ${BINUTILS}
 ipkg ${GCC}
 rscr mult "Testing toolchain" toolchain-test
@@ -59,7 +52,7 @@ ipkg ${COREUTILS}
 ipkg -m noac ${IANA}
 ipkg ${MFOUR}
 ipkg ${BISON}
-ipkg ${PROCPS}
+ipkg -m noac ${PROCPS}
 ipkg ${LIBTOOL}
 ipkg ${FLEX}
 ipkg -m noac ${IPROUTE2}