summaryrefslogtreecommitdiff
path: root/gnu/packages/disk.scm
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2022-05-29 02:01:19 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2024-08-11 02:00:00 +0200
commit902b15b24d6ea2a1e255b88dff7670e8a95cb9a9 (patch)
treecb59d02b5f57956547a09b97b8ed599d8a4e5eb3 /gnu/packages/disk.scm
parente364d1a494140c26f95a90176b3216428bbaf944 (diff)
gnu: Replace (almost) all uses of /run/setuid-programs.
…those good for master, anyway. * gnu/packages/admin.scm (ktsuss, opendoas, hosts) [arguments]: Replace /run/setuid-programs with /run/privileged/bin. * gnu/packages/containers.scm (slirp4netns)[arguments]: Likewise. * gnu/packages/debian.scm (pbuilder)[arguments]: Likewise. * gnu/packages/disk.scm (udevil)[arguments]: Likewise. * gnu/packages/enlightenment.scm (efl, enlightenment) [arguments]: Likewise. * gnu/packages/gnome.scm (gdm, gnome-control-center) [arguments]: Likewise. * gnu/packages/linux.scm (singularity)[arguments]: Likewise. * gnu/packages/lxde.scm (spacefm)[arguments]: Likewise. * gnu/packages/monitoring.scm (zabbix-agentd)[arguments]: Likewise. * gnu/packages/virtualization.scm (ganeti)[arguments]: Likewise. * gnu/packages/xdisorg.scm (xsecurelock)[arguments]: Likewise. * gnu/services/dbus.scm (dbus-configuration-directory): Likewise. * gnu/services/ganeti.scm (%default-ganeti-environment-variables): Likewise. * gnu/services/monitoring.scm (zabbix-agent-shepherd-service): Likewise. * gnu/tests/ldap.scm (marionette): Likewise. * gnu/tests/monitoring.scm (os): Likewise.
Diffstat (limited to 'gnu/packages/disk.scm')
-rw-r--r--gnu/packages/disk.scm14
1 files changed, 7 insertions, 7 deletions
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm
index ee766474756..d45da82276f 100644
--- a/gnu/packages/disk.scm
+++ b/gnu/packages/disk.scm
@@ -212,10 +212,10 @@ and write-back caching.")
212 ;; udevil expects these programs to be run with uid set as root. 212 ;; udevil expects these programs to be run with uid set as root.
213 ;; user has to manually add these programs to setuid-programs. 213 ;; user has to manually add these programs to setuid-programs.
214 ;; mount and umount are default setuid-programs in guix system. 214 ;; mount and umount are default setuid-programs in guix system.
215 "--with-mount-prog=/run/setuid-programs/mount" 215 "--with-mount-prog=/run/privileged/bin/mount"
216 "--with-umount-prog=/run/setuid-programs/umount" 216 "--with-umount-prog=/run/privileged/bin/umount"
217 "--with-losetup-prog=/run/setuid-programs/losetup" 217 "--with-losetup-prog=/run/privileged/bin/losetup"
218 "--with-setfacl-prog=/run/setuid-programs/setfacl") 218 "--with-setfacl-prog=/run/privileged/bin/setfacl")
219 #:phases 219 #:phases
220 (modify-phases %standard-phases 220 (modify-phases %standard-phases
221 (add-after 'unpack 'remove-root-reference 221 (add-after 'unpack 'remove-root-reference
@@ -226,12 +226,12 @@ and write-back caching.")
226 (add-after 'unpack 'patch-udevil-reference 226 (add-after 'unpack 'patch-udevil-reference
227 ;; udevil expects itself to be run with uid set as root. 227 ;; udevil expects itself to be run with uid set as root.
228 ;; devmon also expects udevil to be run with uid set as root. 228 ;; devmon also expects udevil to be run with uid set as root.
229 ;; user has to manually add udevil to setuid-programs. 229 ;; user has to manually add udevil to privileged-programs.
230 (lambda _ 230 (lambda _
231 (substitute* "src/udevil.c" 231 (substitute* "src/udevil.c"
232 (("/usr/bin/udevil") "/run/setuid-programs/udevil")) 232 (("/usr/bin/udevil") "/run/privileged/bin/udevil"))
233 (substitute* "src/devmon" 233 (substitute* "src/devmon"
234 (("`which udevil 2>/dev/null`") "/run/setuid-programs/udevil")) 234 (("`which udevil 2>/dev/null`") "/run/privileged/bin/udevil"))
235 #t))))) 235 #t)))))
236 (native-inputs 236 (native-inputs
237 (list intltool pkg-config)) 237 (list intltool pkg-config))