diff options
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/accounts.scm | 3 | ||||
| -rw-r--r-- | gnu/system/examples/bare-bones.tmpl | 9 | ||||
| -rw-r--r-- | gnu/system/image.scm | 2 | ||||
| -rw-r--r-- | gnu/system/shadow.scm | 3 | ||||
| -rw-r--r-- | gnu/system/vm.scm | 41 |
5 files changed, 17 insertions, 41 deletions
diff --git a/gnu/system/accounts.scm b/gnu/system/accounts.scm index e37b733c6d..586cff1842 100644 --- a/gnu/system/accounts.scm +++ b/gnu/system/accounts.scm @@ -19,8 +19,7 @@ (define-module (gnu system accounts) #:use-module (guix records) #:use-module (ice-9 match) - #:export (<user-account> - user-account + #:export (user-account user-account? user-account-name user-account-password diff --git a/gnu/system/examples/bare-bones.tmpl b/gnu/system/examples/bare-bones.tmpl index 45b4995574..dc6aff5273 100644 --- a/gnu/system/examples/bare-bones.tmpl +++ b/gnu/system/examples/bare-bones.tmpl @@ -4,6 +4,9 @@ (use-modules (gnu)) (use-service-modules networking ssh) +;; If you want to use HTTPS, you most likely want to include +;; "certs" in the line below. Also read the comment about +;; "nss-certs" later in this file. (use-package-modules screen ssh) (operating-system @@ -43,10 +46,12 @@ %base-user-accounts)) ;; Globally-installed packages. + ;; Add "nss-certs" for Mozilla's approved CA certs. You would + ;; have to have included "certs" in use-package-modules above. (packages (cons screen %base-packages)) - ;; Add services to the baseline: a DHCP client and - ;; an SSH server. + ;; Add services to the baseline: a DHCP client and an SSH + ;; server. You may wish to add an NTP service here. (services (append (list (service dhcp-client-service-type) (service openssh-service-type (openssh-configuration diff --git a/gnu/system/image.scm b/gnu/system/image.scm index fa4cab0b03..a990c4f861 100644 --- a/gnu/system/image.scm +++ b/gnu/system/image.scm @@ -246,7 +246,7 @@ set to the given OS." (name 'qcow2) (constructor (cut image-with-os (image - (inherit mbr-disk-image) + (inherit mbr-hybrid-disk-image) (name 'image.qcow2) (format 'compressed-qcow2)) <>)))) diff --git a/gnu/system/shadow.scm b/gnu/system/shadow.scm index 9ca1895ded..47f19551b6 100644 --- a/gnu/system/shadow.scm +++ b/gnu/system/shadow.scm @@ -144,7 +144,8 @@ fi alias ls='ls -p --color=auto' alias ll='ls -l' -alias grep='grep --color=auto'\n")) +alias grep='grep --color=auto' +alias ip='ip -color=auto'\n")) (define (default-skeletons) "Return the default skeleton files for /etc/skel. These files are copied by diff --git a/gnu/system/vm.scm b/gnu/system/vm.scm index b7bccd72a4..70f7b00116 100644 --- a/gnu/system/vm.scm +++ b/gnu/system/vm.scm @@ -87,41 +87,6 @@ ;; conservative default. (define %default-msize-value (* 100 (expt 2 20))) ;100 MiB -(define %linux-vm-file-systems - ;; File systems mounted for 'derivation-in-linux-vm'. These are shared with - ;; the host over 9p. - ;; - ;; The 9p documentation says that cache=loose is "intended for exclusive, - ;; read-only mounts", without additional details. It's much faster than the - ;; default cache=none, especially when copying and registering store items. - ;; Thus, use cache=loose, except for /xchg where we want to ensure - ;; consistency. - (list (file-system - (mount-point (%store-prefix)) - (device "store") - (type "9p") - (needed-for-boot? #t) - (flags '(read-only)) - (options (format #f "trans=virtio,cache=loose,msize=~a" - %default-msize-value)) - (check? #f)) - (file-system - (mount-point "/xchg") - (device "xchg") - (type "9p") - (needed-for-boot? #t) - (options (format #f "trans=virtio,msize=~a" %default-msize-value)) - (check? #f)) - (file-system - (mount-point "/tmp") - (device "tmp") - (type "9p") - (needed-for-boot? #t) - (options (format #f "trans=virtio,cache=loose,msize=~a" - %default-msize-value)) - (check? #f)))) - - ;;; ;;; VMs that share file systems with the host. ;;; @@ -145,6 +110,12 @@ (device (file-system->mount-tag source)) (type "9p") (flags (if writable? '() '(read-only))) + + ;; The 9p documentation says that cache=loose is "intended for + ;; exclusive, read-only mounts", without additional details. It's + ;; faster than the default cache=none, especially when copying and + ;; registering store items. Thus, use cache=loose, except for writable + ;; mounts, to ensure consistency. (options (string-append "trans=virtio" (if writable? "" ",cache=loose") ",msize=" (number->string %default-msize-value))) |