Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory checked in at 2016-07-24 19:53:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE"
Changes:
--------
---
/work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2016-07-21 08:19:30.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2016-07-24 19:53:31.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Jul 21 08:01:42 UTC 2016 - [email protected]
+
+- Rename config.sh to config.sh.in to have desktop flavor available
+ - Move desktop-specific parts from .spec into config.sh.in
+- Copy live-installer.desktop icon to different location on Plasma
+ - Fix for boo#989897
+- Use "Tumbleweed" instead of "13.3" as name
+
+-------------------------------------------------------------------
Old:
----
config.sh
New:
----
config.sh.in
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.VLQ7qB/_old 2016-07-24 19:53:32.000000000 +0200
+++ /var/tmp/diff_new_pack.VLQ7qB/_new 2016-07-24 19:53:32.000000000 +0200
@@ -38,7 +38,7 @@
Release: 0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
Source1: COPYING
-Source3: config.sh
+Source3: config.sh.in
Source4: config.xml.in
Source9: isopatch.sh.in
Source10: README
@@ -77,31 +77,21 @@
cd $config
desktop=`echo $config | cut -d- -f2`
type=`echo $config | cut -d- -f1`
- install -m 755 %{SOURCE3} config.sh
- if test $desktop = kde; then
- echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER
sddm' >> config.sh
- fi
- if test $desktop = gnome; then
- echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER
gdm' >> config.sh
- echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM gnome'
>> config.sh
- fi
- if test $desktop = x11; then
- echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER
lightdm' >> config.sh
- echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM xfce' >>
config.sh
- fi
+
+ sed -e "s,^desktop=,desktop=$desktop," %{SOURCE3} > config.sh
sed -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," %{SOURCE4} > config.xml
sed -i -e "s,@VERSION@,$kiwiversion," config.xml
sed -i -e "s,@FLAVOR@,$config," config.xml
- volid="openSUSE %{version} Live"
+ volid="openSUSE Tumbleweed Live"
case $desktop in
gnome)
sed -i -e "s,@PLIST@,GNOME-cd," config.xml
- volid="openSUSE %{version} GNOME Live"
+ volid="openSUSE Tumbleweed GNOME Live"
;;
kde)
sed -i -e "s,@PLIST@,KDE-cd," config.xml
- volid="openSUSE %{version} KDE Live"
+ volid="openSUSE Tumbleweed KDE Live"
;;
x11)
sed -i -e "s,@PLIST@,X11-cd," config.xml
++++++ config.sh.in ++++++
#!/bin/bash
#================
# FILE : config.sh
#----------------
# PROJECT : OpenSuSE KIWI Image System
# COPYRIGHT : (c) 2006,2007,2008 SUSE LINUX Products GmbH. All rights
reserved
# :
# AUTHOR : Marcus Schaefer <[email protected]>, Stephan Kulow <[email protected]>
# :
# LICENSE : BSD
#======================================
# Functions...
#--------------------------------------
test -f /.kconfig && . /.kconfig
test -f /.profile && . /.profile
set -e
set -x
# Filled by the .spec file
desktop=
exec | tee /var/log/config.log
exec 2>&1
pl=`rpmqpack | grep package-lists-` || true
test -z "$pl" || rpm -e $pl
#======================================
# Greeting...
#--------------------------------------
echo "Configure image: [$name]..."
#--------------------------------------
# enable and disable services
for i in langset NetworkManager SuSEfirewall2; do
systemctl -f enable $i
done
for i in sshd cron wicked purge-kernels; do
systemctl -f disable $i
done
cd /
if test -e /etc/YaST2/liveinstall.patch; then
patch -p0 < /etc/YaST2/liveinstall.patch
fi
for i in /rpmkeys/gpg*.asc; do
# the import fails if kiwi already had this key
rpm --import $i || true
rm $i
done
rmdir /rpmkeys
rm -rf /var/cache/zypp/raw/*
bash -x /var/lib/livecd/geturls.sh
rm /var/lib/livecd/geturls.sh
#======================================
# /etc/sudoers hack to fix #297695
# (Installation Live CD: no need to ask for password of root)
#--------------------------------------
sed -i -e "s/ALL ALL=(ALL) ALL/ALL ALL=(ALL) NOPASSWD: ALL/" /etc/sudoers
chmod 0440 /etc/sudoers
/usr/sbin/useradd -m -u 999 linux -c "Live-CD User" -p ""
# delete passwords
passwd -d root
passwd -d linux
# empty password is ok
pam-config -a --nullok
: > /var/log/zypper.log
if [ "$desktop" != "kde" ]; then
# Add Installation icon to desktop folder
mkdir -p /home/linux/.config /home/linux/Desktop
echo 'XDG_DESKTOP_DIR="$HOME/Desktop"' > /home/linux/.config/user-dirs.dirs
ln -s /usr/share/applications/live-installer.desktop /home/linux/Desktop/
# Set the application as being "trusted"
chmod a+x /home/linux/Desktop/live-installer.desktop
else
# bug 989897, avoid creating desktop directory on KDE so that the default
items are added on first login
cp /usr/share/applications/live-installer.desktop
/usr/share/kio_desktop/DesktopLinks/
# Set the application as being "trusted"
chmod a+x /usr/share/kio_desktop/DesktopLinks/live-installer.desktop
fi
mv /var/lib/livecd/*.pdf /home/linux || true
rmdir /var/lib/livecd || true
chown -R linux /home/linux
chkstat --system --set
for script in /usr/share/opensuse-kiwi/live_user_scripts/*.sh; do
if test -f $script; then
su - linux -c "/bin/bash $script"
fi
done
rm -rf /var/cache/zypp/packages
# bug 544314, we only want to disable the bit in common-auth-pc
sed -i -e 's,^\(.*pam_gnome_keyring.so.*\),#\1,' /etc/pam.d/common-auth-pc
#USB /usr/bin/correct_live_for_reboot usb
#USB /usr/bin/correct_live_install usb
ln -s /usr/lib/systemd/system/runlevel5.target
/etc/systemd/system/default.target
baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux
baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz
baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD "english-us,pc104"
baseUpdateSysConfig /etc/sysconfig/keyboard COMPOSETABLE "clear latin1.add"
baseUpdateSysConfig /etc/sysconfig/language RC_LANG "en_US.UTF-8"
baseUpdateSysConfig /etc/sysconfig/console CONSOLE_FONT "lat9w-16.psfu"
baseUpdateSysConfig /etc/sysconfig/console CONSOLE_SCREENMAP trivial
baseUpdateSysConfig /etc/sysconfig/console CONSOLE_MAGIC "(K"
baseUpdateSysConfig /etc/sysconfig/console CONSOLE_ENCODING "UTF-8"
[ "$desktop" = "gnome" ] && displaymanager=gdm
[ "$desktop" = "kde" ] && displaymanager=sddm
[ "$desktop" = "x11" ] && displaymanager=lightdm
baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER $displaymanager
[ "$desktop" = "gnome" ] && baseUpdateSysConfig /etc/sysconfig/windowmanager
DEFAULT_WM gnome
[ "$desktop" = "x11" ] && baseUpdateSysConfig /etc/sysconfig/windowmanager
DEFAULT_WM xfce
# bug 891183 yast2 live-installer --gtk segfaults
baseUpdateSysConfig /etc/sysconfig/yast2 WANTED_GUI qt
#Disable journal write to disk in live mode, bug 950999
echo "Storage=volatile" >> /etc/systemd/journald.conf
