From 1487c21f24cce6dc2d1f26eb02303d6ca6e68f50 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 16 Jul 2019 11:24:37 -0400 Subject: Systemd.machined: Fix a bug that caused the systemd-container package to not be installed when used with Debian buster. jessie (oldoldstable) is the only still supported release to have a systemd from before the systemd-container package was split out. --- debian/changelog | 2 ++ src/Propellor/Property/Systemd.hs | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 2de322ee..2c6f2a4f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ propellor (5.9.1) UNRELEASED; urgency=medium * Apt.update: Pass --allow-releaseinfo-change when updating Unstable or Testing, so that code name changes that happen in those suites during a stable release don't prevent updating the rolling suites. + * Systemd.machined: Fix a bug that caused the systemd-container package + to not be installed when used with Debian buster. -- Joey Hess Wed, 10 Jul 2019 22:02:35 -0400 diff --git a/src/Propellor/Property/Systemd.hs b/src/Propellor/Property/Systemd.hs index 5d597ac6..42025912 100644 --- a/src/Propellor/Property/Systemd.hs +++ b/src/Propellor/Property/Systemd.hs @@ -210,7 +210,7 @@ machined = installeddebian `pickOS` assumeinstalled case o of -- Split into separate debian package since systemd 225. (Just (System (Debian _ suite) _)) - | not (isStable suite) || suite == (Stable "stretch") -> + | not (isStable suite) || suite /= (Stable "jessie") -> ensureProperty w $ Apt.installed ["systemd-container"] _ -> noChange assumeinstalled :: Property Linux -- cgit v1.2.3