diff options
| author | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-12 06:40:39 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-12 12:51:33 +0200 |
| commit | a3437967a2ae4730ba638cc80328055e9805e7c9 (patch) | |
| tree | 6e824f088920bb59fd00e0c3b03dcdbf859f74c1 /scripts | |
| parent | 55d4a328c9fa369611115a066f4f305f2b74dafd (diff) | |
Rely on PATH variable for running init programs
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makemodule.am | 2 | ||||
| -rw-r--r-- | scripts/devfs.sh.in | 26 | ||||
| -rw-r--r-- | scripts/overlay.sh (renamed from scripts/overlay.sh.in) | 6 | ||||
| -rw-r--r-- | scripts/trymount.sh (renamed from scripts/trymount.sh.in) | 2 |
4 files changed, 19 insertions, 17 deletions
diff --git a/scripts/Makemodule.am b/scripts/Makemodule.am index 6832788..dd3fa0b 100644 --- a/scripts/Makemodule.am +++ b/scripts/Makemodule.am @@ -3,3 +3,5 @@ helper_SCRIPTS += scripts/devfs.sh scripts/trymount.sh if PYGOSCFG helper_SCRIPTS += scripts/overlay.sh endif + +EXTRA_DIST += scripts/trymount.sh scripts/overlay.sh diff --git a/scripts/devfs.sh.in b/scripts/devfs.sh.in index a39d3ea..af002f6 100644 --- a/scripts/devfs.sh.in +++ b/scripts/devfs.sh.in @@ -1,20 +1,20 @@ #!/bin/sh -@SBINPATH@/mount -t devtmpfs none /dev +mount -t devtmpfs none /dev -[ -c /dev/console ] || @SBINPATH@/mknod -m 600 /dev/console c 5 1 -[ -c /dev/tty ] || @SBINPATH@/mknod -m 666 /dev/tty c 5 0 -[ -c /dev/null ] || @SBINPATH@/mknod -m 666 /dev/null c 1 3 -[ -c /dev/kmsg ] || @SBINPATH@/mknod -m 660 /dev/kmsg c 1 11 -[ -e /dev/fd ] || @BINPATH@/ln -snf /proc/self/fd /dev/fd -[ -e /dev/stdin ] || @BINPATH@/ln -snf /proc/self/fd/0 /dev/stdin -[ -e /dev/stdout ] || @BINPATH@/ln -snf /proc/self/fd/1 /dev/stdout -[ -e /dev/stderr ] || @BINPATH@/ln -snf /proc/self/fd/2 /dev/stderr -[ -e /proc/kcore ] && @BINPATH@/ln -snf /proc/kcore /dev/core +[ -c /dev/console ] || mknod -m 600 /dev/console c 5 1 +[ -c /dev/tty ] || mknod -m 666 /dev/tty c 5 0 +[ -c /dev/null ] || mknod -m 666 /dev/null c 1 3 +[ -c /dev/kmsg ] || mknod -m 660 /dev/kmsg c 1 11 +[ -e /dev/fd ] || ln -snf /proc/self/fd /dev/fd +[ -e /dev/stdin ] || ln -snf /proc/self/fd/0 /dev/stdin +[ -e /dev/stdout ] || ln -snf /proc/self/fd/1 /dev/stdout +[ -e /dev/stderr ] || ln -snf /proc/self/fd/2 /dev/stderr +[ -e /proc/kcore ] && ln -snf /proc/kcore /dev/core -@BINPATH@/mkdir -p /dev/mqueue -m 1777 -@BINPATH@/mkdir -p /dev/pts -m 0755 -@BINPATH@/mkdir -p /dev/shm -m 1777 +mkdir -p /dev/mqueue -m 1777 +mkdir -p /dev/pts -m 0755 +mkdir -p /dev/shm -m 1777 @SCRIPTDIR@/trymount.sh "/dev/mqueue" "mqueue" "noexec,nosuid,nodev" @SCRIPTDIR@/trymount.sh "/dev/pts" "devpts" "noexec,nosuid,gid=5,mode=0620" diff --git a/scripts/overlay.sh.in b/scripts/overlay.sh index b53eea7..090671c 100644 --- a/scripts/overlay.sh.in +++ b/scripts/overlay.sh @@ -11,11 +11,11 @@ fi if [ -d "$lower" ]; then if [ -d "$upper" ]; then - @BINPATH@/mkdir -p "$work" - @SBINPATH@/mount -t overlay overlay \ + mkdir -p "$work" + mount -t overlay overlay \ -olowerdir=${lower},upperdir=${upper},workdir=${work} \ ${target} else - @SBINPATH@/mount --bind "$lower" "$target" + mount --bind "$lower" "$target" fi fi diff --git a/scripts/trymount.sh.in b/scripts/trymount.sh index a382792..9be77f6 100644 --- a/scripts/trymount.sh.in +++ b/scripts/trymount.sh @@ -1,7 +1,7 @@ #!/bin/sh if [ -d "$1" ]; then - if @BINPATH@/grep -qsE "[[:space:]]+$2$" "/proc/filesystems"; then + if grep -qsE "[[:space:]]+$2$" "/proc/filesystems"; then mount -n -t "$2" -o "$3" "$2" "$1" fi fi |