aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-03-11 14:43:11 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-03-11 14:43:11 -0700
commit43c3a16a239fde1648846e8f07f1e6553e859b51 (patch)
treebbbb6e84fff77c4f8b2e3522911f45e4326fd760
parent2ad18d112c2b028dd5721fe67b98d8f86183c09c (diff)
downloadconsfigurator-43c3a16a239fde1648846e8f07f1e6553e859b51.tar.gz
UTIL.LINUX-NAMESPACE:GET-IDS-OFFSET: flip order of the two arguments
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--src/property/lxc.lisp4
-rw-r--r--src/util/linux-namespace.lisp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/property/lxc.lisp b/src/property/lxc.lisp
index 05aafc8..3f9a29f 100644
--- a/src/property/lxc.lisp
+++ b/src/property/lxc.lisp
@@ -30,11 +30,11 @@
`(setq ,uid-maps-param
(or ,uid-maps-param
(list (cons 0 (multiple-value-list
- (get-ids-offset user "/etc/subuid")))))
+ (get-ids-offset "/etc/subuid" user)))))
,gid-maps-param
(or ,gid-maps-param
(list (cons 0 (multiple-value-list
- (get-ids-offset user "/etc/subgid")))))))
+ (get-ids-offset "/etc/subgid" user)))))))
(defprop user-container-started :posix (host &optional owner)
"Ensure the LXC unprivileged container for the host designated by HOST owned
diff --git a/src/util/linux-namespace.lisp b/src/util/linux-namespace.lisp
index 3844de2..afa3080 100644
--- a/src/util/linux-namespace.lisp
+++ b/src/util/linux-namespace.lisp
@@ -18,7 +18,7 @@
(in-package :consfigurator.util.linux-namespace)
(named-readtables:in-readtable :consfigurator)
-(defun get-ids-offset (identifier file)
+(defun get-ids-offset (file identifier)
"Where IDENTIFIER is a username or uid, and FILE is structured like
/etc/subuid and /etc/subuid (see subuid(5) and subgid(5)), return the
numerical subordinate ID and numerical subordinate ID count for the first