netplan: testing a netplan-generator systemd service

canonical · Sep 6, 2023 · 3f4259e · 3f4259e
1 parent b590c96
commit 3f4259e
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 8 deletions.
diff --git a/.github/workflows/autopkgtest.yml b/.github/workflows/autopkgtest.yml
@@ -42,6 +42,9 @@ jobs:
           pull-lp-source netplan.io
           cp -r netplan.io-*/debian .
           rm -r debian/patches/  # clear any distro patches
+          cp data/netplan-generator.service debian/
+          sed -i '/system-generator/d' debian/netplan-generator.install
+          sed -i '/rm debian\/tmp\/lib\/netplan\/generate/d' debian/rules
           TAG=$(git describe --tags $(git rev-list --tags --max-count=1))  # find latest (stable) tag
           REV=$(git rev-parse --short HEAD)  # get current git revision
           VER="$TAG+git~$REV"

diff --git a/.github/workflows/debci.yml b/.github/workflows/debci.yml
@@ -46,6 +46,9 @@ jobs:
           dget -u "https://deb.debian.org/debian/pool/main/n/netplan.io/netplan.io_$V.dsc"
           cp -r netplan.io-*/debian .
           rm -r debian/patches/  # clear any distro patches
+          cp data/netplan-generator.service debian/
+          sed -i '/system-generator/d' debian/netplan-generator.install
+          sed -i '/rm debian\/tmp\/lib\/netplan\/generate/d' debian/rules
           TAG=$(git describe --tags $(git rev-list --tags --max-count=1))  # find latest (stable) tag
           REV=$(git rev-parse --short HEAD)  # get current git revision
           VER="$TAG+git~$REV"

diff --git a/.github/workflows/network-manager.yml b/.github/workflows/network-manager.yml
@@ -37,6 +37,9 @@ jobs:
           pull-lp-source netplan.io
           cp -r netplan.io-*/debian .
           rm -r debian/patches/  # clear any distro patches
+          cp data/netplan-generator.service debian/
+          sed -i '/system-generator/d' debian/netplan-generator.install
+          sed -i '/rm debian\/tmp\/lib\/netplan\/generate/d' debian/rules
           echo "3.0 (native)" > debian/source/format  # force native build
           TAG=$(git describe --tags $(git rev-list --tags --max-count=1))  # find latest (stable) tag
           REV=$(git rev-parse --short HEAD)  # get current git revision

diff --git a/data/netplan-generator.service b/data/netplan-generator.service
@@ -0,0 +1,13 @@
+[Unit]
+Description=Netplan generator
+Documentation=man:netplan(5)
+Before=systemd-networkd.service cloud-init-local.service NetworkManager.service
+
+[Service]
+Type=oneshot
+RemainAfterExit=yes
+ExecStart=/usr/libexec/netplan/generate
+ExecReload=/usr/libexec/netplan/generate
+
+[Install]
+WantedBy=systemd-networkd.service cloud-init-local.service NetworkManager.service
diff --git a/src/meson.build b/src/meson.build
@@ -34,11 +34,3 @@ executable(
     dependencies: [glib, gio, yaml, uuid],
     install_dir: libexec_netplan,
     install: true)
-meson.add_install_script(meson_make_symlink,
-    join_paths(get_option('prefix'), libexec_netplan, 'generate'),
-    join_paths(systemd_generator_dir, 'netplan'))
-# FIXME: Drop legacy symlink after 0.107 is released:
-# It's only around for legacy reasons, see netplan/cli/utils.py: get_generator_path()
-meson.add_install_script(meson_make_symlink,
-    join_paths(get_option('prefix'), libexec_netplan, 'generate'),
-    join_paths('/', 'lib', 'netplan', 'generate'))