[neon/neon/settings/Neon/release-lts] debian: make sure online policy doesn't run during offline updates

Harald Sitter null at kde.org
Thu Oct 15 14:13:08 BST 2020


Git commit 93ee40f86eee01073bc5a1c7ca494b2bf47e9eaf by Harald Sitter.
Committed on 15/10/2020 at 13:13.
Pushed by sitter into branch 'Neon/release-lts'.

make sure online policy doesn't run during offline updates

this somehow gets into the transaction on 20.04 so we'll want to
explicitly exclude it when the marker file is found, lest the onlining
undos what the offlining did

M  +4    -1    debian/neon-settings-2.neon-packagekit-online-update-policy.service

https://invent.kde.org/neon/neon/settings/commit/93ee40f86eee01073bc5a1c7ca494b2bf47e9eaf

diff --git a/debian/neon-settings-2.neon-packagekit-online-update-policy.service b/debian/neon-settings-2.neon-packagekit-online-update-policy.service
index 35c3a5c..9535fd6 100644
--- a/debian/neon-settings-2.neon-packagekit-online-update-policy.service
+++ b/debian/neon-settings-2.neon-packagekit-online-update-policy.service
@@ -1,5 +1,5 @@
 # SPDX-License-Identifier: GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL
-# SPDX-FileCopyrightText: 2018 Harald Sitter <sitter at kde.org>
+# SPDX-FileCopyrightText: 2018-2020 Harald Sitter <sitter at kde.org>
 
 # This runs on all boots to consistently clean up policy-rc.d
 # During our offline policy setup we'll create an empty file, we'll want to
@@ -14,6 +14,9 @@ ConditionPathExists=/usr/sbin/policy-rc.d
 # much of anything. It's basically a cheap way to tell an overridden file
 # from one a sysadmin is actually using to control policy behavior.
 ConditionFileNotEmpty=!/usr/sbin/policy-rc.d
+# On 20.04+ we get pulled into the transaction even in update scenarios.
+# Make sure we do not run onlining if the marker file is present.
+ConditionPathExists=!/system-update
 
 [Service]
 Type=oneshot


More information about the Neon-commits mailing list