diff options
| author | Jonathan Bauer | 2014-01-30 14:43:21 +0100 |
|---|---|---|
| committer | Jonathan Bauer | 2014-01-30 14:43:21 +0100 |
| commit | 77f6383ff873ae3d4d07cfab9b127dd16dcb2338 (patch) | |
| tree | cc7a06c3d307a07585ec87c6b52934ef5b900188 /remote | |
| parent | [rfs-s31] oops (diff) | |
| download | tm-scripts-77f6383ff873ae3d4d07cfab9b127dd16dcb2338.tar.gz tm-scripts-77f6383ff873ae3d4d07cfab9b127dd16dcb2338.tar.xz tm-scripts-77f6383ff873ae3d4d07cfab9b127dd16dcb2338.zip | |
[rfs] moved /etc/functions.inc to /inc/functions
since we have that include directory :)
Diffstat (limited to 'remote')
| -rw-r--r-- | remote/rootfs/rootfs-stage31/data/inc/functions (renamed from remote/rootfs/rootfs-stage31/data/etc/functions.inc) | 0 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage31/data/init | 4 | ||||
| -rwxr-xr-x | remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/remote/rootfs/rootfs-stage31/data/etc/functions.inc b/remote/rootfs/rootfs-stage31/data/inc/functions index ce510aac..ce510aac 100644 --- a/remote/rootfs/rootfs-stage31/data/etc/functions.inc +++ b/remote/rootfs/rootfs-stage31/data/inc/functions diff --git a/remote/rootfs/rootfs-stage31/data/init b/remote/rootfs/rootfs-stage31/data/init index 250767e3..fe521ddb 100755 --- a/remote/rootfs/rootfs-stage31/data/init +++ b/remote/rootfs/rootfs-stage31/data/init @@ -16,7 +16,7 @@ export PATH=/bin:/sbin:/usr/bin:/usr/sbin # import common functions -. "/etc/functions.inc" +. "/inc/functions" # mount the important standard directories busybox mount -n -t tmpfs -o 'mode=755' run "/run" @@ -86,7 +86,7 @@ done # copy files needed for stage3.2 to FUTURE_ROOT echo "Copying busybox etc. to stage32..." -tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/etc/functions.inc" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/" +tar -cp "/bin" "/sbin" "/usr/bin" "/usr/sbin" "/inc/functions" | tar -xp -C "${FUTURE_ROOT}/opt/openslx/" # set the SLX_ROOT_PASS if given in config if [ ! -z "$SLX_ROOT_PASS" ]; then diff --git a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons index f1253602..c7ce64b9 100755 --- a/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons +++ b/remote/rootfs/rootfs-stage32/data/opt/openslx/scripts/systemd-setup_slx_addons @@ -20,7 +20,7 @@ [ -z "${SLX_ADDONS}" ] && { echo "No addons configured. Nothing to do :-)."; exit 0; } # source functions.inc for the download function -. /opt/openslx/etc/functions.inc || { echo "functions.inc not found!"; exit 1337; } +. /opt/openslx/inc/functions || { echo "/opt/openslx/inc/functions not found!"; exit 1337; } # quick fix for the missing FUTURE_ROOT needed by /opt/openslx/etc/functions.inc export FUTURE_ROOT="/" |