Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Tue Oct 6 05:00:38 CEST 2009. -------- --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2009-09-18 21:21:32.000000000 +0200 +++ kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2009-10-04 19:25:34.000000000 +0200 @@ -1,0 +2,25 @@ +Sun Oct 4 17:24:46 UTC 2009 - coolo@novell.com + +- hopefully fixing 2nd stage (bnc#544139) + +------------------------------------------------------------------- +Fri Oct 2 15:40:54 UTC 2009 - coolo@novell.com + +- do explicitly not exclude docs + +------------------------------------------------------------------- +Thu Oct 1 10:58:35 CEST 2009 - coolo@novell.com + +- cleanup kiwi mount points (bnc#528185) + +------------------------------------------------------------------- +Wed Sep 30 22:06:56 CEST 2009 - coolo@novell.com + +- trying live install + +------------------------------------------------------------------- +Sun Sep 20 12:30:43 CEST 2009 - coolo@novell.com + +- set the zypp language to the one from grub (bnc#540222) + +------------------------------------------------------------------- calling whatdependson for head-i586 New: ---- xdm-liveinstall.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.1u2uJI/_old 2009-10-06 05:00:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1u2uJI/_new 2009-10-06 05:00:24.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: yast2-country Summary: KDE live CD Version: 11.2 -Release: 12 +Release: 13 Group: System/Boot License: BSD 3-clause (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -47,6 +47,7 @@ Source23: langset.sh Source24: boot.braille Source25: xdm-x11.patch +Source26: xdm-liveinstall.patch ExcludeArch: ia64 ppc64 s390x s390 ppc %description @@ -147,6 +148,7 @@ install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch + install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch if test $desktop = x11; then cat %{SOURCE25} >> tmp/config.patch sed -i -e "s,NETWORKMANAGER=yes,NETWORKMANAGER=no," tmp/config.patch ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.1u2uJI/_old 2009-10-06 05:00:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1u2uJI/_new 2009-10-06 05:00:24.000000000 +0200 @@ -49,6 +49,8 @@ patch -p0 < /tmp/config.patch rm /tmp/config.patch +patch -p0 < /etc/YaST2/liveinstall.patch + # disabled for now - if you reenable, don't forget correct_live_install # bnc#382158 # patch -p0 < /etc/YaST2/policy.patch ++++++ config.xml.in ++++++ --- kiwi-config-openSUSE/config.xml.in 2009-08-26 11:08:20.000000000 +0200 +++ kiwi-config-openSUSE/config.xml.in 2009-10-02 17:41:41.000000000 +0200 @@ -17,6 +17,7 @@ <locale>en_US.UTF-8</locale> <oem-swap>false</oem-swap> <oem-boot-title>USB</oem-boot-title> + <rpm-excludedocs>false</rpm-excludedocs> </preferences> <users group="users"> <user name="root" pwd="" home="/root"/> ++++++ correct_live_install ++++++ --- /var/tmp/diff_new_pack.1u2uJI/_old 2009-10-06 05:00:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1u2uJI/_new 2009-10-06 05:00:24.000000000 +0200 @@ -44,6 +44,8 @@ cd / # patch -R -p0 < /etc/YaST2/policy.patch rm /etc/YaST2/policy.patch +patch -R -p0 < /etc/YaST2/liveinstall.patch +rm /etc/YaST2/liveinstall.patch if ! test "$is_usb" = 0; then patch -p0 < /tmp/config-usb.patch @@ -57,7 +59,10 @@ # 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.sh ++++++ --- /var/tmp/diff_new_pack.1u2uJI/_old 2009-10-06 05:00:24.000000000 +0200 +++ /var/tmp/diff_new_pack.1u2uJI/_new 2009-10-06 05:00:24.000000000 +0200 @@ -28,6 +28,7 @@ sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/clock done +echo "$Language""_$Country" > /var/lib/zypp/RequestedLocales # create fdi file /etc/X11/xdm/keytable4hal ++++++ xdm-liveinstall.patch ++++++ --- /etc/init.d/xdm 2008-12-03 13:57:13.000000000 +0100 +++ /etc/init.d/xdm 2009-05-20 10:20:34.000000000 +0200 @@ -179,7 +179,11 @@ rc_exit fi fi - startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + if cat /proc/cmdline | grep -q liveinstall; then + /usr/lib/YaST2/startup/YaST2.call live-installer + else + startproc -p $PIDFILE $DISPLAYMANAGER $XDMOPTIONS || rc_failed + fi # After a crash or a kill signal we may have # a wrong owner ship of /dev/xconsole if rc_status ; then --- /usr/lib/YaST2/startup/YaST2.call 2009-08-21 17:35:22.000000000 +0200 +++ /usr/lib/YaST2/startup/YaST2.call 2009-10-01 11:51:50.000000000 +0200 @@ -638,7 +638,9 @@ # 8) Call YaST2 #--------------------------------------------- Y2_MODULE_NAME=${1:-installation}; shift +if test "$Y2_MODULE_NAME" != "live-installer"; then Y2_MODULE_ARGS=\(\"$*\"\) +fi start_yast #============================================= ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org