diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-09 16:15:21 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2022-03-09 16:15:21 -0700 |
| commit | e97a0f3414926d2442e82c8531287e4b6e10ef37 (patch) | |
| tree | 841bfa8937d02f4eca1dae79af69c1ca3d111090 /src/property | |
| parent | fc08e3fe0697f9347ceea48baf8162b9203dd1dd (diff) | |
| download | consfigurator-e97a0f3414926d2442e82c8531287e4b6e10ef37.tar.gz | |
rename MEMSTRING= -> MEMSTR=
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property')
| -rw-r--r-- | src/property/apt.lisp | 2 | ||||
| -rw-r--r-- | src/property/lxc.lisp | 4 | ||||
| -rw-r--r-- | src/property/systemd.lisp | 5 | ||||
| -rw-r--r-- | src/property/user.lisp | 2 |
4 files changed, 6 insertions, 7 deletions
diff --git a/src/property/apt.lisp b/src/property/apt.lisp index da56fa7..755ec7f 100644 --- a/src/property/apt.lisp +++ b/src/property/apt.lisp @@ -241,7 +241,7 @@ only upgrade Debian stable." (mapcar (lambda (m) (list* m #?"${suite}-backports" +sections+)) (get-mirrors)))) - (security-suite (if (memstring= suite '("stretch" "jessie" "buster")) + (security-suite (if (memstr= suite '("stretch" "jessie" "buster")) #?"${suite}/updates" #?"${suite}-security")) (security (and (or (subtypep (type-of os) 'os:debian-stable) diff --git a/src/property/lxc.lisp b/src/property/lxc.lisp index e914213..b32f091 100644 --- a/src/property/lxc.lisp +++ b/src/property/lxc.lisp @@ -321,8 +321,8 @@ implications." (defun user-container-active-p (host &optional owner) (and (not (service:no-services-p)) - (memstring= (get-hostname host) (lxc-ls owner "--active")))) + (memstr= (get-hostname host) (lxc-ls owner "--active")))) (defun user-container-running-p (host &optional owner) (and (not (service:no-services-p)) - (memstring= (get-hostname host) (lxc-ls owner "--running")))) + (memstr= (get-hostname host) (lxc-ls owner "--running")))) diff --git a/src/property/systemd.lisp b/src/property/systemd.lisp index ad23867..d805660 100644 --- a/src/property/systemd.lisp +++ b/src/property/systemd.lisp @@ -75,8 +75,7 @@ (systemctl #'run user :may-fail "is-enabled" service)))) (or (string-prefix-p "linked" status) (string-prefix-p "masked" status) - (memstring= - status '("static" "disabled" "generated" "transient" "indirect")))))) + (memstr= status '("static" "disabled" "generated" "transient" "indirect")))))) (:apply (systemctl #'mrun user "disable" service))) (defprop masked :posix (service &optional user) @@ -101,7 +100,7 @@ (multiple-value-bind (out err exit) (run :may-fail "loginctl" "show-user" user) (declare (ignore err)) - (and (zerop exit) (memstring= "Linger=yes" (lines out)))))) + (and (zerop exit) (memstr= "Linger=yes" (lines out)))))) (:apply (mrun "loginctl" "enable-linger" user)) (:unapply (if (service:no-services-p) :no-change diff --git a/src/property/user.lisp b/src/property/user.lisp index 58ab373..f9f7f4d 100644 --- a/src/property/user.lisp +++ b/src/property/user.lisp @@ -80,7 +80,7 @@ the installation of other software." (loop for line in (lines (readfile "/etc/group")) collect (car (split-string line :separator ":"))))) (apply #'has-groups username (loop for group in *desktop-groups* - when (memstring= group existing-groups) + when (memstr= group existing-groups) collect group))))) (defprop has-login-shell :posix (username shell) |