Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package openSUSE-MicroOS for
openSUSE:Factory checked in at 2022-03-07 17:45:33
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1958 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-MicroOS"
Mon Mar 7 17:45:33 2022 rev:49 rq:959826 version:16.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes
2022-01-31 22:58:16.425197047 +0100
+++
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.1958/openSUSE-MicroOS.changes
2022-03-07 17:45:34.739143445 +0100
@@ -1,0 +2,6 @@
+Wed Mar 2 15:40:51 UTC 2022 - Fabian Vogt <fv...@suse.com>
+
+- Run wicked specific code only if wicked is installed
+- Don't delete the DBus machine-id, it's a symlink
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.5B8p38/_old 2022-03-07 17:45:35.639143185 +0100
+++ /var/tmp/diff_new_pack.5B8p38/_new 2022-03-07 17:45:35.643143183 +0100
@@ -39,8 +39,7 @@
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
#======================================
# Specify default systemd target
@@ -57,14 +56,6 @@
#--------------------------------------
baseUpdateSysConfig /etc/sysconfig/network/dhcp DHCLIENT_SET_HOSTNAME yes
-#======================================
-# Enable DHCP on eth0
-#--------------------------------------
-cat >/etc/sysconfig/network/ifcfg-eth0 <<EOF
-BOOTPROTO='dhcp'
-STARTMODE='auto'
-EOF
-
# Add repos from /etc/YaST2/control.xml
if [ -x /usr/sbin/add-yast-repos ]; then
add-yast-repos
@@ -154,7 +145,8 @@
serialconsole='console=ttyS0,115200'
[[ "$kiwi_profiles" == *"RaspberryPi2" ]] &&
serialconsole='console=ttyAMA0,115200'
-grub_cmdline=('quiet' 'systemd.show_status=yes' "${serialconsole}"
'console=tty0' 'net.ifnames=0')
+grub_cmdline=('quiet' 'systemd.show_status=yes' "${serialconsole}"
'console=tty0')
+rpm -q wicked && grub_cmdline+=('net.ifnames=0')
ignition_platform='metal'
case "${kiwi_profiles}" in
@@ -194,13 +186,24 @@
fi
#======================================
-# Workaround: Force network-legacy, network-wicked is not usable (boo#1182227)
+# Wicked specific configuration (in addition to the net.ifnames=0 above)
#--------------------------------------
-if rpm -q ignition-dracut-grub2; then
- # Modify module-setup.sh, but undo the modification on the first call
- mv /usr/lib/dracut/modules.d/40network/module-setup.sh{,.orig}
- sed 's#echo "kernel-network-modules $network_handler"$#echo
kernel-network-modules network-legacy; mv
/usr/lib/dracut/modules.d/40network/module-setup.sh{.orig,}#' \
- /usr/lib/dracut/modules.d/40network/module-setup.sh.orig >
/usr/lib/dracut/modules.d/40network/module-setup.sh
+if rpm -q wicked; then
+ # Enable DHCP on eth0
+ cat >/etc/sysconfig/network/ifcfg-eth0 <<EOF
+BOOTPROTO='dhcp'
+STARTMODE='auto'
+EOF
+
+ # Workaround: Force network-legacy, network-wicked is not usable
(boo#1182227)
+ if rpm -q ignition-dracut-grub2; then
+ # Modify module-setup.sh, but undo the modification on the
first call
+ mv /usr/lib/dracut/modules.d/40network/module-setup.sh{,.orig}
+ sed 's#echo "kernel-network-modules $network_handler"$#echo
kernel-network-modules network-legacy; mv
/usr/lib/dracut/modules.d/40network/module-setup.sh{.orig,}#' \
+
/usr/lib/dracut/modules.d/40network/module-setup.sh.orig >
/usr/lib/dracut/modules.d/40network/module-setup.sh
+ fi
+else
+ systemctl enable NetworkManager
fi
#======================================
