Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package grub2 for openSUSE:Factory checked
in at 2021-06-13 23:05:27
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/grub2 (Old)
and /work/SRC/openSUSE:Factory/.grub2.new.32437 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "grub2"
Sun Jun 13 23:05:27 2021 rev:243 rq:898234 version:2.04
Changes:
--------
--- /work/SRC/openSUSE:Factory/grub2/grub2.changes 2021-06-04
22:42:53.755085082 +0200
+++ /work/SRC/openSUSE:Factory/.grub2.new.32437/grub2.changes 2021-06-13
23:05:30.395599516 +0200
@@ -1,0 +2,8 @@
+Mon May 31 07:18:56 UTC 2021 - Michael Chang <mch...@suse.com>
+
+- Fix running grub2-once leads to failure of starting systemd service in the
+ boot sequence (bsc#1169460)
+ * grub2-once
+ * grub2-once.service
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ grub2-once ++++++
--- /var/tmp/diff_new_pack.4xa0nH/_old 2021-06-13 23:05:33.467605070 +0200
+++ /var/tmp/diff_new_pack.4xa0nH/_new 2021-06-13 23:05:33.471605078 +0200
@@ -177,11 +177,14 @@
# work and function properly on lvm, md and s390.
sub enable_restore_grubenv_service {
- my $systemctl="/usr/bin/systemctl";
+ my $systemctl = "/usr/bin/systemctl";
+ my $cleanup = "/var/tmp/grub2-cleanup-once";
- if (-x $systemctl) {
- system "$systemctl --no-reload enable grub2-once >/dev/null 2>&1";
- }
+ open(my $fh, ">", $cleanup) or die "open: $cleanup $!\n";
+ close($fh);
+
+ return 0 if (system("$systemctl --quiet is-enabled grub2-once") == 0);
+ system "$systemctl --no-reload enable grub2-once >/dev/null 2>&1";
}
$id_name = "";
++++++ grub2-once.service ++++++
--- /var/tmp/diff_new_pack.4xa0nH/_old 2021-06-13 23:05:33.487605107 +0200
+++ /var/tmp/diff_new_pack.4xa0nH/_new 2021-06-13 23:05:33.491605114 +0200
@@ -5,11 +5,12 @@
Before=sysinit.target shutdown.target
Conflicts=shutdown.target
ConditionPathIsReadWrite=/boot/grub2/grubenv
+ConditionPathExists=/var/tmp/grub2-cleanup-once
[Service]
Type=oneshot
ExecStart=-/usr/bin/grub2-editenv /boot/grub2/grubenv unset next_entry
-ExecStartPost=-/usr/bin/systemctl disable grub2-once.service
+ExecStartPost=-/usr/bin/rm -f /var/tmp/grub2-cleanup-once
StandardOutput=journal
[Install]
