diff options
| author | Hilton Chain <hako@ultrarare.space> | 2025-03-05 14:45:15 +0800 |
|---|---|---|
| committer | Hilton Chain <hako@ultrarare.space> | 2025-03-05 14:45:15 +0800 |
| commit | 2bb8ecbfbf20efb126670ec92a7cdd88a4805902 (patch) | |
| tree | fafc1ebfe2ff0cd31edae6df29dfcd2617e736d4 /gnu/services.scm | |
| parent | 4c68ef74541b6bd1486040cd7b3ef521dd6e6ebb (diff) | |
Revert "file-systems: %base-file-systems: Add tmpfs /run."
This reverts commit e88018be70ffb8ea35819a4c95d44ec20868ca59. Since this
change breaks current dbus-service-type, it would be better to wait
https://issues.guix.gnu.org/73494 finished.
Diffstat (limited to 'gnu/services.scm')
| -rw-r--r-- | gnu/services.scm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/gnu/services.scm b/gnu/services.scm index ea855ad1937..8a4002e0724 100644 --- a/gnu/services.scm +++ b/gnu/services.scm | |||
| @@ -632,7 +632,7 @@ information is missing, return the empty list (for channels) and possibly | |||
| 632 | #~(begin | 632 | #~(begin |
| 633 | (use-modules (guix build utils)) | 633 | (use-modules (guix build utils)) |
| 634 | 634 | ||
| 635 | ;; Clean out /tmp and /var/run. | 635 | ;; Clean out /tmp, /var/run, and /run. |
| 636 | ;; | 636 | ;; |
| 637 | ;; XXX This needs to happen before service activations, so it | 637 | ;; XXX This needs to happen before service activations, so it |
| 638 | ;; has to be here, but this also implicitly assumes that /tmp | 638 | ;; has to be here, but this also implicitly assumes that /tmp |
| @@ -663,12 +663,15 @@ information is missing, return the empty list (for channels) and possibly | |||
| 663 | (setlocale LC_CTYPE "en_US.utf8") | 663 | (setlocale LC_CTYPE "en_US.utf8") |
| 664 | (delete-file-recursively "/tmp") | 664 | (delete-file-recursively "/tmp") |
| 665 | (delete-file-recursively "/var/run") | 665 | (delete-file-recursively "/var/run") |
| 666 | (delete-file-recursively "/run") | ||
| 666 | 667 | ||
| 667 | ;; Note: The second argument to 'mkdir' is and'ed with umask, | 668 | ;; Note: The second argument to 'mkdir' is and'ed with umask, |
| 668 | ;; hence the 'chmod' calls. | 669 | ;; hence the 'chmod' calls. |
| 669 | (mkdir "/tmp" #o1777) | 670 | (mkdir "/tmp" #o1777) |
| 670 | (chmod "/tmp" #o1777) | 671 | (chmod "/tmp" #o1777) |
| 671 | (mkdir "/var/run" #o755) | 672 | (mkdir "/var/run" #o755) |
| 673 | (chmod "/var/run" #o755) | ||
| 674 | (mkdir "/run" #o755) | ||
| 672 | (chmod "/var/run" #o755)))))) | 675 | (chmod "/var/run" #o755)))))) |
| 673 | 676 | ||
| 674 | (define cleanup-service-type | 677 | (define cleanup-service-type |
