me/guix
Archived
1
0
Fork 0
Code Activity

vm: Preserve file permissions on /dev.

Browse source 
Previously, when REGISTER-CLOSURES? was false, we'd set all the files
under /dev to #o644, including /dev/null, /dev/zero, etc.

* gnu/build/vm.scm (root-partition-initializer): Call 'reset-timestamps'
separately for /dev, with #:preserve-permissions? #t.
This commit is contained in:
Ludovic Courtès 2020-04-06 15:16:09 +02:00
parent 7fa6155b23
commit 6a488a3504
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
gnu/build/vm.scm
View file

@ -33,6 +33,7 @@
#:use-module (guix records) #:use-module (guix records)
#:use-module ((guix combinators) #:select (fold2)) #:use-module ((guix combinators) #:select (fold2))
#:use-module (ice-9 format) #:use-module (ice-9 format)
#:use-module (ice-9 ftw)
#:use-module (ice-9 match) #:use-module (ice-9 match)
#:use-module (ice-9 regex) #:use-module (ice-9 regex)
#:use-module (ice-9 popen) #:use-module (ice-9 popen)
@ -419,7 +420,16 @@ system that is passed to 'populate-root-file-system'."
;; 'register-closure' resets timestamps and everything, so no need to do it ;; 'register-closure' resets timestamps and everything, so no need to do it
;; once more in that case. ;; once more in that case.
(unless register-closures? (unless register-closures?
(reset-timestamps target)))) ;; 'reset-timestamps' also resets file permissions; do that everywhere
;; except on /dev so that /dev/null remains writable, etc.
(for-each (lambda (directory)
(reset-timestamps (string-append target "/" directory)))
(scandir target
(match-lambda
((or "." ".." "dev") #f)
(_ #t))))
(reset-timestamps (string-append target "/dev")
#:preserve-permissions? #t))))
(define (register-bootcfg-root target bootcfg) (define (register-bootcfg-root target bootcfg)
"On file system TARGET, register BOOTCFG as a GC root." "On file system TARGET, register BOOTCFG as a GC root."