mirror of
https://codeberg.org/guix/guix.git
synced 2025-10-02 02:15:12 +00:00
gnu: system: Replace deprecated dhcp client service.
* gnu/system/examples/asus-c201.tmpl, gnu/system/examples/bare-bones.tmpl, gnu/system/examples/beaglebone-black.tmpl, gnu/system/examples/raspberry-pi-64-nfs-root.tmpl, gnu/system/examples/raspberry-pi-64.tmpl, gnu/system/examples/vm-image.tmpl gnu/system/images/orangepi-r1-plus-lts-rk3328.scm, gnu/system/images/pine64.scm, gnu/system/images/rock64.scm, gnu/system/images/unmatched.scm, gnu/system/images/visionfive2.scm, gnu/system/linux-container.scm (services): Replace dhcp-client-service-type with its replacement dhcpcd-service-type. Change-Id: Ib1f31d0a95dfa8ee64cf8c10d617ee53c8637b26
This commit is contained in:
parent
dfc22bad26
commit
aea73f5b74
12 changed files with 12 additions and 12 deletions
|
@ -54,7 +54,7 @@
|
||||||
|
|
||||||
;; Add services to the baseline: a DHCP client and
|
;; Add services to the baseline: a DHCP client and
|
||||||
;; an SSH server.
|
;; an SSH server.
|
||||||
(services (append (list (service dhcp-client-service-type)
|
(services (append (list (service dhcpcd-service-type)
|
||||||
(service openssh-service-type
|
(service openssh-service-type
|
||||||
(openssh-configuration
|
(openssh-configuration
|
||||||
(port-number 2222))))
|
(port-number 2222))))
|
||||||
|
|
|
@ -47,7 +47,7 @@
|
||||||
|
|
||||||
;; Add services to the baseline: a DHCP client and an SSH
|
;; Add services to the baseline: a DHCP client and an SSH
|
||||||
;; server. You may wish to add an NTP service here.
|
;; server. You may wish to add an NTP service here.
|
||||||
(services (append (list (service dhcp-client-service-type)
|
(services (append (list (service dhcpcd-service-type)
|
||||||
(service openssh-service-type
|
(service openssh-service-type
|
||||||
(openssh-configuration
|
(openssh-configuration
|
||||||
(openssh openssh-sans-x)
|
(openssh openssh-sans-x)
|
||||||
|
|
|
@ -45,7 +45,7 @@
|
||||||
;; Globally-installed packages.
|
;; Globally-installed packages.
|
||||||
(packages (append (list screen openssh) %base-packages))
|
(packages (append (list screen openssh) %base-packages))
|
||||||
|
|
||||||
(services (append (list (service dhcp-client-service-type)
|
(services (append (list (service dhcpcd-service-type)
|
||||||
;; mingetty does not work on serial lines.
|
;; mingetty does not work on serial lines.
|
||||||
;; Use agetty with board-specific serial parameters.
|
;; Use agetty with board-specific serial parameters.
|
||||||
(service agetty-service-type
|
(service agetty-service-type
|
||||||
|
|
|
@ -58,7 +58,7 @@
|
||||||
(packages (cons* openssh
|
(packages (cons* openssh
|
||||||
%base-packages))
|
%base-packages))
|
||||||
(services (cons* (service avahi-service-type)
|
(services (cons* (service avahi-service-type)
|
||||||
(service dhcp-client-service-type)
|
(service dhcpcd-service-type)
|
||||||
(service ntp-service-type)
|
(service ntp-service-type)
|
||||||
(service openssh-service-type
|
(service openssh-service-type
|
||||||
(openssh-configuration
|
(openssh-configuration
|
||||||
|
|
|
@ -62,7 +62,7 @@
|
||||||
(packages (cons* openssh
|
(packages (cons* openssh
|
||||||
%base-packages))
|
%base-packages))
|
||||||
(services (cons* (service avahi-service-type)
|
(services (cons* (service avahi-service-type)
|
||||||
(service dhcp-client-service-type)
|
(service dhcpcd-service-type)
|
||||||
(service ntp-service-type)
|
(service ntp-service-type)
|
||||||
(service openssh-service-type
|
(service openssh-service-type
|
||||||
(openssh-configuration
|
(openssh-configuration
|
||||||
|
|
|
@ -98,7 +98,7 @@ root ALL=(ALL) ALL
|
||||||
(service spice-vdagent-service-type)
|
(service spice-vdagent-service-type)
|
||||||
|
|
||||||
;; Use the DHCP client service rather than NetworkManager.
|
;; Use the DHCP client service rather than NetworkManager.
|
||||||
(service dhcp-client-service-type))
|
(service dhcpcd-service-type))
|
||||||
|
|
||||||
;; Remove some services that don't make sense in a VM.
|
;; Remove some services that don't make sense in a VM.
|
||||||
(remove (lambda (service)
|
(remove (lambda (service)
|
||||||
|
|
|
@ -53,7 +53,7 @@
|
||||||
(baud-rate "1500000")
|
(baud-rate "1500000")
|
||||||
(term "vt100")
|
(term "vt100")
|
||||||
(tty "ttyS2")))
|
(tty "ttyS2")))
|
||||||
(service dhcp-client-service-type)
|
(service dhcpcd-service-type)
|
||||||
(service ntp-service-type) %base-services))))
|
(service ntp-service-type) %base-services))))
|
||||||
|
|
||||||
(define orangepi-r1-plus-lts-rk3328-image-type
|
(define orangepi-r1-plus-lts-rk3328-image-type
|
||||||
|
|
|
@ -57,7 +57,7 @@
|
||||||
(baud-rate "115200")
|
(baud-rate "115200")
|
||||||
(term "vt100")
|
(term "vt100")
|
||||||
(tty "ttyS0")))
|
(tty "ttyS0")))
|
||||||
(service dhcp-client-service-type)
|
(service dhcpcd-service-type)
|
||||||
(service ntp-service-type)
|
(service ntp-service-type)
|
||||||
%base-services))))
|
%base-services))))
|
||||||
|
|
||||||
|
|
|
@ -48,7 +48,7 @@
|
||||||
(mount-point "/")
|
(mount-point "/")
|
||||||
(type "ext4"))
|
(type "ext4"))
|
||||||
%base-file-systems))
|
%base-file-systems))
|
||||||
(services (append (list (service dhcp-client-service-type))
|
(services (append (list (service dhcpcd-service-type))
|
||||||
%base-services))))
|
%base-services))))
|
||||||
|
|
||||||
(define rock64-image-type
|
(define rock64-image-type
|
||||||
|
|
|
@ -55,7 +55,7 @@
|
||||||
(baud-rate "115200")
|
(baud-rate "115200")
|
||||||
(term "vt100")
|
(term "vt100")
|
||||||
(tty "ttySIF0")))
|
(tty "ttySIF0")))
|
||||||
(service dhcp-client-service-type))
|
(service dhcpcd-service-type))
|
||||||
%base-services))))
|
%base-services))))
|
||||||
|
|
||||||
(define unmatched-disk-image
|
(define unmatched-disk-image
|
||||||
|
|
|
@ -93,7 +93,7 @@
|
||||||
(baud-rate "115200")
|
(baud-rate "115200")
|
||||||
(term "vt100")
|
(term "vt100")
|
||||||
(tty "ttyS0")))
|
(tty "ttyS0")))
|
||||||
(service dhcp-client-service-type))
|
(service dhcpcd-service-type))
|
||||||
%base-services))))
|
%base-services))))
|
||||||
|
|
||||||
(define visionfive2-disk-image
|
(define visionfive2-disk-image
|
||||||
|
|
|
@ -134,7 +134,7 @@ containerized OS. EXTRA-FILE-SYSTEMS is a list of file systems to add to OS."
|
||||||
;; Replace these with dummy-networking-service-type below.
|
;; Replace these with dummy-networking-service-type below.
|
||||||
(list
|
(list
|
||||||
static-networking-service-type
|
static-networking-service-type
|
||||||
dhcp-client-service-type
|
dhcpcd-service-type
|
||||||
network-manager-service-type
|
network-manager-service-type
|
||||||
connman-service-type)
|
connman-service-type)
|
||||||
(list static-networking-service-type)))) ;loopback
|
(list static-networking-service-type)))) ;loopback
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue