Hello community,
here is the log from the commit of package kiwi-config-openSUSE for
openSUSE:12.3 checked in at 2013-02-17 17:03:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:12.3/kiwi-config-openSUSE (Old)
and /work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE", Maintainer is "co...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:12.3/kiwi-config-openSUSE/kiwi-config-openSUSE.changes
2013-02-14 21:09:19.000000000 +0100
+++
/work/SRC/openSUSE:12.3/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes
2013-02-17 17:03:54.000000000 +0100
@@ -1,0 +2,10 @@
+Fri Feb 15 08:55:05 UTC 2013 - co...@suse.com
+
+- remove langset.service before reboot (bnc#802747)
+
+-------------------------------------------------------------------
+Wed Feb 13 08:25:54 UTC 2013 - co...@suse.com
+
+- rename failsafe on x11 too
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi-config-openSUSE.spec ++++++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.000000000 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.000000000 +0100
@@ -136,10 +136,11 @@
sed -i -e '/yast2-live-installer/d' config.xml
;;
esac
+ label=`echo "$volid" | sed -e 's, ,_,g'`
if test $type = usb; then
sed -i -e "s,yast2-live-installer,yast2-firstboot," config.xml
fi
- sed -i -e "s,@VOLID@,$volid," config.xml
+ sed -i -e "s,@VOLID@,$volid,; s,@LABEL@,$label," config.xml
%ifarch x86_64
sed -i -e "s,@BOOTKERNEL@,desktop," config.xml
%else
++++++ config.xml.in ++++++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.000000000 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.000000000 +0100
@@ -1,5 +1,5 @@
<?xml version="1.0"?>
-<image schemaversion="5.6" name="openSUSE-@VERSION@-@FLAVOR@">
+<image schemaversion="5.6" name="openSUSE-@VERSION@-@FLAVOR@"
displayname="@LABEL@">
<description type="system">
<author>Stephan Kulow</author>
<contact>co...@novell.com</contact>
++++++ correct_live_for_reboot ++++++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.000000000 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.000000000 +0100
@@ -13,7 +13,9 @@
if test -e /etc/init.d/boot.compcache; then
chkconfig boot.compcache off
fi
-rm /etc/systemd/system/multi-user.target.wants/clicfs.service
/lib/systemd/system/sysinit.target.wants/langset.service
+rm /etc/systemd/system/multi-user.target.wants/clicfs.service
/usr/lib/systemd/system/sysinit.target.wants/langset.service
+rm /etc/systemd/system/clicfs.service
/etc/systemd/system/multi-user.target.wants/clicfs.service
+rm /usr/lib/systemd/system/langset.service
/usr/lib/systemd/system/sysinit.target.wants/langset.service
: > /var/run/utmp
++++++ correct_live_install ++++++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.000000000 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.000000000 +0100
@@ -30,8 +30,6 @@
# remove langset stuff
rm /etc/langset.sh
rm -rf /etc/langset/
-rm -f '/etc/systemd/system/clicfs.service'
'/etc/systemd/system/multi-user.target.wants/clicfs.service'
-rm -f '/usr/lib/systemd/system/langset.service'
'/usr/lib/systemd/system/sysinit.target.wants/langset.service'
cd /
# patch -R -p0 < /etc/YaST2/policy.patch
++++++ isopatch.sh.in ++++++
--- /var/tmp/diff_new_pack.JTxN6B/_old 2013-02-17 17:03:54.000000000 +0100
+++ /var/tmp/diff_new_pack.JTxN6B/_new 2013-02-17 17:03:54.000000000 +0100
@@ -3,28 +3,19 @@
set -ex
desktop=
-case $desktop in
- gnome)
- label="openSUSE_Live_GNOME"
- ;;
- kde*)
- label="openSUSE_Live_KDE"
- ;;
- x11)
- label="openSUSE_Live_X11"
- ;;
-esac
+label=@VOLID@
-sed -i -e "s,label openSUSE.*,label $label," boot/*/loader/isolinux.cfg
+#sed -i -e "s,label openSUSE.*,label $label," boot/*/loader/isolinux.cfg
if test "$desktop" != "x11"; then
sed -i -e "s,label Failsafe.*,label linux," boot/*/loader/isolinux.cfg
sed -i -e "s,showopts ide=nodma.*,liveinstall showopts,"
boot/*/loader/isolinux.cfg
else
sed -i -ne ':ss;/^label media/{:s;n;/^ /b s;b ss};p'
boot/*/loader/isolinux.cfg
+ #sed -i -e "s,label Failsafe.*,label Failsafe $label,"
boot/*/loader/isolinux.cfg
fi
sed -i -e "s,label Hard-Disk,label harddisk," boot/*/loader/isolinux.cfg
-sed -i -e "s,default open.*,default $label," boot/*/loader/isolinux.cfg
-sed -i -e "s,openSUSE[^ ]*,$label," boot/*/loader/isolinux.msg
+#sed -i -e "s,default open.*,default $label," boot/*/loader/isolinux.cfg
+#sed -i -e "s,openSUSE[^ ]*,$label," boot/*/loader/isolinux.msg
sed -i -e "s,splash=silent,splash=silent quiet preloadlog=/dev/null,"
boot/*/loader/isolinux.cfg
sed -i -e 's,key.F4=$,key.F4=kernelopts,' boot/*/loader/gfxboot.cfg
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
