![](https://seccdn.libravatar.org/avatar/e2145bc5cf53dda95c308a3c75e8fef3.jpg?s=120&d=mm&r=g)
Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at Wed May 27 00:28:48 CEST 2009. -------- --- kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2009-05-07 16:26:47.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2009-05-26 11:57:02.000000000 +0200 @@ -1,0 +2,21 @@ +Tue May 26 11:56:35 CEST 2009 - coolo@suse.de + +- include bootsplash theme explicitly + +------------------------------------------------------------------- +Tue May 26 10:21:23 CEST 2009 - coolo@novell.com + +- set boot-theme to openSUSE + +------------------------------------------------------------------- +Mon May 18 17:27:27 CEST 2009 - coolo@suse.de + +- don't start xdm but "autologin" in x11 config (test config) +- remove configure-x.sh + +------------------------------------------------------------------- +Mon May 18 16:07:24 CEST 2009 - coolo@suse.de + +- try without sax in live cd setup + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- configure-x.sh langset.pl New: ---- langset.sh xdm-x11.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.J24929/_old 2009-05-27 00:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.J24929/_new 2009-05-27 00:28:28.000000000 +0200 @@ -25,7 +25,7 @@ BuildRequires: yast2-country Summary: KDE live CD Version: 11.2 -Release: 6 +Release: 7 Group: System/Boot License: BSD 3-Clause BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -38,7 +38,6 @@ Source7: config-gnome.patch Source8: ifcfg-eth0 Source10: README -Source11: configure-x.sh Source12: correct_live_install Source13: SoftLocks Source16: boot.langset @@ -46,8 +45,9 @@ Source19: config-usb.patch Source20: geturls.xsl Source22: getcountrydata.ycp -Source23: langset.pl +Source23: langset.sh Source24: boot.braille +Source25: xdm-x11.patch ExcludeArch: ia64 ppc64 s390x s390 ppc %description @@ -59,7 +59,6 @@ %setup -T -c %build -export MKCLICFS_COMPRESSION=0 kiwiversion=%version kiwiversion=11.2 # for now BASEDIR=$PWD @@ -139,14 +138,16 @@ fi install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 cp -a /tmp/locale-settings/ etc/langset - install -m 755 %{SOURCE23} etc/langset.pl + 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 %{SOURCE11} usr/sbin/configure-x.sh install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch - install -m 755 /usr/share/doc/packages/kiwi/examples/suse-$kiwiversion/suse-live-stick/root/etc/init.d/sax etc/init.d/sax + if test $desktop = x11; then + cat %{SOURCE25} >> tmp/config.patch + sed -i -e "s,NETWORKMANAGER=yes,NETWORKMANAGER=no," tmp/config.patch + fi if test $desktop = kde; then install -m 644 /usr/share/doc/manual/opensuse-kdequick_en-pdf/opensuse-kdequick_en.pdf tmp/ else @@ -173,6 +174,15 @@ /usr/share/openSUSE-kiwi %changelog +* Tue May 26 2009 coolo@suse.de +- include bootsplash theme explicitly +* Tue May 26 2009 coolo@novell.com +- set boot-theme to openSUSE +* Mon May 18 2009 coolo@suse.de +- don't start xdm but "autologin" in x11 config (test config) +- remove configure-x.sh +* Mon May 18 2009 coolo@suse.de +- try without sax in live cd setup * Thu May 07 2009 coolo@suse.de - do not compress with large * Mon May 04 2009 coolo@suse.de ++++++ boot.langset ++++++ --- /var/tmp/diff_new_pack.J24929/_old 2009-05-27 00:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.J24929/_new 2009-05-27 00:28:28.000000000 +0200 @@ -17,7 +17,7 @@ case "$1" in start) - test -f /etc/langset.xkb || /usr/bin/perl /etc/langset.pl + test -f /etc/X11/xorg.conf || /bin/sh /etc/langset.sh rc_status -v ;; stop) ++++++ config.patch ++++++ --- /var/tmp/diff_new_pack.J24929/_old 2009-05-27 00:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.J24929/_new 2009-05-27 00:28:28.000000000 +0200 @@ -57,14 +57,3 @@ ff02::3 ipv6-allhosts +127.0.0.2 linux.site linux ---- /etc/init.d/earlyxdm.orig 2008-11-10 16:18:30.000000000 +0100 -+++ /etc/init.d/earlyxdm 2008-11-10 16:19:00.000000000 +0100 -@@ -12,7 +12,7 @@ - ### BEGIN INIT INFO - # Provides: earlyxdm - # Required-Start: earlysyslog $local_fs dbus --# Should-Start: gpm firstboot -+# Should-Start: gpm firstboot sax - # Should-Stop: $null - # Required-Stop: $null - # Default-Start: 5 ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.J24929/_old 2009-05-27 00:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.J24929/_new 2009-05-27 00:28:28.000000000 +0200 @@ -40,7 +40,6 @@ chkconfig cron off # enable create_xconf -chkconfig sax on chkconfig boot.braille on chkconfig boot.langset on chkconfig boot.ldconfig off ++++++ config.xml.in ++++++ --- /var/tmp/diff_new_pack.J24929/_old 2009-05-27 00:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.J24929/_new 2009-05-27 00:28:28.000000000 +0200 @@ -10,6 +10,7 @@ <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> @@ -27,6 +28,8 @@ <source path="http://download.opensuse.org/repositories/openSUSE:/Factory:/Live/standard/"/> </repository> <packages type="image" patternPackageType="onlyRequired"> + <package name="bootsplash-branding-openSUSE" bootinclude="true" bootdelete="true"/> + <package name="gfxboot-branding-openSUSE" bootinclude="true" bootdelete="true"/> <package name="yast2-live-installer"/> <package name="pam"/> <package name="pam-config"/> ++++++ correct_live_install ++++++ --- /var/tmp/diff_new_pack.J24929/_old 2009-05-27 00:28:28.000000000 +0200 +++ /var/tmp/diff_new_pack.J24929/_new 2009-05-27 00:28:28.000000000 +0200 @@ -12,9 +12,6 @@ chkconfig sshd on chkconfig cron on chkconfig boot.ldconfig on -if test "$is_usb" = 0; then - chkconfig sax off -fi chkconfig boot.langset off #====================================== @@ -36,7 +33,7 @@ fi # remove langset stuff -rm /etc/langset.pl +rm /etc/langset.sh rm -rf /etc/langset/ grep -v ^perl /etc/init.d/boot.local > /etc/init.d/boot.local.1 && mv /etc/init.d/boot.local.1 /etc/init.d/boot.local chmod 0755 /etc/init.d/boot.local @@ -46,10 +43,7 @@ # patch -R -p0 < /etc/YaST2/policy.patch rm /etc/YaST2/policy.patch -if test "$is_usb" = 0; then - rm /etc/init.d/sax - rm /usr/sbin/configure-x.sh -else +if ! test "$is_usb" = 0; then patch -p0 < /tmp/config-usb.patch rm /tmp/config-usb.patch fi ++++++ langset.sh ++++++ #!/bin/sh lang=en_US for o in $(cat /proc/cmdline); do case $o in lang=*) eval $o ;; esac done # we need the _NOT so there is always a field 2 Country=$(echo "$lang"_NOT | cut -d_ -f2) Language=$(echo "$lang" | cut -d_ -f1) file="/etc/langset/$Language""_$Country" if ! test -f "$file"; then file="/etc/langset/$Language" fi sed -e 's,: *,:,' "$file" | while read line; do key=`echo $line | cut -d: -f1` value=`echo $line | cut -d: -f2-` sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/language sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/keyboard sed -i -e "s#$key=\".*#$key=\"$value\"#" /etc/sysconfig/console done # create fdi file /etc/X11/xdm/keytable4hal exec 4>"/etc/X11/xorg.conf" cat >&4 <<SECTION # xorg.conf (X.Org X Window System server configuration file) # # This file was created as part of the live cd setup SECTION # allow setting by /proc/cmdline DEVICE_DRIVER="" DEVICE_BUSID="" DEVICE_USE_FBDEV="" QEMU_KVM=$(grep "QEMU Virtual CPU" /proc/cpuinfo || true) if [ -n "$QEMU_KVM" ]; then DEVICE_DRIVER="cirrus" QEMU_VGA=$(lspci -v |grep "Technical Corp. Device 1111" || true) if [ -n "$QEMU_VGA" ]; then DEVICE_DRIVER="vesa" fi fi VBOX_VIDEO=$(grep -e "^vbox " /proc/modules || true) if [ -n "$VBOX_VIDEO" ]; then DEVICE_DRIVER="vboxvideo" fi cat >&4 <<SECTION Section "Device" Identifier "Configured Video Device" SECTION if [ -n "$DEVICE_DRIVER" ]; then printf "\tDriver\t\t\"$DEVICE_DRIVER\"\n" >&4 fi PS3_FB=$(grep -i PS3 /proc/fb 2>/dev/null || true) if [ -n "$PS3_FB" ]; then printf "\tOption\t\t\"ShadowFB\"\t\t\"false\"\n" >&4 fi if [ -n "$DEVICE_BUSID" ]; then printf "\tBusID\t\t\"$DEVICE_BUSID\"\n" >&4 fi if [ "$DEVICE_USE_FBDEV" = "true" ]; then printf "\tOption\t\t\"UseFBDev\"\t\t\"$DEVICE_USE_FBDEV\"\n" >&4 fi printf "EndSection\n" >&4 ### MONITOR cat >&4 <<SECTION Section "Monitor" Identifier "Configured Monitor" SECTION if [ -n "$QEMU_KVM" ]; then printf "\tHorizSync\t30-70\n" >&4 printf "\tVertRefresh\t50-160\n" >&4 fi cat >&4 <<SECTION EndSection SECTION ### SCREEN cat >&4 <<SECTION Section "Screen" Identifier "Default Screen" Monitor "Configured Monitor" Device "Configured Video Device" SECTION if [ -n "$PS3_FB" ]; then printf "\tDefaultFbBpp 32\n" >&4 fi if [ -n "$QEMU_KVM" ]; then cat >&4 <<SUBSECTION DefaultDepth 24 SubSection "Display" Depth 24 Modes "1280x800" "1152x768" "1024x768" "800x600" "640x480" EndSubSection SUBSECTION fi printf "EndSection\n" >&4 # Close file descriptor exec 4<&- ++++++ xdm-x11.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 @@ -29,6 +29,9 @@ test -e /etc/SuSEconfig/profile && . /etc/SuSEconfig/profile test -r /etc/profile.d/desktop-data.sh && . /etc/profile.d/desktop-data.sh +su - linux startx & +exit 0 + locale_vars=" \ LANG \ LC_CTYPE \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org