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

[hvlinux.git] / stage1 / install-1

diff --git a/stage1/install-1 b/stage1/install-1
index 886d265..50fbe55 100755 (executable)
--- a/stage1/install-1
+++ b/stage1/install-1
@@ -1,30 +1,12 @@
 #!/bin/bash
-
-LFS_STAGE=stage1
-
-# 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
 
 rscr mult "Performing pre-install" pre-install