diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-07-28 18:34:59 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-07-28 18:34:59 +0200 |
| commit | 1af575f04df6cfb6e5e3f3273271383b6ee355a8 (patch) | |
| tree | 0f1dfaed352dcdb9c827ed32db267bc7ed3d8203 /gnu/system | |
| parent | 3b6f8a45d725dd7592634a34e8ffbc14a3bd31cc (diff) | |
| parent | 48d7ac175f69fea587eaa0358eddb5c76205e8ad (diff) | |
| download | guix-1af575f04df6cfb6e5e3f3273271383b6ee355a8.tar guix-1af575f04df6cfb6e5e3f3273271383b6ee355a8.tar.gz | |
Merge branch 'master' into staging
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/install.scm | 7 | ||||
| -rw-r--r-- | gnu/system/shadow.scm | 12 |
2 files changed, 18 insertions, 1 deletions
diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 6a3ae1947b..95661dc973 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -298,6 +298,13 @@ You have been warned. Thanks for being so brave.\x1b[0m `(("/bin/sh" ,(file-append (canonical-package bash) "/bin/sh")))) + ;; Loopback device, needed by OpenSSH notably. + (service static-networking-service-type + (list (static-networking (interface "lo") + (ip "127.0.0.1") + (requirement '()) + (provision '(loopback))))) + ;; Keep a reference to BARE-BONES-OS to make sure it can be ;; installed without downloading/building anything. Also keep the ;; things needed by 'profile-derivation' to minimize the amount of diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index b4db69f068..f800c3b546 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -210,7 +210,17 @@ include /run/current-system/profile/share/nano/*.nanorc\n")) ((module-ref module 'activate-readline)))) (else (display \"Consider installing the 'guile-readline' package for -convenient interactive line editing and input history.\\n\\n\")))\n")) +convenient interactive line editing and input history.\\n\\n\"))) + + (unless (getenv \"INSIDE_EMACS\") + (cond ((false-if-exception (resolve-interface '(ice-9 colorized))) + => + (lambda (module) + ;; Enable completion and input history at the REPL. + ((module-ref module 'activate-colorized)))) + (else + (display \"Consider installing the 'guile-colorized' package +for a colorful Guile experience.\\n\\n\"))))\n")) (".guile-wm" ,guile-wm) (".gdbinit" ,gdbinit)))) |