From aab7ebd33d7648a8b1a0e7d91888ca1c14fc24125c8e8f68d8f36d1c2908a42d Mon Sep 17 00:00:00 2001
From: Dominique Leuenberger <dleuenberger@suse.com>
Date: Wed, 8 May 2024 12:35:38 +0000
Subject: [PATCH] Save a bit of space - no pptp support

OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/livecd-openSUSE?expand=0&rev=236
---
 list-common.sh               | 1 +
 list-x11.sh                  | 1 +
 livecd-leap-gnome.kiwi       | 1 +
 livecd-leap-kde.kiwi         | 1 +
 livecd-leap-x11.kiwi         | 3 +++
 livecd-leap-xfce.kiwi        | 1 +
 livecd-openSUSE.changes      | 6 +++---
 livecd-tumbleweed-gnome.kiwi | 1 +
 livecd-tumbleweed-kde.kiwi   | 1 +
 livecd-tumbleweed-x11.kiwi   | 3 +++
 livecd-tumbleweed-xfce.kiwi  | 1 +
 11 files changed, 17 insertions(+), 3 deletions(-)

diff --git a/list-common.sh b/list-common.sh
index 4e61ba7..e6a536a 100644
--- a/list-common.sh
+++ b/list-common.sh
@@ -263,6 +263,7 @@ install lvm2
 install memtest86+ i686,x86_64
 install mpt-firmware
 install nano
+install pptp
 install quota
 install rsync
 install smartmontools
diff --git a/list-x11.sh b/list-x11.sh
index 2247c6c..dffe740 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -1,5 +1,6 @@
 buildignore NetworkManager-lang
 buildignore NetworkManager-applet-lang
+buildignore NetworkManager-pptp
 buildignore PackageKit
 buildignore samba-libs
 buildignore release-notes-openSUSE
diff --git a/livecd-leap-gnome.kiwi b/livecd-leap-gnome.kiwi
index e4c5762..00a2f10 100644
--- a/livecd-leap-gnome.kiwi
+++ b/livecd-leap-gnome.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
diff --git a/livecd-leap-kde.kiwi b/livecd-leap-kde.kiwi
index acbf1ac..24d38a2 100644
--- a/livecd-leap-kde.kiwi
+++ b/livecd-leap-kde.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 23deb22..db18e8b 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
@@ -424,6 +425,8 @@
     <ignore name="NetworkManager-lang"/>
     <!-- OBS-IgnorePackage: NetworkManager-applet-lang -->
     <ignore name="NetworkManager-applet-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-pptp -->
+    <ignore name="NetworkManager-pptp"/>
     <!-- OBS-IgnorePackage: PackageKit -->
     <ignore name="PackageKit"/>
     <!-- OBS-IgnorePackage: samba-libs -->
diff --git a/livecd-leap-xfce.kiwi b/livecd-leap-xfce.kiwi
index 97e1c20..55b7f7e 100644
--- a/livecd-leap-xfce.kiwi
+++ b/livecd-leap-xfce.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 3a71f6d..0760484 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,8 +1,8 @@
 -------------------------------------------------------------------
-Wed May  8 11:54:51 UTC 2024 - Dominique Leuenberger <dleuenberger@suse.com>
+Wed May  8 12:34:59 UTC 2024 - Dominique Leuenberger <dleuenberger@suse.com>
 
-- Drop pptp from the lives: also eliminates ppp and NM-pptp,
-  things most people won't use in a live-test-system.
+- Block NetworkManager-pptp from the x11 live: to recover the
+  machine, pptp is unlikely to be needed.
 
 -------------------------------------------------------------------
 Tue Apr 23 11:14:27 UTC 2024 - Ana Guerrero <ana.guerrero@suse.com>
diff --git a/livecd-tumbleweed-gnome.kiwi b/livecd-tumbleweed-gnome.kiwi
index 0688774..eb76159 100644
--- a/livecd-tumbleweed-gnome.kiwi
+++ b/livecd-tumbleweed-gnome.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
diff --git a/livecd-tumbleweed-kde.kiwi b/livecd-tumbleweed-kde.kiwi
index 5f8b0a0..457f4eb 100644
--- a/livecd-tumbleweed-kde.kiwi
+++ b/livecd-tumbleweed-kde.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index 21909ec..d045e64 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>
@@ -424,6 +425,8 @@
     <ignore name="NetworkManager-lang"/>
     <!-- OBS-IgnorePackage: NetworkManager-applet-lang -->
     <ignore name="NetworkManager-applet-lang"/>
+    <!-- OBS-IgnorePackage: NetworkManager-pptp -->
+    <ignore name="NetworkManager-pptp"/>
     <!-- OBS-IgnorePackage: PackageKit -->
     <ignore name="PackageKit"/>
     <!-- OBS-IgnorePackage: samba-libs -->
diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi
index 30fb883..7f16eed 100644
--- a/livecd-tumbleweed-xfce.kiwi
+++ b/livecd-tumbleweed-xfce.kiwi
@@ -383,6 +383,7 @@
     <package name="memtest86+" arch="i686,x86_64"/>
     <package name="mpt-firmware"/>
     <package name="nano"/>
+    <package name="pptp"/>
     <package name="quota"/>
     <package name="rsync"/>
     <package name="smartmontools"/>