Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Sat Aug 22 03:06:31 CEST 2009. -------- --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2009-08-04 12:34:21.000000000 +0200 +++ kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2009-08-21 11:47:14.000000000 +0200 @@ -1,0 +2,16 @@ +Fri Aug 21 11:46:54 CEST 2009 - coolo@novell.com + +- preset LastDistributionFlavor for more reliable flavor check + (bnc#533156) + +------------------------------------------------------------------- +Fri Aug 21 11:41:56 CEST 2009 - coolo@novell.com + +- no longer install Softlocks (bnc#533153) + +------------------------------------------------------------------- +Thu Aug 6 12:04:00 CEST 2009 - coolo@novell.com + +- x86_64 has desktop kernel + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- SoftLocks ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.JuHtPs/_old 2009-08-22 03:05:22.000000000 +0200 +++ /var/tmp/diff_new_pack.JuHtPs/_new 2009-08-22 03:05:22.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: yast2-country Summary: KDE live CD Version: 11.2 -Release: 9 +Release: 10 Group: System/Boot License: BSD 3-clause (or similar) BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -39,7 +39,6 @@ Source8: ifcfg-eth0 Source10: README Source12: correct_live_install -Source13: SoftLocks Source16: boot.langset Source17: 99-ignore-live-usb.fdi Source19: config-usb.patch @@ -103,6 +102,11 @@ sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml sed -i -e "s,@VERSION@,$suseversion," config.xml sed -i -e "s,@FLAVOR@,$config," config.xml + %ifarch x86_64 + sed -i -e "s,@BOOTKERNEL@,desktop," config.xml + %else + sed -i -e "s,@BOOTKERNEL@,std," config.xml + %endif mkdir config-cdroot cd config-cdroot install -m 644 /usr/share/doc/licenses/GPL-2.0.txt GPLv2.txt @@ -139,7 +143,6 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 cp -a /tmp/locale-settings/ etc/langset install -m 755 %{SOURCE23} etc/langset.sh - install -D -m 644 %{SOURCE13} var/lib/zypp/SoftLocks install -D -m 755 %{SOURCE24} etc/init.d/boot.braille install -D -m 755 %{SOURCE16} etc/init.d/boot.langset install -D -m 755 %{SOURCE12} usr/bin/correct_live_install @@ -148,6 +151,8 @@ cat %{SOURCE25} >> tmp/config.patch sed -i -e "s,NETWORKMANAGER=yes,NETWORKMANAGER=no," tmp/config.patch fi + mkdir -p var/lib/zypp/ + echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor if test $desktop = kde; then install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf tmp/ else ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.JuHtPs/_old 2009-08-22 03:05:22.000000000 +0200 +++ /var/tmp/diff_new_pack.JuHtPs/_new 2009-08-22 03:05:22.000000000 +0200 @@ -42,6 +42,7 @@ # enable create_xconf chkconfig boot.braille on chkconfig boot.langset on +chkconfig boot.compcache on chkconfig boot.ldconfig off cd / ++++++ config.xml.in ++++++ --- kiwi-config-openSUSE/config.xml.in 2009-08-04 12:34:20.000000000 +0200 +++ kiwi-config-openSUSE/config.xml.in 2009-08-19 01:43:49.000000000 +0200 @@ -6,14 +6,14 @@ <specification>openSUSE @VERSION@ Live system</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-@VERSION@" flags="clic" hybrid="true">iso</type> <!-- type:livecd --> + <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default" bootkernel="@BOOTKERNEL@" flags="clic" hybrid="true">iso</type> <!-- type:livecd --> <type boot="oemboot/suse-@VERSION@" filesystem="ext3">oem</type> <!-- type:usb --> <version>2.8.0</version> <size unit="M">3000</size> <boot-theme>openSUSE</boot-theme> <packagemanager>zypper</packagemanager> <rpm-check-signatures>False</rpm-check-signatures> - <rpm-force>False</rpm-force> + <rpm-force>false</rpm-force> <locale>en_US.UTF-8</locale> <oem-swap>no</oem-swap> <oem-boot-title>USB</oem-boot-title> ++++++ correct_live_install ++++++ --- /var/tmp/diff_new_pack.JuHtPs/_old 2009-08-22 03:05:23.000000000 +0200 +++ /var/tmp/diff_new_pack.JuHtPs/_new 2009-08-22 03:05:23.000000000 +0200 @@ -11,8 +11,10 @@ chkconfig sshd on chkconfig cron on +# TODO make this conditional chkconfig boot.braille off chkconfig boot.ldconfig on chkconfig boot.langset off +chkconfig boot.compcache off #====================================== # /etc/sudoers hack to fix #297695 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org