sablink/docker-isobuilder-amd64
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

sabayon_molecules.sh: Use new build script and minor changes

Browse Source
This commit is contained in:
Daniele Rondina
2018-09-01 00:18:46 +02:00
parent f9a7bca0e8
commit 28e06f1ca3
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scripts/sabayon_molecules.sh
+9 -5
View File
@@ -10,6 +10,9 @@ SABAYON_MOLECULES_ISO=${SABAYON_MOLECULES_ISO:-}
SABAYON_MOLECULES_ENVFILE=${SABAYON_MOLECULES_ENVFILE:-$(pwd)/confs/iso_build.env}
SABAYON_MOLECULES_SYSTEMD_MODE=${SABAYON_MOLECULES_SYSTEMD_MODE:-0}
SABAYON_MOLECULES_POSTSCRIPT=${SABAYON_MOLECULES_POSTSCRIPT:-}
SABAYON_MOLECULES_JOURNAL_NLOG=${SABAYON_MOLECULES_JOURNAL_NLOG:-10}
SABAYON_MOLECULES_SYSTEMD_SLEEP=${SABAYON_MOLECULES_SYSTEMD_SLEEP:-5}
SABAYON_MOLECULES_SCRIPT=${SABAYON_MOLECULES_SCRIPT:-${SABAYON_MOLECULES_DIR}/scripts/sabayon_iso_build.sh}
sabayon_molecules_info () {
@@ -29,6 +32,7 @@ SABAYON_MOLECULES_SYSTEMD_MODE = ${SABAYON_MOLECULES_SYSTEMD_MODE}
SABAYON_MOLECULES_ISO = ${SABAYON_MOLECULES_ISO}
SABAYON_MOLECULES_CHROOTS = ${SABAYON_MOLECULES_CHROOTS}
SABAYON_MOLECULES_SOURCES = ${SABAYON_MOLECULES_SOURCES}
SABAYON_MOLECULES_SCRIPT = ${SABAYON_MOLECULES_SCRIPT}
${info_args}
"
return 0
@@ -167,8 +171,8 @@ sabayon_molecules_run () {
sabayon_molecules_echo "Starting SYSTEMD"
exec /sbin/init --system --show-status=true &
sabayon_molecules_echo "Waiting for systemd starting...sleep 5"
sleep 5
sabayon_molecules_echo "Waiting for systemd starting...sleep ${SABAYON_MOLECULES_SYSTEMD_SLEEP}"
sleep ${SABAYON_MOLECULES_SYSTEMD_SLEEP}
sabayon_molecules_echo "FAILED SYSTEMD SERVICES"
$systemctl --failed || return 1
@@ -177,7 +181,7 @@ sabayon_molecules_run () {
$systemctl status || return 1
sabayon_molecules_echo "JOURNALCTL BOOTSTRAP LOG"
$journaltcl -b --no-pager
$journaltcl -b --no-pager -n ${SABAYON_JOURNAL_NLOG}
fi
sabayon_molecules_echo \
@@ -225,8 +229,8 @@ sabayon_molecules_run () {
local date_end=""
local date_start=$(date +%s)
sabayon_molecules_echo "START iso_build.sh script."
${SABAYON_MOLECULES_DIR}/scripts/iso_build.sh $@ || return 1
sabayon_molecules_echo "STARTING ${SABAYON_MOLECULES_SCRIPT} script."
${SABAYON_MOLECULES_SCRIPT} $@ || return 1
date_end=$(date +%s)
sabayon_molecules_echo \
"END iso_build.sh script. Build process time: $((${date_end} - ${date_start})) secs."