diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 11:49:15 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2021-12-13 11:49:15 +0100 |
| commit | 1052ae5f03de931b52c7a638c8e4f8d8d7093af3 (patch) | |
| tree | 4913e4a7834f4ad6e44906d814cd46e7c21d981b /gnu/system | |
| parent | 869d69ad3248288ffe30264f5e5bd760792ca758 (diff) | |
| parent | 788f56b4dc0729e07ad546c5bc9694759c271f09 (diff) | |
| download | guix-1052ae5f03de931b52c7a638c8e4f8d8d7093af3.tar.gz guix-1052ae5f03de931b52c7a638c8e4f8d8d7093af3.zip | |
Merge branch 'master' into core-updates-frozen
Diffstat (limited to 'gnu/system')
| -rw-r--r-- | gnu/system/hurd.scm | 12 | ||||
| -rw-r--r-- | gnu/system/install.scm | 5 |
2 files changed, 8 insertions, 9 deletions
diff --git a/gnu/system/hurd.scm b/gnu/system/hurd.scm index 0794671ce4..2acc7b7e11 100644 --- a/gnu/system/hurd.scm +++ b/gnu/system/hurd.scm @@ -79,11 +79,13 @@ (service hurd-getty-service-type (hurd-getty-configuration (tty "tty2"))) (service static-networking-service-type - (list (static-networking (interface "lo") - (ip "127.0.0.1") - (requirement '()) - (provision '(loopback networking)) - (name-servers '("10.0.2.3"))))) + (list %loopback-static-networking + + ;; QEMU user-mode networking. To get "eth0", you need + ;; QEMU to emulate a device for which Mach has an + ;; in-kernel driver, for instance with: + ;; --device rtl8139,netdev=net0 --netdev user,id=net0 + %qemu-static-networking)) (syslog-service) (service guix-service-type (guix-configuration diff --git a/gnu/system/install.scm b/gnu/system/install.scm index 7b394184ad..073d7df1db 100644 --- a/gnu/system/install.scm +++ b/gnu/system/install.scm @@ -408,10 +408,7 @@ Access documentation at any time by pressing Alt-F2.\x1b[0m ;; Loopback device, needed by OpenSSH notably. (service static-networking-service-type - (list (static-networking (interface "lo") - (ip "127.0.0.1") - (requirement '()) - (provision '(loopback))))) + (list %loopback-static-networking)) (service wpa-supplicant-service-type) (dbus-service) |