commit 355dc1ee544c9ab2057e11fd2e03a4f54cb85be8
parent 3d31d626b915ae68d250b3cdd50f7c72b3725894
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date: Tue, 18 Jun 2019 02:00:45 +0200
Use /command for absolute paths for executables in sbin/
Diffstat:
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/etc/loginexec b/etc/loginexec
@@ -33,9 +33,9 @@ background {
} {
fdclose $LOGINPASS_FD
unexport LOGINPASS_FD↵
- /root/logincaps
+ /command/logincaps
}
- /root/logincaps
+ /command/logincaps
}
fdclose 10
fdclose 11
diff --git a/sbin/logincaps b/sbin/logincaps
@@ -79,8 +79,8 @@ main() {
(terminal *)
term_cmd=( "${(Q@)${(z)${line#terminal }}}" )
printf >&2 "%s\n" "Would launch root terminal."
- pretendrun /root/su-term.py -d 1 -u $USER -- "$term_cmd[@]" <&2
- #{ /root/su-term.py -d 1 -u $USER -- "$term_cmd[@]" <&2 &!
+ pretendrun /command/su-term.py -d 1 -u $USER -- "$term_cmd[@]" <&2
+ #{ /command/su-term.py -d 1 -u $USER -- "$term_cmd[@]" <&2 &!
#} | read
printf 'OK\n'
;;
diff --git a/sbin/service.capcont.run b/sbin/service.capcont.run
@@ -38,4 +38,4 @@ env
if { mount -o bind,ro /etc/group ./etc/group }
} unexport CONTAINER_DATA"
unshare -n
-/root/ns_run ${CONTAINER_IMAGE} /mnt/ns/bin/s6-applyuidgid -Z -U /run/init
+ns_run ${CONTAINER_IMAGE} /mnt/ns/bin/s6-applyuidgid -Z -U /run/init