aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2016-06-28 21:53:45 -0700
committerBrian Dolbec <dolsen@gentoo.org>2016-06-28 22:09:12 -0700
commitbe1d8297fc2261f430a52cef8a444deb96555c43 (patch)
tree9260d46d12331e25272817c6f933bd27fdf0ff24
parentfileops.py: Fix a traceback clearing teh old profile link (diff)
downloadcatalyst-be1d8297fc2261f430a52cef8a444deb96555c43.tar.gz
catalyst-be1d8297fc2261f430a52cef8a444deb96555c43.tar.bz2
catalyst-be1d8297fc2261f430a52cef8a444deb96555c43.zip
targets/*: Add shebangs for any scripts without one
This is to prevent errors like: 27 Jun 2016 21:29:02 EDT: ERROR : Exception running action sequence build_kernel Traceback (most recent call last): File "/usr/lib64/python3.4/site-packages/catalyst/base/stagebase.py", line 1393, in run getattr(self, x)() File "/usr/lib64/python3.4/site-packages/catalyst/base/stagebase.py", line 1508, in build_kernel env=self.env) File "/usr/lib64/python3.4/site-packages/catalyst/support.py", line 47, in cmd proc = Popen(args, env=env) File "/usr/lib64/python3.4/subprocess.py", line 859, in __init__ restore_signals, start_new_session) File "/usr/lib64/python3.4/subprocess.py", line 1457, in _execute_child raise child_exception_type(errno_num, err_msg) OSError: [Errno 8] Exec format error
-rwxr-xr-xtargets/embedded/unmerge.sh1
-rwxr-xr-xtargets/livecd-stage1/livecd-stage1-controller.sh1
-rwxr-xr-xtargets/livecd-stage2/livecd-stage2-controller.sh1
-rwxr-xr-xtargets/support/filesystem-functions.sh2
-rwxr-xr-xtargets/support/functions.sh2
-rwxr-xr-xtargets/support/target_image_setup.sh1
6 files changed, 8 insertions, 0 deletions
diff --git a/targets/embedded/unmerge.sh b/targets/embedded/unmerge.sh
index 9611c0ab..6c558018 100755
--- a/targets/embedded/unmerge.sh
+++ b/targets/embedded/unmerge.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
${clst_CHROOT} ${clst_chroot_path} /bin/bash << EOF
ROOT=/tmp/mergeroot emerge -C $* || exit 1
diff --git a/targets/livecd-stage1/livecd-stage1-controller.sh b/targets/livecd-stage1/livecd-stage1-controller.sh
index 19b8dd13..7bf3bce1 100755
--- a/targets/livecd-stage1/livecd-stage1-controller.sh
+++ b/targets/livecd-stage1/livecd-stage1-controller.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
source ${clst_shdir}/support/functions.sh
diff --git a/targets/livecd-stage2/livecd-stage2-controller.sh b/targets/livecd-stage2/livecd-stage2-controller.sh
index a98cb471..10ee98e6 100755
--- a/targets/livecd-stage2/livecd-stage2-controller.sh
+++ b/targets/livecd-stage2/livecd-stage2-controller.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
source ${clst_shdir}/support/functions.sh
source ${clst_shdir}/support/filesystem-functions.sh
diff --git a/targets/support/filesystem-functions.sh b/targets/support/filesystem-functions.sh
index 98fd5fe3..0c144ba8 100755
--- a/targets/support/filesystem-functions.sh
+++ b/targets/support/filesystem-functions.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
# Dont forget to update functions.sh check_looptype
# $1 is the target directory for the filesystem
diff --git a/targets/support/functions.sh b/targets/support/functions.sh
index f6faa614..cca2fd82 100755
--- a/targets/support/functions.sh
+++ b/targets/support/functions.sh
@@ -1,3 +1,5 @@
+#!/bin/bash
+
copy_to_chroot() {
local src_file=$1
local dest_dir=${clst_chroot_path}${2:-/tmp}
diff --git a/targets/support/target_image_setup.sh b/targets/support/target_image_setup.sh
index b428d4ed..559bc56c 100755
--- a/targets/support/target_image_setup.sh
+++ b/targets/support/target_image_setup.sh
@@ -1,3 +1,4 @@
+#!/bin/bash
source ${clst_shdir}/support/functions.sh
source ${clst_shdir}/support/filesystem-functions.sh