diff options
| author | Tobias Geerinckx-Rice <me@tobias.gr> | 2023-08-20 02:00:00 +0200 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-09-17 16:23:10 -0400 |
| commit | 7bd11dedf1c3224d04873dbde77cc16302905b57 (patch) | |
| tree | b0058ba7efdd8f50c273844c6d784bfd08456a7a /gnu | |
| parent | 35ab0146e1790fb17fc25309252eb018328c00cc (diff) | |
Revert "gnu: system: Add home-directory-permissions field to <user-account>."
This reverts commit e9a5eebc785cb843034b38c5c5a6dd10904bdf2a, which
as far as I can tell breaks system roll-backs thusly:
[...]
In gnu/build/accounts.scm:
239:27 3 (_ #<<password-entry> name: "root" password: "x" uid: 0 gid: 0 real-name: "System >)
In unknown file:
2 (string-join ("root" "x" "0" "0" "System administrator" "/root" #t) ":" #<undefined>)
In ice-9/boot-9.scm:
1685:16 1 (raise-exception _ #:continuable? _)
1685:16 0 (raise-exception _ #:continuable? _)
ice-9/boot-9.scm:1685:16: In procedure raise-exception:
In procedure string-append: Wrong type (expecting string): #t
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/build/activation.scm | 6 | ||||
| -rw-r--r-- | gnu/system/accounts.scm | 3 |
2 files changed, 3 insertions, 6 deletions
diff --git a/gnu/build/activation.scm b/gnu/build/activation.scm index fd043ca131..eea2233563 100644 --- a/gnu/build/activation.scm +++ b/gnu/build/activation.scm @@ -162,14 +162,14 @@ owner-writable in HOME." group records) are all available." (define (make-home-directory user) (let ((home (user-account-home-directory user)) - (home-permissions (user-account-home-directory-permissions user)) (pwd (getpwnam (user-account-name user)))) (mkdir-p home) ;; Always set ownership and permissions for home directories of system - ;; accounts. + ;; accounts. If a service needs looser permissions on its home + ;; directories, it can always chmod it in an activation snippet. (chown home (passwd:uid pwd) (passwd:gid pwd)) - (chmod home home-permissions))) + (chmod home #o700))) (define system-accounts (filter (lambda (user) diff --git a/gnu/system/accounts.scm b/gnu/system/accounts.scm index 15b2afe266..e37b733c6d 100644 --- a/gnu/system/accounts.scm +++ b/gnu/system/accounts.scm @@ -29,7 +29,6 @@ user-account-supplementary-groups user-account-comment user-account-home-directory - user-account-home-directory-permissions user-account-create-home-directory? user-account-shell user-account-system? @@ -71,8 +70,6 @@ (comment user-account-comment (default "")) (home-directory user-account-home-directory (thunked) (default (default-home-directory this-record))) - (home-directory-permissions user-account-home-directory-permissions - (default #o700)) (create-home-directory? user-account-create-home-directory? ;Boolean (default #t)) (shell user-account-shell ; gexp |