mrrl-containers

commit c6fa4736a524a56cd0a7b833e5900c0f62296aef
parent 5cea01b28bd30f70d6d140eb9117cf8ed936eb21
Author: ccx <ccx@te2000.cz>
Date:   Mon, 18 Mar 2024 17:00:46 +0000

More ns_run_unshared commandline handling

Diffstat:
M
sbin/ns_run_unshared
 | 
2
+-
M
service_scripts/xorg/run
 | 
2
+-

2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/sbin/ns_run_unshared b/sbin/ns_run_unshared
@@ -103,7 +103,7 @@ if { mount -o remount,ro dev }
 # * umounts all undesired filesystems
 # * execs into $@
 importas -i -u NS_FINAL_SCRIPT NS_FINAL_SCRIPT
-runblock -r 1 -P
+runblock -P -r 1
 shift -b 1
 elgetpositionals
 emptyenv -c
diff --git a/service_scripts/xorg/run b/service_scripts/xorg/run
@@ -65,7 +65,7 @@ ns_run_unshared data/root {
 	if { chown root:xorg ./dev/tty${vtN} }
 }
 # This runs with changed / so use absolute paths before dropping privs
-/mnt/ns/current/command/applyuidgid-caps -U ""
+/mnt/ns/bin/applyuidgid-caps -U ""
 env HOME=${CONTAINER_USER_HOME} USER=${CONTAINER_USER}
 # s6-setsid