diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2024-08-19 16:41:07 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2024-08-19 16:41:07 +0200 |
| commit | ce40b1c655edab622b4ad9ff49f948bd65753662 (patch) | |
| tree | cf4cb8763d77bdacd6327438517ea7eaeec6dd9e /gnu/system | |
| parent | b51990057c177bfe12aa9bd2c4b3d5d39492cd9d (diff) | |
install: Set ‘privileged-programs’ rather than ‘setuid-programs’.
* gnu/system/install.scm (installation-os)[setuid-programs]: Remove.
[privileged-programs]: New field.
Change-Id: I5c93f282f5ec790f13ac076e0ab0f6d59d92d59d
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 0195a0804d1..78a3cdaaec8 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | ;;; GNU Guix --- Functional package management for GNU | 1 | ;;; GNU Guix --- Functional package management for GNU |
| 2 | ;;; Copyright © 2014-2022 Ludovic Courtès <ludo@gnu.org> | 2 | ;;; Copyright © 2014-2022, 2024 Ludovic Courtès <ludo@gnu.org> |
| 3 | ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> | 3 | ;;; Copyright © 2015 Mark H Weaver <mhw@netris.org> |
| 4 | ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> | 4 | ;;; Copyright © 2016 Andreas Enge <andreas@enge.fr> |
| 5 | ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> | 5 | ;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com> |
| @@ -27,7 +27,7 @@ | |||
| 27 | (define-module (gnu system install) | 27 | (define-module (gnu system install) |
| 28 | #:use-module (gnu) | 28 | #:use-module (gnu) |
| 29 | #:use-module (gnu system) | 29 | #:use-module (gnu system) |
| 30 | #:use-module (gnu system setuid) | 30 | #:use-module (gnu system privilege) |
| 31 | #:use-module (gnu bootloader u-boot) | 31 | #:use-module (gnu bootloader u-boot) |
| 32 | #:use-module (guix gexp) | 32 | #:use-module (guix gexp) |
| 33 | #:use-module (guix store) | 33 | #:use-module (guix store) |
| @@ -540,8 +540,9 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m | |||
| 540 | 540 | ||
| 541 | ;; We don't need setuid programs, except for 'passwd', which can be handy | 541 | ;; We don't need setuid programs, except for 'passwd', which can be handy |
| 542 | ;; if one is to allow remote SSH login to the machine being installed. | 542 | ;; if one is to allow remote SSH login to the machine being installed. |
| 543 | (setuid-programs (list (setuid-program | 543 | (privileged-programs (list (privileged-program |
| 544 | (program (file-append shadow "/bin/passwd"))))) | 544 | (program (file-append shadow "/bin/passwd")) |
| 545 | (setuid? #t)))) | ||
| 545 | 546 | ||
| 546 | (pam-services | 547 | (pam-services |
| 547 | ;; Explicitly allow for empty passwords. | 548 | ;; Explicitly allow for empty passwords. |
