mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-12-24 05:18:07 -05:00
gnu: vm: Add 'networking' service.
* gnu/system/vm.scm (system-qemu-image): Use 'static-networking-service'. Add /etc/resolv.conf. Add Inetutils to the profile. * gnu/system/dmd.scm (static-networking-service): New procedure.
This commit is contained in:
parent
27cab84c6d
commit
f83e943fe7
2 changed files with 30 additions and 1 deletions
|
@ -40,6 +40,8 @@ (define-module (gnu system dmd)
|
|||
syslog-service
|
||||
mingetty-service
|
||||
guix-service
|
||||
static-networking-service
|
||||
|
||||
dmd-configuration-file))
|
||||
|
||||
;;; Commentary:
|
||||
|
@ -131,6 +133,22 @@ (define* (guix-service store #:key (guix guix))
|
|||
(start `(make-forkexec-constructor ,daemon))
|
||||
(inputs `(("guix" ,guix))))))
|
||||
|
||||
(define* (static-networking-service store interface ip
|
||||
#:key (inetutils inetutils))
|
||||
"Return a service that starts INTERFACE with address IP."
|
||||
|
||||
;; TODO: Eventually we should do this using Guile's networking procedures,
|
||||
;; like 'configure-qemu-networking' does, but the patch that does this is
|
||||
;; not yet in stock Guile.
|
||||
(let ((ifconfig (string-append (package-output store inetutils)
|
||||
"/bin/ifconfig")))
|
||||
(service
|
||||
(provision '(networking))
|
||||
(start `(make-forkexec-constructor ,ifconfig ,interface ,ip "up"))
|
||||
(stop `(make-forkexec-constructor ,ifconfig ,interface "down"))
|
||||
(respawn? #f)
|
||||
(inputs `(("inetutils" ,inetutils))))))
|
||||
|
||||
|
||||
(define (dmd-configuration-file store services)
|
||||
"Return the dmd configuration file for SERVICES."
|
||||
|
|
|
@ -455,7 +455,15 @@ (define %dmd-services
|
|||
(mingetty-service store "tty5")
|
||||
(mingetty-service store "tty6")
|
||||
(syslog-service store)
|
||||
(guix-service store #:guix guix-0.4)))
|
||||
(guix-service store #:guix guix-0.4)
|
||||
|
||||
;; QEMU networking settings.
|
||||
(static-networking-service store "eth0" "10.0.2.10")))
|
||||
|
||||
(define resolv.conf
|
||||
;; Name resolution for default QEMU settings.
|
||||
(add-text-to-store store "resolv.conf"
|
||||
"nameserver 10.0.2.3\n"))
|
||||
|
||||
(parameterize ((%guile-for-build (package-derivation store guile-final)))
|
||||
(let* ((bash-drv (package-derivation store bash))
|
||||
|
@ -480,6 +488,7 @@ (define %dmd-services
|
|||
("dmd" ,dmd)
|
||||
("gcc" ,gcc-final)
|
||||
("libc" ,glibc-final)
|
||||
("inetutils" ,inetutils)
|
||||
("guix" ,guix-0.4)))
|
||||
|
||||
;; TODO: Replace with a real profile with a manifest.
|
||||
|
@ -514,6 +523,7 @@ (define %dmd-services
|
|||
("/etc/passwd" -> ,passwd)
|
||||
("/etc/login.defs" -> "/dev/null")
|
||||
("/etc/pam.d" -> ,pam.d)
|
||||
("/etc/resolv.conf" -> ,resolv.conf)
|
||||
("/etc/profile" -> ,bashrc)
|
||||
("/etc/issue" -> ,issue)
|
||||
(directory "/var/nix/gcroots")
|
||||
|
@ -552,6 +562,7 @@ (define %dmd-services
|
|||
("etc-passwd" ,passwd)
|
||||
("etc-shadow" ,shadow)
|
||||
("etc-group" ,group)
|
||||
("etc-resolv.conf" ,resolv.conf)
|
||||
("etc-bashrc" ,bashrc)
|
||||
("etc-issue" ,issue)
|
||||
("etc-motd" ,motd)
|
||||
|
|
Loading…
Reference in a new issue