diff --git a/config.sh b/config.sh index e595521..ff7d1fe 100644 --- a/config.sh +++ b/config.sh @@ -83,13 +83,6 @@ zypper --non-interactive rm -u skelcd-openSUSE || : # Remove the zypper locks needed for a slimmer system zypper rl $(seq 1 $(zypper ll | wc -l)) -if [ "$desktop" = "xfce" ]; then - # Change /control.xml to use xfce as system role - xsltproc /xfce-changecontrolxml.xsl /etc/YaST2/control.xml > /control.xml - # Not needed anymore - rm /xfce-changecontrolxml.xsl -fi - #====================================== # /etc/sudoers hack to fix #297695 # (Installation Live CD: no need to ask for password of root) diff --git a/list-xfce.sh b/list-xfce.sh index da58824..040859b 100644 --- a/list-xfce.sh +++ b/list-xfce.sh @@ -22,7 +22,6 @@ source "$PWD/list-installer.sh" buildignore aspell-en install libxslt-tools -archive xfce-changecontrolxml.tar.xz # Remove useless xfce panel plugins buildignore xfce4-panel-plugin-xkb diff --git a/livecd-openSUSE.changes b/livecd-openSUSE.changes index 7e615d1..4e1ac15 100644 --- a/livecd-openSUSE.changes +++ b/livecd-openSUSE.changes @@ -1,3 +1,10 @@ +------------------------------------------------------------------- +Fri Apr 5 14:42:10 UTC 2019 - Maurizio Galli + +- Xfce Live Image: removed obsolete xfce-changecontrolxml.xsl + System Role was addded to default YaST2 installer + PR gh#yast/skelcd-control-openSUSE#165 (boo#1131666) + ------------------------------------------------------------------- Wed Apr 3 14:45:56 UTC 2019 - Fabian Vogt diff --git a/livecd-tumbleweed-xfce.kiwi b/livecd-tumbleweed-xfce.kiwi index 2610472..63353f9 100644 --- a/livecd-tumbleweed-xfce.kiwi +++ b/livecd-tumbleweed-xfce.kiwi @@ -449,7 +449,6 @@ - diff --git a/xfce-changecontrolxml.tar.xz b/xfce-changecontrolxml.tar.xz deleted file mode 100644 index 8dcfc4d..0000000 --- a/xfce-changecontrolxml.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ee33ef05e615eae12bf21c08667655863ae660c16f1e1219b01a1dd8a8b23276 -size 796