From faf260dfa3e5600930c9efcf5032011bad536f33f2a496cc218f8e0159eddb96 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 13 Jan 2022 10:36:55 +0000
Subject: [PATCH] Accepting request 946071 from
 home:favogt:branches:openSUSE:Factory:Live

- config.sh: Disable initrd networking also for Xfce
- list-xfce: add shotwell back

OBS-URL: https://build.opensuse.org/request/show/946071
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=125
---
 config.sh                   | 4 +++-
 list-xfce.sh                | 1 -
 livecd-leap-xfce.kiwi       | 2 --
 livecd-openSUSE.changes     | 6 ++++++
 livecd-tumbleweed-xfce.kiwi | 2 --
 5 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/config.sh b/config.sh
index b3808dc..f5715df 100644
--- a/config.sh
+++ b/config.sh
@@ -51,7 +51,7 @@ 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
+if [ "$desktop" = "x11" ] || [ "$desktop" = "xfce" ]; 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
@@ -61,7 +61,9 @@ if [ "$desktop" = "x11" ]; then
 
 	# Work around https://github.com/OSInside/kiwi/issues/1751
 	sed -i '/omit_dracutmodules=/d' /usr/bin/dracut
+fi
 
+if [ "$desktop" = "x11" ]; then
 	# Only used for X11 acceleration on vmwgfx, saves ~47MiB
 	rpm -e --nodeps Mesa-gallium
 
diff --git a/list-xfce.sh b/list-xfce.sh
index b3cafd3..6fd669d 100644
--- a/list-xfce.sh
+++ b/list-xfce.sh
@@ -31,7 +31,6 @@ buildignore libreoffice
 
 # Save a bit of space
 buildignore gdb
-buildignore shotwell
 
 buildignore gimp
 buildignore pidgin
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 72ce14f..dc1502a 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -487,8 +487,6 @@
     <ignore name="libreoffice"/>
     <package name="aaa_base" replaces="gdb"/>
     <ignore name="gdb"/>
-    <package name="aaa_base" replaces="shotwell"/>
-    <ignore name="shotwell"/>
     <package name="aaa_base" replaces="gimp"/>
     <ignore name="gimp"/>
     <package name="aaa_base" replaces="pidgin"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index d0d99d8..942f49d 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Thu Jan 13 10:28:43 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- config.sh: Disable initrd networking also for Xfce
+- list-xfce: add shotwell back
+
 -------------------------------------------------------------------
 Thu Jan 13 09:17:06 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 44b9cb7..1dabea1 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -481,8 +481,6 @@
     <ignore name="libreoffice"/>
     <package name="aaa_base" replaces="gdb"/>
     <ignore name="gdb"/>
-    <package name="aaa_base" replaces="shotwell"/>
-    <ignore name="shotwell"/>
     <package name="aaa_base" replaces="gimp"/>
     <ignore name="gimp"/>
     <package name="aaa_base" replaces="pidgin"/>