commit f3ee52741969f9bec5152a8e5a5a494f74d42691 parent 504ddcc91ef5ffc9e3a8a492f5813b6834704dd9 Author: Jan Pobříslo <ccx@te2000.cz> Date: Wed, 2 Nov 2022 01:32:32 +0100 Check for non-clean /run on init and error out appropriately Diffstat:
| M | install | | | 9 | ++++++++- |
1 file changed, 8 insertions(+), 1 deletion(-)
diff --git a/install b/install @@ -55,7 +55,14 @@ EOF "$cmd/s6-cat" >"$dst/init/scripts/populate-run" <<EOF || exit $? #!$sm_dst_package/command/execlineb -P $qc/fdmove -c 2 1 -if { elglob GLOB $(q "$(realpath "$src")")/run-image/* cp -va \$GLOB /run } +$qc/ifelse { $qc/s6-test -e /run/service } { + $qc/foreground { $qc/s6-echo -- "ERROR: /run/service already exists" } + false +} $qc/ifelse { $qc/s6-test -e /run/s6-rc } { + $qc/foreground { $qc/s6-echo -- "ERROR: /run/s6-rc already exists" } + false +} +elglob GLOB $(q "$(realpath "$src")")/run-image/* cp -va \$GLOB /run EOF "$cmd/s6-chmod" 755 "$dst/init/scripts/populate-run" || exit $?