diff options
| author | Raghav Gururajan <raghavgururajan@disroot.org> | 2020-04-28 02:29:36 -0400 |
|---|---|---|
| committer | Danny Milosavljevic <dannym@scratchpost.org> | 2020-05-01 16:38:22 +0200 |
| commit | 8546f4da5b3677001dbda6b3a116f5bdc44ea5c0 (patch) | |
| tree | 9bc7208bc371c943b71cf73123341de736fa6d35 | |
| parent | 3e2d65aecbace2e23cc84f72dda9c007d745f291 (diff) | |
| download | patches-8546f4da5b3677001dbda6b3a116f5bdc44ea5c0.tar patches-8546f4da5b3677001dbda6b3a116f5bdc44ea5c0.tar.gz | |
gnu: udevil: Fix loading of setuid-programs.
* gnu/packages/disk.scm (udevil)[arguments]<#:configure-flags>: Add
"--with-mount-prog", "--with-umount-prog", "--with-losetup-prog",
"--with-setfacl-prog".
[arguments]<#:phases>[patch-udevil-reference]: New phase.
Signed-off-by: Danny Milosavljevic <dannym@scratchpost.org>
| -rw-r--r-- | gnu/packages/disk.scm | 26 |
1 files changed, 22 insertions, 4 deletions
diff --git a/gnu/packages/disk.scm b/gnu/packages/disk.scm index b7d3b9d954..2b9ba8e38d 100644 --- a/gnu/packages/disk.scm +++ b/gnu/packages/disk.scm @@ -103,16 +103,34 @@ (build-system gnu-build-system) (arguments `(#:configure-flags - (list "--disable-systemd" - (string-append "--sysconfdir=" - (assoc-ref %outputs "out") - "/etc")) + (list + "--disable-systemd" + (string-append "--sysconfdir=" + (assoc-ref %outputs "out") + "/etc") + ;; udevil expects these programs to be run with uid set as root. + ;; user has to manually add these programs to setuid-programs. + ;; mount and umount are default setuid-programs in guix system. + "--with-mount-prog=/run/setuid-programs/mount" + "--with-umount-prog=/run/setuid-programs/umount" + "--with-losetup-prog=/run/setuid-programs/losetup" + "--with-setfacl-prog=/run/setuid-programs/setfacl") #:phases (modify-phases %standard-phases (add-after 'unpack 'remove-root-reference (lambda _ (substitute* "src/Makefile.in" (("-o root -g root") "")) + #t)) + (add-after 'unpack 'patch-udevil-reference + ;; udevil expects itself to be run with uid set as root. + ;; devmon also expects udevil to be run with uid set as root. + ;; user has to manually add udevil to setuid-programs. + (lambda _ + (substitute* "src/udevil.c" + (("/usr/bin/udevil") "/run/setuid-programs/udevil")) + (substitute* "src/devmon" + (("`which udevil 2>/dev/null`") "/run/setuid-programs/udevil")) #t))))) (native-inputs `(("intltool" ,intltool) |