From 09816c2c0ecf4bce7aa302019aa40d3773b204a63ec27082959f84333a2bb9fd Mon Sep 17 00:00:00 2001
From: Fabian Vogt <fvogt@suse.com>
Date: Mon, 28 Feb 2022 11:12:41 +0000
Subject: [PATCH] Accepting request 958032 from
 home:favogt:branches:openSUSE:Factory:Live

- list-x11: Drop ristretto (boo#1193538)

OBS-URL: https://build.opensuse.org/request/show/958032
OBS-URL: https://build.opensuse.org/package/show/Virtualization:Appliances:Images:openSUSE-Tumbleweed/livecd-openSUSE?expand=0&rev=127
---
 config.sh                  |  2 +-
 list-x11.sh                |  3 ++-
 livecd-leap-x11.kiwi       |  3 ++-
 livecd-openSUSE.changes    | 15 +++++++++++++++
 livecd-tumbleweed-x11.kiwi |  3 ++-
 5 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/config.sh b/config.sh
index 6f5c245..4ec442b 100644
--- a/config.sh
+++ b/config.sh
@@ -169,7 +169,7 @@ chown -R linux /home/linux
 
 chkstat --system --set
 
-ln -s /usr/lib/systemd/system/runlevel5.target /etc/systemd/system/default.target
+ln -s /usr/lib/systemd/system/graphical.target /etc/systemd/system/default.target
 baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux
 baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD "english-us,pc104"
 baseUpdateSysConfig /etc/sysconfig/keyboard COMPOSETABLE "clear latin1.add"
diff --git a/list-x11.sh b/list-x11.sh
index 30c8eb9..0a1cc98 100644
--- a/list-x11.sh
+++ b/list-x11.sh
@@ -78,6 +78,8 @@ buildignore 7zip
 # tumbler -> libgepup uses libwebkit2gtk-4_0-37, while epiphany uses libwebkit2gtk-4_1-0.
 # We can't have both, too big.
 buildignore tumbler
+# ristretto is not that useful without tumbler
+buildignore ristretto
 
 # Moved here from list-common.sh. cyrus-sasl is needed by Pidgin in Xfce Live CD
 buildignore cyrus-sasl
@@ -101,7 +103,6 @@ install leafpad
 install lightdm
 install lightdm-gtk-greeter
 install photorec
-install ristretto
 install thunar
 install thunar-volman
 install xfce4-appfinder
diff --git a/livecd-leap-x11.kiwi b/livecd-leap-x11.kiwi
index 9020992..82231dd 100644
--- a/livecd-leap-x11.kiwi
+++ b/livecd-leap-x11.kiwi
@@ -577,6 +577,8 @@
     <ignore name="7zip"/>
     <package name="aaa_base" replaces="tumbler"/>
     <ignore name="tumbler"/>
+    <package name="aaa_base" replaces="ristretto"/>
+    <ignore name="ristretto"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>
@@ -596,7 +598,6 @@
     <package name="lightdm"/>
     <package name="lightdm-gtk-greeter"/>
     <package name="photorec"/>
-    <package name="ristretto"/>
     <package name="thunar"/>
     <package name="thunar-volman"/>
     <package name="xfce4-appfinder"/>
diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes
index 1cea51e..37ebf80 100644
--- a/livecd-openSUSE.changes
+++ b/livecd-openSUSE.changes
@@ -1,3 +1,18 @@
+-------------------------------------------------------------------
+Mon Feb 28 10:20:14 UTC 2022 - Fabian Vogt <fvogt@suse.com>
+
+- list-x11: Drop ristretto (boo#1193538)
+
+-------------------------------------------------------------------
+Mon Feb 21 09:19:36 UTC 2022 - Dominique Leuenberger <dleuenberger@suse.com>
+
+- Change default target from runlevel5.target (sysv compat) to
+  graphical.target (actual systemd target). Defacto the same thing,
+  as runlevel5.target is just a symlink to graphical.target, but is
+  no longer part of 'systemd' and moved to 'systemd-sysvcompat'.
+  Instead of pulling legacy compat along, we perform the actual
+  switch.
+
 -------------------------------------------------------------------
 Mon Jan 24 09:45:22 UTC 2022 - Fabian Vogt <fvogt@suse.com>
 
diff --git a/livecd-tumbleweed-x11.kiwi b/livecd-tumbleweed-x11.kiwi
index ed68928..ec50d0e 100644
--- a/livecd-tumbleweed-x11.kiwi
+++ b/livecd-tumbleweed-x11.kiwi
@@ -571,6 +571,8 @@
     <ignore name="7zip"/>
     <package name="aaa_base" replaces="tumbler"/>
     <ignore name="tumbler"/>
+    <package name="aaa_base" replaces="ristretto"/>
+    <ignore name="ristretto"/>
     <package name="aaa_base" replaces="cyrus-sasl"/>
     <ignore name="cyrus-sasl"/>
     <package name="aaa_base" replaces="deltarpm"/>
@@ -590,7 +592,6 @@
     <package name="lightdm"/>
     <package name="lightdm-gtk-greeter"/>
     <package name="photorec"/>
-    <package name="ristretto"/>
     <package name="thunar"/>
     <package name="thunar-volman"/>
     <package name="xfce4-appfinder"/>