projects
/
hvlinux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
-Cleaned-up name of ipkg functions in package definition files.
[hvlinux.git]
/
stage1
/
stage1-install
diff --git
a/stage1/stage1-install
b/stage1/stage1-install
index
6efcf2e
..
dd89a72
100755
(executable)
--- a/
stage1/stage1-install
+++ b/
stage1/stage1-install
@@
-1,7
+1,20
@@
-#!/bin/sh
+#!/bin/
ba
sh
LFS_STAGE=stage1
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
# Reading system configuration informations, functions and package versions.
source ../sysinfos
source ../functions
@@
-14,19
+27,14
@@
export LFS_TMP="${LFS}/tmp"
init_log_file
init_log_file
-rscr mult "Performing pre-install"
cis-
pre-install
+rscr mult "Performing pre-install" pre-install
# Logging-in as 'lfs' user, and executing the install-1 script. The
# 'su -' command starts with a clean environment and enters the home
# directory of the user.
# Logging-in as 'lfs' user, and executing the install-1 script. The
# 'su -' command starts with a clean environment and enters the home
# directory of the user.
-su - lfs -c "cd ${PWD}; ./install-1" &&
-
-rscr mult "Performing post-install" cis-post-install
+su - lfs -c "cd ${PWD}; ./install-1"
-if [ $? -ne 0 ]; then
- echo "*** An error occured during ${LFS_STAGE}"
- exit 1
-fi
+rscr mult "Performing post-install" post-install
echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"
echo "Total build time: $(get_total_build_time ${LFS_LOG_FILE})h"