X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage1%2Finstall-1;h=a7bd5423b19184554e13d91d561924c852666149;hb=1eb363044c6ee3115e62736aed4403b750082b44;hp=886d265e9e3563f9cc0c72389d471e6b76f9aef9;hpb=b5bfb2006502b57fab234345a2393fd04e6d55ad;p=hvlinux.git diff --git a/stage1/install-1 b/stage1/install-1 index 886d265..a7bd542 100755 --- a/stage1/install-1 +++ b/stage1/install-1 @@ -1,30 +1,11 @@ #!/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 -} - # 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