~ruther/guix-local

aea73f5b742c8c36b97c2947f1e7e4ee3a2a3039 — Gabriel Wicki 1 year, 3 months ago dfc22ba
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
M gnu/system/examples/asus-c201.tmpl => gnu/system/examples/asus-c201.tmpl +1 -1
@@ 54,7 54,7 @@

  ;; Add services to the baseline: a DHCP client and
  ;; an SSH server.
  (services (append (list (service dhcp-client-service-type)
  (services (append (list (service dhcpcd-service-type)
                          (service openssh-service-type
                                   (openssh-configuration
                                    (port-number 2222))))

M gnu/system/examples/bare-bones.tmpl => gnu/system/examples/bare-bones.tmpl +1 -1
@@ 47,7 47,7 @@

  ;; 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)
  (services (append (list (service dhcpcd-service-type)
                          (service openssh-service-type
                                   (openssh-configuration
                                    (openssh openssh-sans-x)

M gnu/system/examples/beaglebone-black.tmpl => gnu/system/examples/beaglebone-black.tmpl +1 -1
@@ 45,7 45,7 @@
  ;; Globally-installed 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.
                          ;; Use agetty with board-specific serial parameters.
                          (service agetty-service-type

M gnu/system/examples/raspberry-pi-64-nfs-root.tmpl => gnu/system/examples/raspberry-pi-64-nfs-root.tmpl +1 -1
@@ 58,7 58,7 @@
    (packages (cons* openssh
                     %base-packages))
    (services (cons* (service avahi-service-type)
                     (service dhcp-client-service-type)
                     (service dhcpcd-service-type)
                     (service ntp-service-type)
                     (service openssh-service-type
                              (openssh-configuration

M gnu/system/examples/raspberry-pi-64.tmpl => gnu/system/examples/raspberry-pi-64.tmpl +1 -1
@@ 62,7 62,7 @@
    (packages (cons* openssh
                     %base-packages))
    (services (cons* (service avahi-service-type)
                     (service dhcp-client-service-type)
                     (service dhcpcd-service-type)
                     (service ntp-service-type)
                     (service openssh-service-type
                              (openssh-configuration

M gnu/system/examples/vm-image.tmpl => gnu/system/examples/vm-image.tmpl +1 -1
@@ 98,7 98,7 @@ root ALL=(ALL) ALL
                 (service spice-vdagent-service-type)

                 ;; 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 (lambda (service)

M gnu/system/images/orangepi-r1-plus-lts-rk3328.scm => gnu/system/images/orangepi-r1-plus-lts-rk3328.scm +1 -1
@@ 53,7 53,7 @@
                                           (baud-rate "1500000")
                                           (term "vt100")
                                           (tty "ttyS2")))
            (service dhcp-client-service-type)
            (service dhcpcd-service-type)
            (service ntp-service-type) %base-services))))

(define orangepi-r1-plus-lts-rk3328-image-type

M gnu/system/images/pine64.scm => gnu/system/images/pine64.scm +1 -1
@@ 57,7 57,7 @@
                         (baud-rate "115200")
                         (term "vt100")
                         (tty "ttyS0")))
               (service dhcp-client-service-type)
               (service dhcpcd-service-type)
               (service ntp-service-type)
               %base-services))))


M gnu/system/images/rock64.scm => gnu/system/images/rock64.scm +1 -1
@@ 48,7 48,7 @@
                          (mount-point "/")
                          (type "ext4"))
                        %base-file-systems))
    (services (append (list (service dhcp-client-service-type))
    (services (append (list (service dhcpcd-service-type))
                      %base-services))))

(define rock64-image-type

M gnu/system/images/unmatched.scm => gnu/system/images/unmatched.scm +1 -1
@@ 55,7 55,7 @@
                              (baud-rate "115200")
                              (term "vt100")
                              (tty "ttySIF0")))
                    (service dhcp-client-service-type))
                    (service dhcpcd-service-type))
              %base-services))))

(define unmatched-disk-image

M gnu/system/images/visionfive2.scm => gnu/system/images/visionfive2.scm +1 -1
@@ 93,7 93,7 @@
                             (baud-rate "115200")
                             (term "vt100")
                             (tty "ttyS0")))
                   (service dhcp-client-service-type))
                   (service dhcpcd-service-type))
             %base-services))))

(define visionfive2-disk-image

M gnu/system/linux-container.scm => gnu/system/linux-container.scm +1 -1
@@ 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.
                (list
                 static-networking-service-type
                 dhcp-client-service-type
                 dhcpcd-service-type
                 network-manager-service-type
                 connman-service-type)
                (list static-networking-service-type)))) ;loopback