mrrl-logincaps

commit 3579c7003876110c9953fcaeb5936890d24723c5
parent 5f159c53416cb69c8adcaf53168a8a8b46c4f8d5
Author: Jan Pobrislo <ccx@webprojekty.cz>
Date:   Tue, 18 Jun 2019 18:49:18 +0200

Remove invalid require
Diffstat:
M
zsh-functions/confz_adhoc_container_init
 | 
9
+++++----

1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/zsh-functions/confz_adhoc_container_init b/zsh-functions/confz_adhoc_container_init
@@ -20,7 +20,6 @@ confz_adhoc_container_check() {
 	require fs_f flags= filename=$vars[service_dir]/clone-newpid
 	require fs_f flags= filename=$vars[service_dir]/down
 	require fs_d flags= filename=$vars[service_dir]/env
-	require plain_file_content filename=$vars[service_dir]/env/
 
 	# Absolute path to what will be the root of the container (bind-mounted read-only)
 	require plain_file_content filename=$vars[service_dir]/env/CONTAINER_IMAGE \
@@ -35,14 +34,16 @@ confz_adhoc_container_check() {
 		content:owner_home
 
 	# UID of the user to run the container as
-	require plain_file_content filename=$vars[service_dir]/env/UID content:uid
+	require plain_file_content filename=$vars[service_dir]/env/UID \
+		content=$vars[uid]
 
 	# GID of group containing just the owning user
-	require plain_file_content filename=$vars[service_dir]/env/GID content:gid
+	require plain_file_content filename=$vars[service_dir]/env/GID \
+		content=$vars[gid]
 
 	# GIDs of supplemental groups of the user
 	require plain_file_content filename=$vars[service_dir]/env/GIDLIST \
-		content:gidlist
+		content=$vars[gidlist]
 
 	require fs_d flags= filename=$vars[service_dir]/event
 	require fs_o owner=0:$vars[gid] filename=$vars[service_dir]/event