From c3e4ad300da943a3e31ba5842ff96d655990c5f51fe06aca83f3277bb2310d1b Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 10 May 2021 09:36:39 +0000
Subject: [PATCH] Accepting request 891998 from
 home:favogt:branches:openSUSE:Factory:Live

- Create /etc/fstab if it doesn't exist (boo#1185815)
- list-kde: Ignore plasma-nm5-openconnect and plasma-nm5-openvpn

OBS-URL: https://build.opensuse.org/request/show/891998
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=105
---
 config.sh                  | 3 +++
 list-kde.sh                | 9 +++++----
 livecd-leap-kde.kiwi       | 8 ++++++--
 livecd-openSUSE.changes    | 6 ++++++
 livecd-tumbleweed-kde.kiwi | 8 ++++++--
 5 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/config.sh b/config.sh
index 3997369..e7a5c2c 100644
--- a/config.sh
+++ b/config.sh
@@ -120,6 +120,9 @@ pam-config -a --nullok
 
 : > /var/log/zypper.log
 
+# Create fstab if it doesn't exist (Work around boo#1185815)
+>>/etc/fstab
+
 # Add Installation and upgrade icons to the desktop
 if [ "$desktop" = "kde" ]; then
     # bug 989897, avoid creating desktop directory on KDE so that the default items are added on first login
diff --git a/list-kde.sh b/list-kde.sh
index 03b756d..69d0cd8 100644
--- a/list-kde.sh
+++ b/list-kde.sh
@@ -36,10 +36,14 @@ buildignore ispell
 
 # No fun allowed
 buildignore patterns-kde-kde_games
-
+# No PIM
+buildignore patterns-kde-kde_pim
 # Not really useful here, except for kcharselect.
 buildignore patterns-kde-kde_utilities
 install kcharselect
+# Ignore
+buildignore plasma-nm5-openconnect
+buildignore plasma-nm5-openvpn 
 
 # Pulls in docbook and friends, ~50MiB.
 # Excludedocs is enabled, so documentation is broken anyway
@@ -48,9 +52,6 @@ buildignore kdoctools
 # Moved here from list-common.sh, too big for x11
 install xf86-video-vmware i686,x86_64
 
-# No PIM
-buildignore patterns-kde-kde_pim
-
 buildignore digikam
 buildignore gdb
 buildignore hugin
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index a18abfa..bf0ce93 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -480,14 +480,18 @@
     <ignore name="ispell"/>
     <package name="aaa_base" replaces="patterns-kde-kde_games"/>
     <ignore name="patterns-kde-kde_games"/>
+    <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
+    <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
+    <package name="aaa_base" replaces="plasma-nm5-openconnect"/>
+    <ignore name="plasma-nm5-openconnect"/>
+    <package name="aaa_base" replaces="plasma-nm5-openvpn"/>
+    <ignore name="plasma-nm5-openvpn"/>
     <package name="aaa_base" replaces="kdoctools"/>
     <ignore name="kdoctools"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
-    <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="digikam"/>
     <ignore name="digikam"/>
     <package name="aaa_base" replaces="gdb"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 5c74c67..74443a2 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon May 10 07:37:43 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Create /etc/fstab if it doesn't exist (boo#1185815)
+- list-kde: Ignore plasma-nm5-openconnect and plasma-nm5-openvpn
+
 -------------------------------------------------------------------
 Mon Apr 26 11:16:03 UTC 2021 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 576e16f..a47bbdb 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -474,14 +474,18 @@
     <ignore name="ispell"/>
     <package name="aaa_base" replaces="patterns-kde-kde_games"/>
     <ignore name="patterns-kde-kde_games"/>
+    <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
+    <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="patterns-kde-kde_utilities"/>
     <ignore name="patterns-kde-kde_utilities"/>
     <package name="kcharselect"/>
+    <package name="aaa_base" replaces="plasma-nm5-openconnect"/>
+    <ignore name="plasma-nm5-openconnect"/>
+    <package name="aaa_base" replaces="plasma-nm5-openvpn"/>
+    <ignore name="plasma-nm5-openvpn"/>
     <package name="aaa_base" replaces="kdoctools"/>
     <ignore name="kdoctools"/>
     <package name="xf86-video-vmware" arch="i686,x86_64"/>
-    <package name="aaa_base" replaces="patterns-kde-kde_pim"/>
-    <ignore name="patterns-kde-kde_pim"/>
     <package name="aaa_base" replaces="digikam"/>
     <ignore name="digikam"/>
     <package name="aaa_base" replaces="gdb"/>