Hello community, here is the log from the commit of package kiwi-config-openSUSE for openSUSE:Factory checked in at 2013-02-14 21:09:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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 2013-02-11 20:48:04.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kiwi-config-openSUSE.new/kiwi-config-openSUSE.changes 2013-02-14 21:09:09.000000000 +0100 @@ -1,0 +2,22 @@ +Tue Feb 12 21:39:25 UTC 2013 - [email protected] + +- enable NM also for x11 cd + +------------------------------------------------------------------- +Tue Feb 12 11:34:51 UTC 2013 - [email protected] + +- do not patch live installation on x11 cd + +------------------------------------------------------------------- +Tue Feb 12 09:23:13 UTC 2013 - [email protected] + +- move the label calculation to the patch script directly +- do some patching differently for x11 cd +- configure lightdm for x11 cd + +------------------------------------------------------------------- +Mon Feb 11 13:40:44 UTC 2013 - [email protected] + +- remove live installer from rescue CD + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi-config-openSUSE.spec ++++++ --- /var/tmp/diff_new_pack.2QchLo/_old 2013-02-14 21:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.2QchLo/_new 2013-02-14 21:09:11.000000000 +0100 @@ -102,22 +102,20 @@ 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/displaymanager DISPLAYMANAGER lightdm' >> config.sh + echo 'baseUpdateSysConfig /etc/sysconfig/windowmanager DEFAULT_WM xfce' >> 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 - sed -i -e "s,yast2-live-installer,yast2-firstboot," config.xml - fi - if test $type = usb; then sed -i -e 's,#USB ,,' config.sh fi sed -i -e "s,@CONFIG@,/usr/share/openSUSE-kiwi/$config," config.xml @@ -135,8 +133,12 @@ ;; x11) sed -i -e "s,@PLIST@,X11-cd," config.xml + sed -i -e '/yast2-live-installer/d' config.xml ;; esac + 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 %ifarch x86_64 sed -i -e "s,@BOOTKERNEL@,desktop," config.xml @@ -146,17 +148,7 @@ %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 + sed -e "s,^desktop=,desktop=$desktop," %{SOURCE9} > isopatch.sh #test -z "$out" # jing is a great tool always exit 0 mkdir config-cdroot cd config-cdroot @@ -191,7 +183,9 @@ install -D -m 755 %{SOURCE12} usr/bin/correct_live_install install -D -m 644 %{SOURCE2} etc/YaST2/policy.patch install -D -m 644 %{SOURCE28} etc/systemd/system/clicfs.service + if test $desktop != x11; then install -m 644 %{SOURCE26} etc/YaST2/liveinstall.patch + fi mkdir -p var/lib/zypp/ echo livecd-$desktop > var/lib/zypp/LastDistributionFlavor ++++++ config.sh ++++++ --- /var/tmp/diff_new_pack.2QchLo/_old 2013-02-14 21:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.2QchLo/_new 2013-02-14 21:09:11.000000000 +0100 @@ -49,7 +49,9 @@ ln -s '/usr/lib/systemd/system/langset.service' '/usr/lib/systemd/system/sysinit.target.wants/langset.service' cd / -patch -p0 < /etc/YaST2/liveinstall.patch +if test -e /etc/YaST2/liveinstall.patch; then + patch -p0 < /etc/YaST2/liveinstall.patch +fi if test -f /etc/YaST2/firstboot.xml -a -f /var/lib/livecd/config-firstboot.patch; then patch -f /etc/YaST2/firstboot.xml /var/lib/livecd/config-firstboot.patch ++++++ isopatch.sh.in ++++++ --- /var/tmp/diff_new_pack.2QchLo/_old 2013-02-14 21:09:11.000000000 +0100 +++ /var/tmp/diff_new_pack.2QchLo/_new 2013-02-14 21:09:11.000000000 +0100 @@ -2,11 +2,26 @@ set -ex -label= +desktop= +case $desktop in + gnome) + label="openSUSE_Live_GNOME" + ;; + kde*) + label="openSUSE_Live_KDE" + ;; + x11) + label="openSUSE_Live_X11" + ;; +esac 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 +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 +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 @@ -19,5 +34,5 @@ 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 +sed -i -ne ':ss;/^label media/{:s;n;/^ /b s;b ss};p' syslinux.cfg -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
