Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-02-07 10:26:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kiwi-config-openSUSE (Old) and /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi-config-openSUSE", Maintainer is "[email protected]" Changes: -------- --- /work/SRC/openSUSE:Factory/kiwi-config-openSUSE/kiwi-config-openSUSE.changes 2012-12-19 11:03:09.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-02-07 10:26:13.000000000 +0100 @@ -1,0 +2,31 @@ +Mon Feb 4 15:19:55 UTC 2013 - [email protected] + +- patch the isolinux.cfg within kiwi image + +------------------------------------------------------------------- +Sat Feb 2 18:33:10 UTC 2013 - [email protected] + +- systemd is in /usr + +------------------------------------------------------------------- +Thu Jan 31 15:58:29 UTC 2013 - [email protected] + +- Adopted to enable/disable NetworkManager.service on 12.3 instead + of setting the NETWORKMANAGER=yes/no variable (bnc#800817). + +------------------------------------------------------------------- +Thu Jan 31 15:38:45 UTC 2013 - [email protected] + +- change distribution repos + +------------------------------------------------------------------- +Thu Jan 31 10:27:08 UTC 2013 - [email protected] + +- bump version to 12.3 + +------------------------------------------------------------------- +Fri Jan 25 11:48:11 UTC 2013 - [email protected] + +- use X11-cd package list for x11 rescue + +------------------------------------------------------------------- New: ---- isopatch.sh.in ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.OWtenE/_old 2013-02-07 10:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.OWtenE/_new 2013-02-07 10:26:18.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package kiwi-config-openSUSE # -# Copyright (c) 2012 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -35,7 +35,7 @@ Summary: KDE live CD License: BSD-3-Clause Group: System/Boot -Version: 12.2 +Version: 12.3 Release: 0 BuildRoot: %{_tmppath}/%{name}-%{version}-build Source1: COPYING @@ -43,6 +43,7 @@ Source3: config.sh Source4: config.xml.in Source8: ifcfg-eth0 +Source9: isopatch.sh.in Source10: README Source11: correct_live_for_reboot Source12: correct_live_install @@ -71,7 +72,7 @@ patch -p0 < %{SOURCE26} %build -kiwiversion=12.2 +kiwiversion=12.3 BASEDIR=$PWD localedir=`mktemp -d` OUTPUTDIR=$localedir/ /usr/lib/YaST2/bin/y2base %{SOURCE22} UI @@ -101,15 +102,16 @@ echo 'baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER gdm' >> config.sh echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM gnome' >> config.sh fi - if test $desktop = x11; then - echo 'baseUpdateSysConfig /etc/sysconfig/network/config NETWORKMANAGER no' >> config.sh - else - echo 'baseUpdateSysConfig /etc/sysconfig/network/config NETWORKMANAGER yes' >> config.sh - fi if test $type = usb; then echo 'baseUpdateSysConfig /etc/sysconfig/clock TIMEZONE UTC' >> config.sh fi + if test $desktop = x11; then + echo '/usr/bin/systemctl disable NetworkManager.service || true' >> config.sh + else + echo '/usr/bin/systemctl -f enable NetworkManager.service' >> config.sh + fi + grep -v " type:$othertype " %{SOURCE4} | \ xmllint --format - > config.xml if test $type = usb; then @@ -121,17 +123,35 @@ sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml sed -i -e "s,@VERSION@,$kiwiversion," config.xml sed -i -e "s,@FLAVOR@,$config," config.xml - if test $desktop = gnome; then + case $desktop in + gnome) sed -i -e "s,@PLIST@,GNOME-cd," config.xml - else + ;; + kde) sed -i -e "s,@PLIST@,KDE-cd," config.xml - fi + ;; + x11) + sed -i -e "s,@PLIST@,X11-cd," config.xml + ;; + esac %ifarch x86_64 sed -i -e "s,@BOOTKERNEL@,desktop," config.xml %else sed -i -e "s,@BOOTKERNEL@,std," config.xml %endif jing /usr/share/kiwi/modules/KIWISchema.rng config.xml + + case $desktop in + gnome) + sed -e 's,^label=,label="openSUSE_Live_GNOME"', %{SOURCE9} > isopatch.sh + ;; + kde*) + sed -e 's,^label=,label="openSUSE_Live_KDE"', %{SOURCE9} > isopatch.sh + ;; + x11) + sed -e 's,^label=,label="openSUSE_Live_X11"', %{SOURCE9} > isopatch.sh + ;; + esac #test -z "$out" # jing is a great tool always exit 0 mkdir config-cdroot cd config-cdroot @@ -163,7 +183,7 @@ install -D -m 644 %{SOURCE8} etc/sysconfig/network/ifcfg-eth0 cp -a $localedir etc/langset install -m 755 %{SOURCE23} etc/langset.sh - install -D -m 755 %{SOURCE16} lib/systemd/system/langset.service + 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 install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch @@ -171,6 +191,7 @@ install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch mkdir -p var/lib/zypp/ echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor + if false; then if test $type != usb; then if test $desktop = kde; then ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.OWtenE/_old 2013-02-07 10:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.OWtenE/_new 2013-02-07 10:26:18.000000000 +0100 @@ -46,7 +46,7 @@ chkconfig cron off ln -s '/etc/systemd/system/clicfs.service' '/etc/systemd/system/multi-user.target.wants/clicfs.service' -ln -s '/lib/systemd/system/langset.service' '/usr/lib/systemd/system/sysinit.target.wants/langset.service' +ln -s '/usr/lib/systemd/system/langset.service' '/usr/lib/systemd/system/sysinit.target.wants/langset.service' cd / patch -p0 < /etc/YaST2/liveinstall.patch @@ -113,7 +113,7 @@ echo '127.0.0.2 linux.site linux' >> /etc/hosts -ln -s /lib/systemd/system/runlevel5.target /etc/systemd/system/default.target +ln -s /usr/lib/systemd/system/runlevel5.target /etc/systemd/system/default.target baseUpdateSysConfig /etc/sysconfig/displaymanager DISPLAYMANAGER_AUTOLOGIN linux baseUpdateSysConfig /etc/sysconfig/keyboard KEYTABLE us.map.gz baseUpdateSysConfig /etc/sysconfig/keyboard YAST_KEYBOARD english-us,pc104 ++++++ config.xml.in ++++++ --- /var/tmp/diff_new_pack.OWtenE/_old 2013-02-07 10:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.OWtenE/_new 2013-02-07 10:26:18.000000000 +0100 @@ -6,8 +6,8 @@ <specification>openSUSE @VERSION@ Live system</specification> </description> <preferences> - <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default" bootkernel="@BOOTKERNEL@" flags="clic" hybrid="true" hybridpersistent="false" image="iso"/> <!-- type:livecd --> - <type boot="oemboot/suse-@VERSION@" filesystem="ext3" image="oem"> <!-- type:usb --> + <type primary="true" boot="isoboot/suse-@VERSION@" bootprofile="default" bootkernel="@BOOTKERNEL@" filesystem="ext4" flags="clic" hybrid="true" hybridpersistent="false" image="iso" editbootconfig="isopatch.sh" firmware="uefi"/> <!-- type:livecd --> + <type boot="oemboot/suse-@VERSION@" filesystem="ext4" image="oem"> <!-- type:usb --> <oemconfig> <!-- type:usb --> <oem-swap>false</oem-swap> <!-- type:usb --> <oem-boot-title>USB</oem-boot-title> <!-- type:usb --> @@ -46,9 +46,9 @@ <package name="openSUSE-release-@FLAVOR@"/> </packages> <repository type="yast2"> - <source path="http://download.opensuse.org/distribution/12.2/repo/oss/"/> + <source path="http://download.opensuse.org/distribution/12.3/repo/oss/"/> </repository> <repository type="rpm-md"> - <source path="http://download.opensuse.org/repositories/openSUSE:/12.2:/Live/standard/"/> + <source path="http://download.opensuse.org/repositories/openSUSE:/12.3:/Live/standard/"/> </repository> </image> ++++++ correct_live_install ++++++ --- /var/tmp/diff_new_pack.OWtenE/_old 2013-02-07 10:26:18.000000000 +0100 +++ /var/tmp/diff_new_pack.OWtenE/_new 2013-02-07 10:26:18.000000000 +0100 @@ -31,7 +31,7 @@ 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 '/lib/systemd/system/langset.service' '/lib/systemd/system/sysinit.target.wants/langset.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 ++++++ #! /bin/sh set -ex label= sed -i -e "s,label openSUSE.*,label $label," boot/*/loader/isolinux.cfg 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 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,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 bootd=$(ls -1d boot/*/loader) cp boot/*/loader/isolinux.cfg syslinux.cfg sed -i -e "s,kernel linux,kernel $bootd/linux," syslinux.cfg sed -i -e "s,initrd=initrd,initrd=$bootd/initrd," syslinux.cfg sed -i -e "s,timeout *200,timeout 5," syslinux.cfg # copyright matz sed -ne ':ss;/^label media/{:s;n;/^ /b s;b ss};p' syslinux.cfg > t && mv t syslinux.cfg -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
