Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

packagekit: Use dnf-automatic reboot option if available #19648

Merged
merged 4 commits into from
Nov 23, 2023
Merged

packagekit: Use dnf-automatic reboot option if available #19648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
71adc59
test: Re-enable TestAutoUpdates
martinpitt Nov 23, 2023
98afe4b
packagekit: KpatchSettings privileged is not required
martinpitt Nov 23, 2023
4a59c7b
test: Merge checkUpgradeRebootDnf() helper into testWithAvailableUpda…
martinpitt Nov 23, 2023
b2975cb
packagekit: Use dnf-automatic reboot option if available
martinpitt Nov 23, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions pkg/packagekit/autoupdates.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,14 +180,22 @@ class DnfImpl extends ImplBase {
script += "systemctl " + (enabled ? "enable" : "disable") + " --now dnf-automatic-install.timer; ";

if (enabled) {
// HACK: enable automatic reboots after updating; dnf-automatic does not leave a log file behind for
// deciding whether it actually installed anything, so resort to grepping the journal for the last run
// (https://bugzilla.redhat.com/show_bug.cgi?id=1491190)
script += "mkdir -p /etc/systemd/system/dnf-automatic-install.service.d; ";
script += "printf '[Service]\\nExecStartPost=/bin/sh -ec \"" +
/* dnf 4.15+ supports automatic reboots; check if the config option exists, and if so, change the
default to "when-needed"; but be strict about the format, to avoid changing a customized setting */
script += "if grep '^[[:space:]]*reboot\\b' /etc/dnf/automatic.conf; then ";
script += " sed -i 's/^reboot = never$/reboot = when-needed/' /etc/dnf/automatic.conf; ";
// and drop the previous hack on upgrades */
script += " rm -f " + rebootConf + "; ";
/* HACK for older dnf: enable automatic reboots after updating; dnf-automatic does not leave a log
file behind for deciding whether it actually installed anything, so resort to grepping the journal
for the last run (https://bugzilla.redhat.com/show_bug.cgi?id=1491190) */
script += "else ";
script += " mkdir -p /etc/systemd/system/dnf-automatic-install.service.d; ";
script += " printf '[Service]\\nExecStartPost=/bin/sh -ec \"" +
"if systemctl status --no-pager --lines=100 dnf-automatic-install.service| grep -q ===========$$; then " +
"shutdown -r +5 rebooting after applying package updates; fi\"\\n' > " + rebootConf + "; ";
script += "systemctl daemon-reload; ";
script += " systemctl daemon-reload; ";
script += "fi";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Less hacks \o/ Wonder if we should move to string literals at some point for readability.

} else {
// also make sure that the legacy unit name is disabled; this can fail if the unit does not exist
script += "systemctl disable --now dnf-automatic.timer 2>/dev/null || true; ";
Expand Down
2 changes: 1 addition & 1 deletion pkg/packagekit/kpatch.jsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -323,7 +323,7 @@ export class KpatchSettings extends React.Component {
}

KpatchSettings.propTypes = {
privileged: PropTypes.bool.isRequired,
privileged: PropTypes.bool,
};

export class KpatchStatus extends React.Component {
Expand Down
71 changes: 37 additions & 34 deletions test/verify/check-packagekit
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1412,7 +1412,7 @@ class TestUpdatesSubscriptions(packagelib.PackageCase):
b.wait_in_text("#status", "System is up to date")


@testlib.skipOstree
@testlib.skipOstree("Image uses OSTree")
@testlib.nondestructive
class TestAutoUpdates(NoSubManCase):

Expand All @@ -1421,6 +1421,7 @@ class TestAutoUpdates(NoSubManCase):
# not implemented for yum and apt yet, only dnf
self.supported_backend = self.backend in ["dnf"]
if self.backend == 'dnf':
self.restore_file("/etc/dnf/automatic.conf")
self.addCleanup(self.machine.execute, "systemctl disable --now dnf-automatic-install.timer 2>/dev/null; rm -rf /etc/systemd/system/dnf-automatic-*")

def closeSettings(self, browser):
Expand Down Expand Up @@ -1461,7 +1462,15 @@ class TestAutoUpdates(NoSubManCase):
# automatic reboots should be enabled whenever timer is enabled
out = m.execute("systemctl cat dnf-automatic-install.service")
if hour:
self.assertRegex(out, "ExecStartPost=/.*shutdown")
if m.image.startswith("rhel-8") or m.image == "centos-8-stream":
# for RHEL 8, dnf-automatic does not support reboot; we have a unit drop-in hack
self.assertRegex(out, "ExecStartPost=/.*shutdown")
# validate our assumption
self.assertNotIn("reboot", m.execute("cat /etc/dnf/automatic.conf"))
else:
# newer dnf supports that natively
self.assertNotIn("ExecStartPost", out)
self.assertIn("reboot = when-needed", m.execute("cat /etc/dnf/automatic.conf"))
else:
self.assertNotIn("ExecStartPost", out)

Expand Down Expand Up @@ -1605,8 +1614,9 @@ class TestAutoUpdates(NoSubManCase):
b = self.browser
m = self.machine

self.createPackage("vanilla", "1.0", "1", install=True)
self.createPackage("vanilla", "1.0", "2")
# use a package which dnf recognizes as "needs reboot"
self.createPackage("kernel-rt", "1.0", "1", install=True)
self.createPackage("kernel-rt", "1.0", "2")
self.enableRepo()

m.start_cockpit()
Expand All @@ -1627,7 +1637,29 @@ class TestAutoUpdates(NoSubManCase):
b.wait_in_text("#autoupdates-settings", "Updates will be applied every day at 06:00")

if self.backend == 'dnf':
self.checkUpgradeRebootDnf()
# dial down the random sleep to avoid the test having to wait 5 mins
self.sed_file("/random_sleep/ s/=.*$/= 3/", "/etc/dnf/automatic.conf")
# then manually start the upgrade job like the timer would
m.execute("systemctl start dnf-automatic-install.service")
# new kernel-rt package got installed, and triggered reboot; cancel that
m.execute("test -f /stamp-kernel-rt-1.0-2")
m.execute("until test -f /run/nologin; do sleep 1; done")
m.execute("shutdown -c; test ! -f /run/nologin")
# service should show kernel-rt upgrade and scheduling shutdown
out = m.execute(
"if systemctl status --lines=50 dnf-automatic-install.service; then echo 'expected service to be stopped'; exit 1; fi")
self.assertIn("kernel-rt", out)
# systemd 245.7 correctly says "reboot", older version say "shutdown"
self.assertRegex(out, "(Shutdown|Reboot) scheduled")

# run it again, now there are no available updates → no reboot
m.execute("systemctl start dnf-automatic-install.service")
m.execute("test -f /stamp-kernel-rt-1.0-2; test ! -f /run/nologin")
# service should not do much
out = m.execute(
"if systemctl status dnf-automatic-install.service; then echo 'expected service to be stopped'; exit 1; fi")
self.assertNotIn("kernel-rt", out)
self.assertNotIn("Shutdown", out)
else:
raise NotImplementedError(self.backend)

Expand Down Expand Up @@ -1661,35 +1693,6 @@ class TestAutoUpdates(NoSubManCase):
b.wait_in_text("#autoupdates-settings", "Updates will be applied every day at 06:00")
b.wait_visible("#autoupdates-settings button:disabled")

def checkUpgradeRebootDnf(self):
"""part of testWithAvailableUpdates() for dnf backend"""

m = self.machine

# dial down the random sleep to avoid the test having to wait 5 mins
self.sed_file("/random_sleep/ s/=.*$/= 3/", "/etc/dnf/automatic.conf")
# then manually start the upgrade job like the timer would
m.execute("systemctl start dnf-automatic-install.service")
# new vanilla package got installed, and triggered reboot; cancel that
m.execute("test -f /stamp-vanilla-1.0-2")
m.execute("until test -f /run/nologin; do sleep 1; done")
m.execute("shutdown -c; test ! -f /run/nologin")
# service should show vanilla upgrade and scheduling shutdown
out = m.execute(
"if systemctl status dnf-automatic-install.service; then echo 'expected service to be stopped'; exit 1; fi")
self.assertIn("vanilla", out)
# systemd 245.7 correctly says "reboot", older version say "shutdown"
self.assertRegex(out, "(Shutdown|Reboot) scheduled")

# run it again, now there are no available updates → no reboot
m.execute("systemctl start dnf-automatic-install.service")
m.execute("test -f /stamp-vanilla-1.0-2; test ! -f /run/nologin")
# service should not do much
out = m.execute(
"if systemctl status dnf-automatic-install.service; then echo 'expected service to be stopped'; exit 1; fi")
self.assertNotIn("vanilla", out)
self.assertNotIn("Shutdown", out)


@testlib.skipImage("Image uses OSTree", "fedora-coreos", "rhel4edge")
class TestAutoUpdatesInstall(NoSubManCase):
Expand Down