From 4ba347a54a053ce1e79b78c7df5f8c32f64083f7ed474f8acb1b11bf401d9212 Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Sat, 13 Jun 2020 16:11:17 +0000
Subject: [PATCH] - Use vim-small on the rescue cd.

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=111
---
 list-x11.sh                | 2 ++
 livecd-leap-x11.kiwi       | 3 +++
 livecd-openSUSE.changes    | 5 +++++
 livecd-tumbleweed-x11.kiwi | 3 +++
 4 files changed, 13 insertions(+)

diff --git a/list-x11.sh b/list-x11.sh
index 3598a1a..d69a03e 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -47,7 +47,9 @@ buildignore avahi
 buildignore fprintd
 buildignore accountsservice
 buildignore MozillaFirefox
+buildignore vim
 buildignore vim-data
+install vim-small
 buildignore tcpdump
 
 install gparted
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index b45ce6d..42fde52 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -479,8 +479,11 @@
     <ignore name="accountsservice"/>
     <package name="aaa_base" replaces="MozillaFirefox"/>
     <ignore name="MozillaFirefox"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="vim-small"/>
     <package name="aaa_base" replaces="tcpdump"/>
     <ignore name="tcpdump"/>
     <package name="gparted"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 8d1c1db..87c1727 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Sat Jun 13 16:09:32 UTC 2020 - Dominique Leuenberger <dimstar@opensuse.org>
+
+- Use vim-small on the rescue cd.
+
 -------------------------------------------------------------------
 Fri Jun 12 08:30:05 UTC 2020 - Dominique Leuenberger <dleuenberger@suse.com>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 980ce21..6b35de1 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -479,8 +479,11 @@
     <ignore name="accountsservice"/>
     <package name="aaa_base" replaces="MozillaFirefox"/>
     <ignore name="MozillaFirefox"/>
+    <package name="aaa_base" replaces="vim"/>
+    <ignore name="vim"/>
     <package name="aaa_base" replaces="vim-data"/>
     <ignore name="vim-data"/>
+    <package name="vim-small"/>
     <package name="aaa_base" replaces="tcpdump"/>
     <ignore name="tcpdump"/>
     <package name="gparted"/>