-Completed transition to new ipkg method (ipkg.def), but still problem with eglibc...

[hvlinux.git] / stage0 / install-1

diff --git a/stage0/install-1 b/stage0/install-1
index 749d949..22fb3aa 100755 (executable)
--- a/stage0/install-1
+++ b/stage0/install-1
@@ -1,32 +1,15 @@
 #!/bin/bash
-
-LFS_STAGE=stage0
-
-# Let shell functions inherit ERR trap.  Same as `set -E'.
-set -o errtrace
-
-# Setting ERR trap does implicit `set -o errexit'.
-trap myerr ERR
-
-function myerr()
-{
-    echo
-    echo "*** An error occured during ${LFS_STAGE}"
-    exit 1
-}
+set -o errtrace # Let shell functions inherit ERR trap.  Same as `set -E'.
 
 # Reading system configuration informations, functions and package versions.
 source ../sysinfos
 source ../functions
+hvtrap_setup
 source ../packages-list
 
-export LFS_PKG_DIR="$(dirname $(pwd))/packages/${LFS_STAGE}"
-export LFS_LOG_DIR=${LFS}/var/log/hvlinux-install/${LFS_STAGE}
-export LFS_LOG_FILE=${LFS_LOG_DIR}/install.log
-export LFS_TMP="${LFS}/tmp"
+init_log_file
 
-echo "Performing pre-install"
-./pre-install
+rscr mult "Performing pre-install" pre-install
 
 # Logging-in as 'lfs' user, and executing the install-2 script. The
 # 'su -' command starts with a clean environment and enters the home