diff -Nru livecd-rootfs-2.487/debian/changelog livecd-rootfs-2.488/debian/changelog --- livecd-rootfs-2.487/debian/changelog 2017-12-11 12:22:36.000000000 +0000 +++ livecd-rootfs-2.488/debian/changelog 2018-01-03 20:36:56.000000000 +0000 @@ -1,3 +1,9 @@ +livecd-rootfs (2.488) bionic; urgency=medium + + * Enable systemd-networkd by default for live-server installs. + + -- Michael Hudson-Doyle Thu, 04 Jan 2018 09:36:56 +1300 + livecd-rootfs (2.487) bionic; urgency=medium * Drop android-tools-fsutils dependency, and instead install it on diff -Nru livecd-rootfs-2.487/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service livecd-rootfs-2.488/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service --- livecd-rootfs-2.487/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service 1970-01-01 00:00:00.000000000 +0000 +++ livecd-rootfs-2.488/live-build/ubuntu-server/includes.chroot/etc/systemd/system/multi-user.target.wants/systemd-networkd.service 2017-10-27 10:11:45.000000000 +0000 @@ -0,0 +1,36 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Network Service +Documentation=man:systemd-networkd.service(8) +ConditionCapability=CAP_NET_ADMIN +DefaultDependencies=no +# systemd-udevd.service can be dropped once tuntap is moved to netlink +After=systemd-udevd.service network-pre.target systemd-sysusers.service systemd-sysctl.service +Before=network.target multi-user.target shutdown.target +Conflicts=shutdown.target +Wants=network.target + +# On kdbus systems we pull in the busname explicitly, because it +# carries policy that allows the daemon to acquire its name. +Wants=org.freedesktop.network1.busname +After=org.freedesktop.network1.busname + +[Service] +Type=notify +Restart=on-failure +RestartSec=0 +ExecStart=/lib/systemd/systemd-networkd +CapabilityBoundingSet=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_SETUID CAP_SETGID CAP_SETPCAP CAP_CHOWN CAP_DAC_OVERRIDE CAP_FOWNER +ProtectSystem=full +ProtectHome=yes +WatchdogSec=3min + +[Install] +WantedBy=multi-user.target +Also=systemd-networkd.socket diff -Nru livecd-rootfs-2.487/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service livecd-rootfs-2.488/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service --- livecd-rootfs-2.487/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service 1970-01-01 00:00:00.000000000 +0000 +++ livecd-rootfs-2.488/live-build/ubuntu-server/includes.chroot/etc/systemd/system/network-online.target.wants/systemd-networkd-wait-online.service 2017-10-27 10:11:45.000000000 +0000 @@ -0,0 +1,23 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Wait for Network to be Configured +Documentation=man:systemd-networkd-wait-online.service(8) +DefaultDependencies=no +Conflicts=shutdown.target +Requisite=systemd-networkd.service +After=systemd-networkd.service +Before=network-online.target + +[Service] +Type=oneshot +ExecStart=/lib/systemd/systemd-networkd-wait-online +RemainAfterExit=yes + +[Install] +WantedBy=network-online.target diff -Nru livecd-rootfs-2.487/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket livecd-rootfs-2.488/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket --- livecd-rootfs-2.487/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket 1970-01-01 00:00:00.000000000 +0000 +++ livecd-rootfs-2.488/live-build/ubuntu-server/includes.chroot/etc/systemd/system/sockets.target.wants/systemd-networkd.socket 2017-10-27 10:11:44.000000000 +0000 @@ -0,0 +1,21 @@ +# This file is part of systemd. +# +# systemd is free software; you can redistribute it and/or modify it +# under the terms of the GNU Lesser General Public License as published by +# the Free Software Foundation; either version 2.1 of the License, or +# (at your option) any later version. + +[Unit] +Description=Network Service Netlink Socket +Documentation=man:systemd-networkd.service(8) man:rtnetlink(7) +ConditionCapability=CAP_NET_ADMIN +DefaultDependencies=no +Before=sockets.target + +[Socket] +ReceiveBuffer=8M +ListenNetlink=route 1361 +PassCredentials=yes + +[Install] +WantedBy=sockets.target