diff options
Diffstat (limited to 'gnu/home/services')
| -rw-r--r-- | gnu/home/services/shells.scm | 4 | ||||
| -rw-r--r-- | gnu/home/services/shepherd.scm | 7 |
2 files changed, 8 insertions, 3 deletions
diff --git a/gnu/home/services/shells.scm b/gnu/home/services/shells.scm index db82a7cff3..8fd1668b59 100644 --- a/gnu/home/services/shells.scm +++ b/gnu/home/services/shells.scm @@ -429,8 +429,8 @@ if [ -f ~/.bashrc ]; then source ~/.bashrc; fi ,@(list (file-if-not-empty 'bashrc (if (home-bash-configuration-guix-defaults? config) - (list (serialize-field 'aliases) - (plain-file-content %default-bashrc)) + (list (plain-file-content %default-bashrc) + (serialize-field 'aliases)) (list (serialize-field 'aliases)))) (file-if-not-empty 'bash-logout))))) diff --git a/gnu/home/services/shepherd.scm b/gnu/home/services/shepherd.scm index 962e633618..a3ca21b319 100644 --- a/gnu/home/services/shepherd.scm +++ b/gnu/home/services/shepherd.scm @@ -144,7 +144,12 @@ as shepherd package." (format #f "/run/user/~a" (getuid))) "/shepherd/socket")) #$(reload-configuration-gexp config) - #$(launch-shepherd-gexp config))) + ;; Don't attempt to start user shepherd if the system is running the + ;; activation script. /run/user/<uid> may not have been created + ;; yet. But do otherwise so if the runtime dir does not exist an error + ;; is logged. + (unless (getenv "GUIX_SYSTEM_IS_RUNNING_HOME_ACTIVATE") + #$(launch-shepherd-gexp config)))) (define (shepherd-xdg-configuration-files config) `(("shepherd/init.scm" ,(home-shepherd-configuration-file config)))) |