From 43c3a16a239fde1648846e8f07f1e6553e859b51 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Fri, 11 Mar 2022 14:43:11 -0700 Subject: UTIL.LINUX-NAMESPACE:GET-IDS-OFFSET: flip order of the two arguments Signed-off-by: Sean Whitton --- src/property/lxc.lisp | 4 ++-- src/util/linux-namespace.lisp | 2 +- 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 -- cgit v1.2.3