From abd4af256126eaca48d98ec39e8c6a108290dc3d Mon Sep 17 00:00:00 2001 From: David Runge Date: Sun, 27 Oct 2024 10:11:46 +0100 Subject: [PATCH] configs: Adapt enabled systemd services to changes in cloud-init 24.3 Adapt enabled services in both baseline and releng profiles to cope with changes in cloud-init 24.3. Related-to: https://gitlab.archlinux.org/archlinux/packaging/packages/cloud-init/-/issues/3 Related-to: https://github.com/canonical/cloud-init/pull/5489 Fixes: https://gitlab.archlinux.org/archlinux/archiso/-/issues/236 Signed-off-by: David Runge --- CHANGELOG.rst | 3 +++ .../system/cloud-init.target.wants/cloud-init-main.service | 1 + .../system/cloud-init.target.wants/cloud-init-network.service | 1 + .../systemd/system/cloud-init.target.wants/cloud-init.service | 1 - .../system/cloud-init.target.wants/cloud-init-main.service | 1 + .../system/cloud-init.target.wants/cloud-init-network.service | 1 + .../systemd/system/cloud-init.target.wants/cloud-init.service | 1 - 7 files changed, 7 insertions(+), 2 deletions(-) create mode 120000 configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service create mode 120000 configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service delete mode 120000 configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service create mode 120000 configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service create mode 120000 configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service delete mode 120000 configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 6491ccb2a..8b5eaaa2a 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -17,6 +17,9 @@ Deprecated Fixed ----- +- Change enabled services in baseline and releng profile to adapt to changes in ``cloud-init`` >= 24.3 (renamed + ``cloud-init.service`` to ``cloud-init-network.service``, introduced new ``cloud-init-main.service``). + Removed ------- diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service new file mode 120000 index 000000000..875ff7314 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-init-main.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service new file mode 120000 index 000000000..ae7773461 --- /dev/null +++ b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-init-network.service \ No newline at end of file diff --git a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service deleted file mode 120000 index 24c7a26f0..000000000 --- a/configs/baseline/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-init.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service new file mode 120000 index 000000000..875ff7314 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-main.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-init-main.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service new file mode 120000 index 000000000..ae7773461 --- /dev/null +++ b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init-network.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/cloud-init-network.service \ No newline at end of file diff --git a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service b/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service deleted file mode 120000 index 24c7a26f0..000000000 --- a/configs/releng/airootfs/etc/systemd/system/cloud-init.target.wants/cloud-init.service +++ /dev/null @@ -1 +0,0 @@ -/usr/lib/systemd/system/cloud-init.service \ No newline at end of file