From 81ffbdf88fcf15b869259782cd009c04ca13627bc75ca598fe6af9b1fc93d2f8 Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Tue, 6 Apr 2021 14:22:30 +0000
Subject: [PATCH] Accepting request 883332 from
 home:favogt:branches:openSUSE:Factory:Live

- Switch from exfat-utils to exfatprogs, see also gh#yast/yast-storage-ng#1214

OBS-URL: https://build.opensuse.org/request/show/883332
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=97
---
 list-common.sh               | 5 +----
 livecd-leap-gnome.kiwi       | 1 +
 livecd-leap-kde.kiwi         | 1 +
 livecd-leap-x11.kiwi         | 1 +
 livecd-leap-xfce.kiwi        | 1 +
 livecd-openSUSE.changes      | 5 +++++
 livecd-tumbleweed-gnome.kiwi | 2 +-
 livecd-tumbleweed-kde.kiwi   | 2 +-
 livecd-tumbleweed-x11.kiwi   | 2 +-
 livecd-tumbleweed-xfce.kiwi  | 2 +-
 10 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/list-common.sh b/list-common.sh
index 64819ad..3273c2f 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -226,10 +226,7 @@ install device-mapper
 install dmraid
 install dosfstools
 install e2fsprogs
-# Not in Leap
-if [ "$distro" != "leap" ]; then
-	install exfat-utils
-fi
+install exfatprogs
 install fcoe-utils
 install jfsutils
 install mdadm
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index f565123..37bdb51 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -343,6 +343,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index 7edd69e..83e5cc5 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -343,6 +343,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 72a771b..6ca5211 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -343,6 +343,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 037dada..03f8077 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -343,6 +343,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index d4e5ab8..3758bbf 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Tue Apr  6 13:55:09 UTC 2021 - Fabian Vogt <fvogt@suse.com>
+
+- Switch from exfat-utils to exfatprogs, see also gh#yast/yast-storage-ng#1214
+
 -------------------------------------------------------------------
 Wed Mar 10 02:50:23 UTC 2021 - Maurizio Galli <maurizio.galli@gmail.com>
 
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index e9932f3..60ffb11 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -346,7 +346,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
-    <package name="exfat-utils"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 83fccca..2185bef 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -346,7 +346,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
-    <package name="exfat-utils"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index ac91109..bc33bb1 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -346,7 +346,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
-    <package name="exfat-utils"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index c94a40b..053673d 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -346,7 +346,7 @@
     <package name="dmraid"/>
     <package name="dosfstools"/>
     <package name="e2fsprogs"/>
-    <package name="exfat-utils"/>
+    <package name="exfatprogs"/>
     <package name="fcoe-utils"/>
     <package name="jfsutils"/>
     <package name="mdadm"/>