Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:Factory checked in at 2014-09-18 07:12:52
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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
2014-09-10 17:03:09.000000000 +0200
+++
/work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2014-09-18 07:12:53.000000000 +0200
@@ -1,0 +2,16 @@
+Wed Sep 17 04:49:28 UTC 2014 - [email protected]
+
+- buildrequire the fixed control.xml
+
+-------------------------------------------------------------------
+Mon Sep 15 10:00:53 UTC 2014 - [email protected]
+
+- more cleanup of old usb stuff
+
+-------------------------------------------------------------------
+Sun Sep 14 10:28:37 UTC 2014 - [email protected]
+
+- Fix langset.service to start on boot by adding install section
+ in langset.service
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.000000000 +0200
+++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.000000000 +0200
@@ -26,7 +26,7 @@
BuildRequires: kiwi-tools
BuildRequires: libxml2-tools
BuildRequires: libxslt
-BuildRequires: skelcd-control-openSUSE
+BuildRequires: skelcd-control-openSUSE >= 13.2.15
BuildRequires: skelcd-openSUSE-CD
BuildRequires: xdm
BuildRequires: yast2-country
@@ -110,7 +110,6 @@
;;
x11)
sed -i -e "s,@PLIST@,X11-cd," config.xml
- sed -i -e '/yast2-live-installer/d' config.xml
;;
esac
label=`echo "$volid" | sed -e 's, ,_,g'`
@@ -148,9 +147,7 @@
install -D -m 755 %{SOURCE16} usr/lib/systemd/system/langset.service
install -D -m 755 %{SOURCE11} usr/bin/correct_live_for_reboot
install -D -m 755 %{SOURCE12} usr/bin/correct_live_install
- if test $desktop != x11; then
install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch
- fi
mkdir -p var/lib/zypp/
echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor
++++++ config.sh ++++++
--- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.000000000 +0200
+++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.000000000 +0200
@@ -44,10 +44,6 @@
patch -p0 < /etc/YaST2/liveinstall.patch
fi
-if test -f /etc/YaST2/firstboot.xml -a -f
/var/lib/livecd/config-firstboot.patch; then
- patch -f /etc/YaST2/firstboot.xml /var/lib/livecd/config-firstboot.patch
-fi
-
for i in /rpmkeys/gpg*.asc; do
# the import fails if kiwi already had this key
rpm --import $i || true
@@ -103,3 +99,5 @@
baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz
baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104
+# bug 891183 yast2 live-installer --gtk segfaults
+baseUpdateSysConfig /etc/sysconfig/yast2 WANTED_GUI qt
++++++ correct_live_install ++++++
--- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.000000000 +0200
+++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.000000000 +0200
@@ -3,11 +3,6 @@
# this script is called from the live installer once it is done (including 2nd
stage)
# So the goal of this script is to fix whatever configs were changed for the
live system
-is_usb=0
-if test "$1" = usb; then
- is_usb=1
-fi
-
#======================================
# /etc/sudoers hack to fix #297695
# (Installation Live CD: no need to ask for password of root)
@@ -22,10 +17,8 @@
# reset pam config
pam-config -d --nullok
-if test "$is_usb" = 0; then
- # remove unneeded /license.tar.gz
- rm /license.tar.gz
-fi
+# remove unneeded /license.tar.gz
+rm /license.tar.gz
# remove langset stuff
rm /etc/langset.sh
@@ -38,13 +31,6 @@
# bug 391798
sed -i -e 's,DISPLAYMANAGER_AUTOLOGIN="linux",DISPLAYMANAGER_AUTOLOGIN="",'
/etc/sysconfig/displaymanager
-if test "$is_usb" = 0; then
- # not good enough for usb
- # there we need something dynamic in firstboot
- /bin/cat /proc/sys/kernel/random/uuid > /etc/smolt/uuid
- rm /license.tar.gz
-fi
-
rm -f /var/lib/zypp/AnonymousUniqueId
rmdir /livecd || true
rmdir /read-only || true
++++++ langset.service ++++++
--- /var/tmp/diff_new_pack.oTkT9n/_old 2014-09-18 07:12:54.000000000 +0200
+++ /var/tmp/diff_new_pack.oTkT9n/_new 2014-09-18 07:12:54.000000000 +0200
@@ -9,3 +9,6 @@
Type=oneshot
RemainAfterExit=yes
ExecStart=/bin/sh /etc/langset.sh
+
+[Install]
+WantedBy=default.target
--
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
