mrrl-containers

commit ae88a8a8e21fbf6f55844639b4e64b75519deb0c
parent f43b2bf0b8b3335d4eaac4ddd04103e85e75cd50
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Fri, 18 Dec 2020 05:36:34 +0100

Fix variable syntax for execline.
Diffstat:
M
sbin/ns_run
 | 
12
++++++------

1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/sbin/ns_run b/sbin/ns_run
@@ -50,15 +50,15 @@ backtick -i NS_FINAL_SCRIPT {
 
 	if {
 		printf "%s\n"
-		"if { pivot_root . \$NS_TMPFS/oldroot }"
+		"if { pivot_root . \${NS_TMPFS}/oldroot }"
 	}
 	if {
 		ns_umount_script.awk
-		-vROOT=/$NS_TMPFS/oldroot
-		-vBIN=/$NS_TMPFS/bin
+		-vROOT=/${NS_TMPFS}/oldroot
+		-vBIN=/${NS_TMPFS}/bin
 		/proc/self/mountinfo
 	}
-	if { printf "%s\n" "./$NS_TMPFS/bin/busybox chpst -/ ." }
+	if { printf "%s\n" "./${NS_TMPFS}/bin/busybox chpst -/ ." }
 	# quote all the arguments we got for interpretation by execline
 	forx -o 0 X { $@ } importas -i X X s6-quote -- $X
 }
@@ -110,8 +110,8 @@ if { s6-mount -nwt mqueue -o nosuid,nodev,noexec,relatime mqueue dev/mqueue }
 
 # mountpoint for privileged operations and pivot_root
 if { s6-mount -nwt tmpfs -o nosuid,nodev,mode=700 mnt_ns $NS_TMPFS }
-if { mkdir $NS_TMPFS/oldroot $NS_TMPFS/bin }
-#if { s6-hiercopy $NS_BIN $NS_TMPFS/bin }
+if { mkdir ${NS_TMPFS}/oldroot ${NS_TMPFS}/bin }
+#if { s6-hiercopy $NS_BIN ${NS_TMPFS}/bin }
 if { s6-mount -n -o bind,ro $NS_BIN ${NS_TMPFS}/bin }
 
 # container-specific setup provided in environment