Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package kiwi-templates-JeOS for
openSUSE:Leap:15.3:Images checked in at 2022-03-04 09:09:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.3:Images/kiwi-templates-JeOS (Old)
and /work/SRC/openSUSE:Leap:15.3:Images/.kiwi-templates-JeOS.new.1958
(New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-templates-JeOS"
Fri Mar 4 09:09:52 2022 rev:2 rq:959340 version:unknown
Changes:
--------
New Changes file:
NO CHANGES FILE!!!
New:
----
project.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ _link ++++++
--- /var/tmp/diff_new_pack.BoeuQp/_old 2022-03-04 09:09:53.549415262 +0100
+++ /var/tmp/diff_new_pack.BoeuQp/_new 2022-03-04 09:09:53.553415263 +0100
@@ -1,10 +1,6 @@
-<link project="openSUSE:Leap:15.3:Update" package="kiwi-templates-JeOS">
-<patches>
- <!-- <branch /> for a full copy, default case -->
- <!-- <apply name="patch" /> apply a patch on the source directory -->
- <!-- <topadd>%define build_with_feature_x 1</topadd> add a line on the top
(spec file only) -->
- <!-- <add name="file.patch" /> add a patch to be applied after %setup (spec
file only) -->
- <!-- <delete name="filename" /> delete a file -->
-</patches>
+<link project="openSUSE:Leap:15.3:Update" package="kiwi-templates-JeOS"
baserev="3bf1a05b62a1ed8c19eb79c163e58a70">
+ <patches>
+ <apply name="project.diff"/>
+ </patches>
</link>
++++++ project.diff ++++++
--- JeOS.kiwi.orig
+++ JeOS.kiwi
@@ -35,7 +35,7 @@
bootloader="grub2"
firmware="uefi"
efipartsize="33"
- kernelcmdline="systemd.show_status=1 console=ttyS0,115200
console=tty0 quiet"
+ kernelcmdline="rw systemd.show_status=1 console=ttyS0,115200
console=tty0 quiet"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -76,7 +76,7 @@
bootloader="grub2"
firmware="uefi"
efipartsize="33"
- kernelcmdline="systemd.show_status=1 console=ttyS0,115200
console=tty0 quiet"
+ kernelcmdline="rw systemd.show_status=1 console=ttyS0,115200
console=tty0 quiet"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -116,7 +116,7 @@
bootloader="grub2"
firmware="uefi"
efipartsize="33"
- kernelcmdline="systemd.show_status=1 console=ttyS0,115200
console=tty0 quiet"
+ kernelcmdline="rw systemd.show_status=1 console=ttyS0,115200
console=tty0 quiet"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -160,7 +160,7 @@
bootloader="grub2"
firmware="uefi"
efipartsize="33"
- kernelcmdline="systemd.show_status=1 console=ttyS0,115200
console=tty0 net.ifnames=0 quiet"
+ kernelcmdline="rw systemd.show_status=1 console=ttyS0,115200
console=tty0 net.ifnames=0 quiet"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -187,7 +187,7 @@
bootloader="grub2"
firmware="uefi"
efipartsize="33"
- kernelcmdline="systemd.show_status=1 rootdelay=300
console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200 quiet"
+ kernelcmdline="rw systemd.show_status=1 rootdelay=300
console=ttyS0,115200 console=tty0 earlyprintk=ttyS0,115200 quiet"
bootpartition="false"
bootkernel="custom"
devicepersistency="by-uuid"
@@ -228,7 +228,7 @@
fsmountoptions="noatime,compress=lzo"
bootloader="grub2"
firmware="efi"
- kernelcmdline="systemd.show_status=1 console=ttyS0,115200
console=tty quiet"
+ kernelcmdline="rw systemd.show_status=1 console=ttyS0,115200
console=tty quiet"
bootpartition="false"
devicepersistency="by-uuid"
btrfs_quota_groups="true"
--- config.sh.orig
+++ config.sh
@@ -45,8 +45,7 @@ CONSOLE_FONT="eurlatgr.psfu"
echo "** reset machine settings"
rm -f /etc/machine-id \
/var/lib/zypp/AnonymousUniqueId \
- /var/lib/systemd/random-seed \
- /var/lib/dbus/machine-id
+ /var/lib/systemd/random-seed
#======================================
# SuSEconfig
--- kiwi-templates-JeOS.changes.orig
+++ kiwi-templates-JeOS.changes
@@ -1,4 +1,11 @@
-------------------------------------------------------------------
+Thu Mar 3 08:49:46 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Add rw to the default boot options to fix /etc/machine-id setup
+ (bsc#1194484, see also gh#OSInside/kiwi#1650)
+- Don't delete the dbus machine-id, it's a symlink
+
+-------------------------------------------------------------------
Wed Apr 7 13:19:01 UTC 2021 - Fabian Vogt <fv...@suse.com>
- Install shim everywhere except on RPi (bsc#1182211)
