Skip to content
This repository has been archived by the owner on Feb 7, 2024. It is now read-only.

Commit

Permalink
fix [#101]
Browse files Browse the repository at this point in the history
  • Loading branch information
n0rad committed Feb 10, 2016
1 parent a920615 commit 752f740
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 5 deletions.
1 change: 1 addition & 0 deletions builder/aci-build.go
Original file line number Diff line number Diff line change
Expand Up @@ -193,6 +193,7 @@ func (aci *Aci) runLevelBuildSetup() {

os.Setenv("BASEDIR", aci.path)
os.Setenv("TARGET", aci.target)
os.Setenv("LOG_LEVEL", logs.GetLevel().String())

if err := utils.ExecCmd(aci.target + "/build-setup.sh"); err != nil {
logs.WithEF(err, aci.fields).Fatal("Build setup failed")
Expand Down
10 changes: 5 additions & 5 deletions builder/aci.go
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ execute_files() {
for file in $fdir/*; do
[ -e "$file" ] && {
[ -x "$file" ] || /cnt/bin/busybox chmod +x "$file"
[ -x "$file" ] || chmod +x "$file"
isLevelEnabled 4 && echo -e "\e[1m\e[32mRunning script -> $file\e[0m"
$file
}
Expand Down Expand Up @@ -56,7 +56,7 @@ export log_level=$(levelFromString ${LOG_LEVEL:-INFO})

const BUILD_SCRIPT = `#!/cnt/bin/busybox sh
set -e
source /cnt/bin/functions.sh
. /cnt/bin/functions.sh
isLevelEnabled "debug" && set -x
export TARGET=$( dirname $0 )
Expand All @@ -69,7 +69,7 @@ execute_files "$TARGET/runlevels/build"

const BUILD_SCRIPT_LATE = `#!/cnt/bin/busybox sh
set -e
source /cnt/bin/functions.sh
. /cnt/bin/functions.sh
isLevelEnabled "debug" && set -x
Expand All @@ -83,7 +83,7 @@ execute_files "$ROOTFS/cnt/runlevels/inherit-build-late"

const PRESTART = `#!/cnt/bin/busybox sh
set -e
source /cnt/bin/functions.sh
. /cnt/bin/functions.sh
isLevelEnabled "debug" && set -x
BASEDIR=${0%/*}
Expand All @@ -108,7 +108,7 @@ execute_files ${CNT_PATH}/runlevels/prestart-late
`
const BUILD_SETUP = `#!/bin/sh
set -e
source ${TARGET}/rootfs/cnt/bin/functions.sh
. ${TARGET}/rootfs/cnt/bin/functions.sh
isLevelEnabled "debug" && set -x
execute_files ${BASEDIR}/runlevels/build-setup
Expand Down

0 comments on commit 752f740

Please sign in to comment.