From bd83a4c72f7be33d362f5cb32bbc048b924c76f976ae14f17f0f38c66e547aa9 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Thu, 16 Apr 2020 10:23:49 +0000
Subject: [PATCH 1/2] - Also show WLAN interfaces in /etc/issue (bsc#1169070)

OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=30
---
 config.sh                   | 3 +++
 kiwi-templates-JeOS.changes | 5 +++++
 2 files changed, 8 insertions(+)

diff --git a/config.sh b/config.sh
index eac320c..8da887d 100644
--- a/config.sh
+++ b/config.sh
@@ -134,6 +134,9 @@ sed -i 's/.*rpm.install.excludedocs.*/rpm.install.excludedocs = yes/g' /etc/zypp
 # Configure Raspberry Pi specifics
 #--------------------------------------
 if [[ "$kiwi_profiles" == *"RaspberryPi"* ]]; then
+        # Also show WLAN interfaces in /etc/issue
+        baseUpdateSysConfig /etc/sysconfig/issue-generator NETWORK_INTERFACE_REGEX '^[bew]'
+
 	# Add necessary kernel modules to initrd (will disappear with bsc#1084272)
 	echo 'add_drivers+=" bcm2835_dma dwc2 "' > /etc/dracut.conf.d/raspberrypi_modules.conf
 
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index bed17c0..96167e4 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr 14 14:17:39 UTC 2020 - Fabian Vogt <fvogt@suse.com>
+
+- Also show WLAN interfaces in /etc/issue (bsc#1169070)
+
 -------------------------------------------------------------------
 Thu Apr  9 13:59:02 UTC 2020 - Guilherme Moro <gmoro@suse.com>
 

From 2eebcbc44df6aea14abd864e6ba2fa4938424aa75d17f36319d144f83dfdd112 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 27 Apr 2020 08:22:32 +0000
Subject: [PATCH 2/2] Accepting request 798110 from
 home:lnussel:branches:Virtualization:Appliances:Images:openSUSE-Tumbleweed

- switch to base instead of minimal_base pattern, minimal_base is too minimal
  for JeOS now.

OBS-URL: https://build.opensuse.org/request/show/798110
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/kiwi-templates-JeOS?expand=0&rev=31
---
 JeOS.kiwi                   | 2 +-
 kiwi-templates-JeOS.changes | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/JeOS.kiwi b/JeOS.kiwi
index 2c24486..7d8c31c 100644
--- a/JeOS.kiwi
+++ b/JeOS.kiwi
@@ -186,7 +186,7 @@
         <source path='obsrepositories:/'/>
     </repository>
     <packages type="image">
-        <package name="patterns-base-minimal_base"/>
+        <package name="patterns-base-base"/>
         <package name="aaa_base-extras"/> <!-- wouldn't be SUSE without that ;-) -->
         <package name="acl"/>
         <package name="chrony"/>
diff --git a/kiwi-templates-JeOS.changes b/kiwi-templates-JeOS.changes
index 96167e4..3479856 100644
--- a/kiwi-templates-JeOS.changes
+++ b/kiwi-templates-JeOS.changes
@@ -1,3 +1,9 @@
+-------------------------------------------------------------------
+Mon Apr 27 08:07:31 UTC 2020 - Ludwig Nussel <lnussel@suse.de>
+
+- switch to base instead of minimal_base pattern, minimal_base is too minimal
+  for JeOS now.
+
 -------------------------------------------------------------------
 Tue Apr 14 14:17:39 UTC 2020 - Fabian Vogt <fvogt@suse.com>