From be1e49b6dbdddf5a02bc925583a9438507d16483729bb8a351152b25a5babcba Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 4 Mar 2021 12:10:01 +0000
Subject: [PATCH] Accepting request 876730 from
 home:favogt:branches:openSUSE:Factory:Live

- More size reduction:
  * Drop unneeded kernel binary
  * Stop writing /var/log/config.log
  * Exclude networking from the initrd

OBS-URL: https://build.opensuse.org/request/show/876730
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=90
---
 config.sh               | 15 ++++++++++++---
 livecd-openSUSE.changes |  8 ++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/config.sh b/config.sh
index 4af0242..ac0dcb9 100644
--- a/config.sh
+++ b/config.sh
@@ -16,9 +16,6 @@ test -f /.profile && . /.profile
 
 set -euxo pipefail
 
-exec | tee /var/log/config.log
-exec 2>&1
-
 pl=$(rpmqpack | grep release-livecd-)
 
 # Get the flavor from the installed (openSUSE|Leap)-release-livecd- RPM
@@ -53,6 +50,15 @@ done
 echo '# multipath needs to be excluded from dracut as it breaks os-prober' > /etc/dracut.conf.d/no-multipath.conf
 echo 'omit_dracutmodules+=" multipath "' >> /etc/dracut.conf.d/no-multipath.conf
 
+if [ "$desktop" = "x11" ]; then
+	# Forcibly exclude networking support
+	sed -i 's/echo network rootfs-block/echo rootfs-block/' /usr/lib/dracut/modules.d/90kiwi-live/module-setup.sh
+	echo 'omit_dracutmodules+=" network "' >> /etc/dracut.conf.d/no-network.conf
+
+	# Work around https://github.com/OSInside/kiwi/issues/1751
+	sed -i '/omit_dracutmodules=/d' /usr/bin/dracut
+fi
+
 cd /
 
 # Import keys for installation
@@ -80,6 +86,9 @@ rm -rf /usr/share/doc/packages/*
 # Save more than 200 MiB by removing this, not very useful for lives
 rm -rf /lib/firmware/{liquidio,netronome,qed,mrvl,mellanox,qcom,cypress}
 
+# Not needed, boo#1166406
+rm /boot/vmlinux*.[gx]z
+
 # Add repos from /etc/YaST2/control.xml
 add-yast-repos
 zypper --non-interactive rm -u live-add-yast-repos
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index b415c18..8811c6b 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Thu Mar  4 11:18:15 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- More size reduction:
+  * Drop unneeded kernel binary
+  * Stop writing /var/log/config.log
+  * Exclude networking from the initrd
+
 -------------------------------------------------------------------
 Tue Feb 23 10:52:12 UTC 2021 - Fabian Vogt <fvogt@suse.com>