me/guix
Archived
1
0
Fork 0
Code Activity

activation: Copy the account skeletons when creating the 'root' account.

Browse source 
* gnu/build/activation.scm (%skeleton-directory): New variable.
  (dot-or-dot-dot?, copy-account-skeletons): New procedure.
  (add-user): Use 'copy-account-skeletons'.
  (activate-etc): Use 'dot-or-dot-dot?'.
This commit is contained in:
Ludovic Courtès 2014-12-13 22:30:44 +01:00
parent ccc2678b0d
commit 45c5b47b96
1 changed files with 21 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
gnu/build/activation.scm
View file

@ -50,6 +50,25 @@
,name))) ,name)))
(zero? (apply system* "groupadd" args)))) (zero? (apply system* "groupadd" args))))
(define %skeleton-directory
;; Directory containing skeleton files for new accounts.
;; Note: keep the trailing '/' so that 'scandir' enters it.
"/etc/skel/")
(define (dot-or-dot-dot? file)
(member file '("." "..")))
(define* (copy-account-skeletons home
#:optional (directory %skeleton-directory))
"Copy the account skeletons from DIRECTORY to HOME."
(let ((files (scandir directory (negate dot-or-dot-dot?)
string<?)))
(mkdir-p home)
(for-each (lambda (file)
(copy-file (string-append directory "/" file)
(string-append home "/" file)))
files)))
(define* (add-user name group (define* (add-user name group
#:key uid comment home shell password system? #:key uid comment home shell password system?
(supplementary-groups '()) (supplementary-groups '())
@ -70,6 +89,7 @@ properties. Return #t on success."
(cut format <> "~a:x:~a:~a:~a:~a:~a~%" (cut format <> "~a:x:~a:~a:~a:~a:~a~%"
name "0" "0" comment home shell)) name "0" "0" comment home shell))
(chmod "/etc/shadow" #o600) (chmod "/etc/shadow" #o600)
(copy-account-skeletons (or home "/root"))
#t) #t)
;; Use 'useradd' from the Shadow package. ;; Use 'useradd' from the Shadow package.
@ -198,9 +218,7 @@ numeric gid or #f."
;; XXX: Dirty hack to meet sudo's expectations. ;; XXX: Dirty hack to meet sudo's expectations.
(when (string=? (basename target) "sudoers") (when (string=? (basename target) "sudoers")
(chmod target #o440)))) (chmod target #o440))))
(scandir etc (scandir etc (negate dot-or-dot-dot?)
(lambda (file)
(not (member file '("." ".."))))
;; The default is 'string-locale<?', but we don't have ;; The default is 'string-locale<?', but we don't have
;; it when run from the initrd's statically-linked ;; it when run from the initrd's statically-linked