Hello community,
here is the log from the commit of package openSUSE-MicroOS for
openSUSE:Factory checked in at 2020-07-01 18:23:17
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/openSUSE-MicroOS (Old)
and /work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.3060 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "openSUSE-MicroOS"
Wed Jul 1 18:23:17 2020 rev:28 rq:818109 version:16.0.0
Changes:
--------
--- /work/SRC/openSUSE:Factory/openSUSE-MicroOS/openSUSE-MicroOS.changes
2020-06-26 21:48:39.334447957 +0200
+++
/work/SRC/openSUSE:Factory/.openSUSE-MicroOS.new.3060/openSUSE-MicroOS.changes
2020-07-01 18:23:22.746076679 +0200
@@ -1,0 +2,7 @@
+Mon Jun 29 14:34:28 UTC 2020 - Fabian Vogt <fv...@suse.com>
+
+- Drop the /tmp subvolume in favor of tmpfs (boo#1173461)
+- Sync config.sh with kiwi-templates-JeOS
+- Drop bootsplash-theme, not used
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ openSUSE-MicroOS.kiwi ++++++
--- /var/tmp/diff_new_pack.40JOlX/_old 2020-07-01 18:23:23.282078333 +0200
+++ /var/tmp/diff_new_pack.40JOlX/_new 2020-07-01 18:23:23.286078345 +0200
@@ -112,7 +112,6 @@
<preferences profiles="kvm-and-xen_x86_64">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -135,7 +134,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/i386-pc"/>
@@ -149,7 +147,6 @@
<preferences profiles="kvm-and-xen_aarch64">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -172,7 +169,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/arm64-efi"
mountpoint="boot/grub2/arm64-efi"/>
@@ -185,7 +181,6 @@
<preferences profiles="VMware">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -208,7 +203,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/i386-pc"/>
@@ -223,7 +217,6 @@
<preferences profiles="OpenStack-Cloud">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -246,7 +239,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/i386-pc"/>
@@ -260,7 +252,6 @@
<preferences profiles="MS-HyperV">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -284,7 +275,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/i386-pc"/>
@@ -299,7 +289,6 @@
<preferences profiles="VirtualBox">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -322,7 +311,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/i386-pc"/>
@@ -336,7 +324,6 @@
<preferences profiles="Pine64">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -359,7 +346,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/arm64-efi"
mountpoint="boot/grub2/arm64-efi"/>
@@ -372,7 +358,6 @@
<preferences profiles="RaspberryPi">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -396,7 +381,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/arm64-efi"
mountpoint="boot/grub2/arm64-efi"/>
@@ -409,7 +393,6 @@
<preferences profiles="RaspberryPi2">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -433,7 +416,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/arm-efi"
mountpoint="boot/grub2/arm-efi"/>
@@ -446,7 +428,6 @@
<preferences profiles="Vagrant_x86_64">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -469,7 +450,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/i386-pc"/>
@@ -484,7 +464,6 @@
<preferences profiles="Vagrant_aarch64">
<version>16.0.0</version>
<packagemanager>zypper</packagemanager>
- <bootsplash-theme>openSUSE</bootsplash-theme>
<bootloader-theme>openSUSE</bootloader-theme>
<rpm-excludedocs>true</rpm-excludedocs>
<locale>en_US</locale>
@@ -507,7 +486,6 @@
<systemdisk>
<volume name="home"/>
<volume name="root"/>
- <volume name="tmp"/>
<volume name="opt"/>
<volume name="srv"/>
<volume name="boot/grub2/arm64-efi"
mountpoint="boot/grub2/arm64-efi"/>
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.40JOlX/_old 2020-07-01 18:23:23.338078505 +0200
+++ /var/tmp/diff_new_pack.40JOlX/_new 2020-07-01 18:23:23.338078505 +0200
@@ -1,5 +1,5 @@
#!/bin/bash
-# Copyright (c) 2018 SUSE LLC
+# Copyright (c) 2020 SUSE LLC
#
# Permission is hereby granted, free of charge, to any person obtaining a copy
# of this software and associated documentation files (the "Software"), to deal
@@ -28,39 +28,28 @@
set -euxo pipefail
-mkdir /var/lib/misc/reconfig_system
-
-#======================================
-# Greeting...
-#--------------------------------------
echo "Configure image: [$kiwi_iname]-[$kiwi_profiles]..."
-#======================================
-# add missing fonts
-#--------------------------------------
-CONSOLE_FONT="eurlatgr.psfu"
+# Systemd controls the console font now
+echo FONT="eurlatgr.psfu" >> /etc/vconsole.conf
#======================================
# prepare for setting root pw, timezone
#--------------------------------------
echo ** "reset machine settings"
sed -i 's/^root:[^:]*:/root:*:/' /etc/shadow
-rm /etc/machine-id
-rm /var/lib/zypp/AnonymousUniqueId
-rm /var/lib/systemd/random-seed
+rm -f /etc/machine-id \
+ /var/lib/zypp/AnonymousUniqueId \
+ /var/lib/systemd/random-seed \
+ /var/lib/dbus/machine-id
#======================================
-# Setup baseproduct link
+# Specify default systemd target
#--------------------------------------
-suseSetupProduct
+baseSetRunlevel multi-user.target
#======================================
-# Specify default runlevel
-#--------------------------------------
-baseSetRunlevel 3
-
-#======================================
-# Add missing gpg keys to rpm
+# Import trusted rpm keys
#--------------------------------------
suseImportBuildKey
@@ -69,37 +58,9 @@
#--------------------------------------
cat >/etc/sysconfig/network/ifcfg-eth0 <<EOF
BOOTPROTO='dhcp'
-MTU=''
-REMOTE_IPADDR=''
STARTMODE='auto'
-ETHTOOL_OPTIONS=''
-USERCONTROL='no'
EOF
-# Enable chrony
-suseInsertService chronyd
-
-#======================================
-# Sysconfig Update
-#--------------------------------------
-echo '** Update sysconfig entries...'
-
-echo FONT="$CONSOLE_FONT" >> /etc/vconsole.conf
-
-#======================================
-# SSL Certificates Configuration
-#--------------------------------------
-echo '** Rehashing SSL Certificates...'
-update-ca-certificates
-
-#======================================
-# Import trusted rpm keys
-#--------------------------------------
-for i in /usr/lib/rpm/gnupg/keys/gpg-pubkey*asc; do
- # importing can fail if it already exists
- rpm --import $i || true
-done
-
# Add repos from /etc/YaST2/control.xml
if [ -x /usr/sbin/add-yast-repos ]; then
add-yast-repos
@@ -107,8 +68,6 @@
fi
# Adjust zypp conf
-sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g'
/etc/zypp/zypp.conf
-sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g'
/etc/zypp/zypp.conf
sed -i 's/^multiversion =.*/multiversion =/g' /etc/zypp/zypp.conf
#=====================================
@@ -125,6 +84,13 @@
sed -i''
's/^NUMBER_LIMIT_IMPORTANT=.*$/NUMBER_LIMIT_IMPORTANT="4-10"/g'
/etc/snapper/configs/root
fi
+#=====================================
+# Enable chrony if installed
+#-------------------------------------
+if [ -f /etc/chrony.conf ]; then
+ suseInsertService chronyd
+fi
+
# The %post script can't edit /etc/fstab sys due to
https://github.com/OSInside/kiwi/issues/945
# so use the kiwi custom hack
cat >/etc/fstab.script <<"EOF"
@@ -146,6 +112,16 @@
EOF
#======================================
+# Disable recommends on virtual images (keep hardware supplements, see
bsc#1089498)
+#--------------------------------------
+sed -i 's/.*solver.onlyRequires.*/solver.onlyRequires = true/g'
/etc/zypp/zypp.conf
+
+#======================================
+# Disable installing documentation
+#--------------------------------------
+sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g'
/etc/zypp/zypp.conf
+
+#======================================
# Configure Pine64 specifics
#--------------------------------------
if [[ "$kiwi_profiles" == *"Pine64" ]]; then
@@ -153,9 +129,9 @@
fi
#======================================
-# Configure Raspberry Pi specifics
+# Configure Raspberry Pi specifics, unless done by raspberrypi-firmware
already (on TW)
#--------------------------------------
-if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then
+if [[ "$kiwi_profiles" == *"RaspberryPi"* ]] && ! [[ -e
/usr/lib/dracut/dracut.conf.d/raspberrypi_modules.conf ]]; then
# Add necessary kernel modules to initrd (will disappear with
bsc#1084272)
echo 'add_drivers+=" bcm2835_dma dwc2 "' >
/etc/dracut.conf.d/raspberrypi_modules.conf
