Hello community, here is the log from the commit of package kiwi for openSUSE:12.3 checked in at 2013-02-13 17:27:55 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:12.3/kiwi (Old) and /work/SRC/openSUSE:12.3/.kiwi.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Package is "kiwi", Maintainer is "ms@suse.com" Changes: -------- --- /work/SRC/openSUSE:12.3/kiwi/kiwi.changes 2013-02-08 23:39:34.000000000 +0100 +++ /work/SRC/openSUSE:12.3/.kiwi.new/kiwi.changes 2013-02-13 17:28:03.000000000 +0100 @@ -1,0 +2,48 @@ +Wed Feb 13 15:40:07 CET 2013 - ms@suse.de + +- v5.04.44 released + +------------------------------------------------------------------- +Wed Feb 13 15:36:28 CET 2013 - ms@suse.de + +- don't trigger udev device creation in pre-init. All devices + are already there due to the initial start of udev. This + could cause a hangup on first boot of the appliance + +------------------------------------------------------------------- +Tue Feb 12 17:18:46 CET 2013 - ms@suse.de + +- v5.04.43 released + +------------------------------------------------------------------- +Tue Feb 12 17:17:26 CET 2013 - ms@suse.de + +- don't rely on boot.device-mapper init script, load + device mapper module manually when needed + +------------------------------------------------------------------- +Tue Feb 12 15:55:53 CET 2013 - ms@suse.de + +- fixed start/stop of udev in pre-init. while using sysV init + it was possible to run a startup script without a running + init process. With systemd you cannot really run a service + when systemd does not run + +------------------------------------------------------------------- +Tue Feb 12 15:31:05 CET 2013 - ms@suse.de + +- fixed corrupted fbiterm fonts for openSUSE 12.3 (bnc #803276) + +------------------------------------------------------------------- +Tue Feb 12 14:28:23 CET 2013 - ms@suse.de + +- use global variable kernel_cmdline to store paramters + passed to the linuxrc/init script and don't hand them + over via sub-functions + +------------------------------------------------------------------- +Tue Feb 12 11:18:41 CET 2013 - ms@suse.de + +- suppress cpio blocks message to stderr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.l97eba/_old 2013-02-13 17:28:05.000000000 +0100 +++ /var/tmp/diff_new_pack.l97eba/_new 2013-02-13 17:28:05.000000000 +0100 @@ -26,7 +26,7 @@ Summary: openSUSE - KIWI Image System License: GPL-2.0 Group: System/Management -Version: 5.04.42 +Version: 5.04.44 Release: 0 # requirements to build packages BuildRequires: e2fsprogs ++++++ kiwi-docu.tar.bz2 ++++++ /work/SRC/openSUSE:12.3/kiwi/kiwi-docu.tar.bz2 /work/SRC/openSUSE:12.3/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2013-02-07 08:55:37.000000000 +0100 +++ new/kiwi/.revision 2013-02-07 08:55:37.000000000 +0100 @@ -1 +1 @@ -2ef96b582de94502fbdbce3eef6169a71cf0b6a0 +d8b03a59d1b1f49f9dc6f848d1823b7dca504d69 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2013-02-08 16:19:59.000000000 +0100 +++ new/kiwi/modules/KIWIBoot.pm 2013-02-13 15:41:25.000000000 +0100 @@ -3290,12 +3290,12 @@ if ($zipped) { $test = $unzip; } - $status = qxx ("$test | cpio -it | grep -q lib/grub2-efi 2>&1"); + $status = qxx ("$test | cpio -it --quiet | grep -q lib/grub2-efi 2>&1"); $result = $? >> 8; if ($result != 0) { $grub = 'grub2'; } - $status = qxx ("$test | cpio -it | grep -q lib64/efi 2>&1"); + $status = qxx ("$test | cpio -it --quiet | grep -q lib64/efi 2>&1"); $result = $? >> 8; if ($result == 0) { $lib = 'lib64'; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2013-02-08 16:19:59.000000000 +0100 +++ new/kiwi/modules/KIWIGlobals.pm 2013-02-13 15:41:25.000000000 +0100 @@ -927,7 +927,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "5.04.42"; + $data{Version} = "5.04.44"; $data{Publisher} = "SUSE LINUX GmbH"; $data{Preparer} = "KIWI - http://opensuse.github.com/kiwi"; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2013-02-08 16:19:54.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2013-02-13 15:41:25.000000000 +0100 @@ -586,15 +586,14 @@ #-------------------------------------- function udevSystemStart { # /.../ - # start udev while in pre-init phase. This means we can - # run udev from the standard runlevel script + # start udev while in pre-init phase. # ---- - if [ -e /etc/init.d/boot.udev ];then - /etc/init.d/boot.udev start - elif which systemctl &>/dev/null;then - systemctl start udev.service + if [ -x /sbin/udevd ];then + /sbin/udevd --daemon + else + /lib/udev/udevd --daemon fi - echo + UDEVD_PID=$(pidof -s /sbin/udevd) } #====================================== # udevSystemStop @@ -603,12 +602,9 @@ # /.../ # stop udev while in pre-init phase. # ---- - if [ -e /etc/init.d/boot.udev ];then - /etc/init.d/boot.udev stop - elif which systemctl &>/dev/null;then - systemctl stop udev.service + if kill -0 $UDEVD_PID &>/dev/null;then + kill $UDEVD_PID fi - echo } #====================================== # udevStart @@ -1139,9 +1135,7 @@ mount -t sysfs sysfs /sys umountSys=1 fi - if [ -f /etc/init.d/boot.device-mapper ];then - /etc/init.d/boot.device-mapper start - fi + modprobe dm-mod &>/dev/null updateModuleDependencies if grep -qi param_B $mkinitrdExec;then params="-B" @@ -1182,9 +1176,7 @@ cp /boot/$kernel /boot/boot/ cp /boot/$initrd /boot/boot/ fi - if [ -f /etc/init.d/boot.device-mapper ];then - /etc/init.d/boot.device-mapper stop - fi + rmmod dm-mod &>/dev/null if [ $umountSys -eq 1 ];then umount /sys fi @@ -6678,7 +6670,7 @@ # boot into the operating system # ---- local reboot=no - local option=$@ + local option=${kernel_cmdline[@]} #====================================== # check for init kernel option #-------------------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc --- old/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/armv7l/oemboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -41,6 +41,11 @@ export OEM_PARTITION_CONFIG="/config.oempartition" #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions... #-------------------------------------- . /include @@ -675,4 +680,4 @@ #====================================== # 27 Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -33,6 +33,11 @@ export LOCAL_BOOT="no" #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions... #-------------------------------------- . /include @@ -302,4 +307,4 @@ #====================================== # 21) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage Files old/kiwi/system/boot/ix86/isoboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz and new/kiwi/system/boot/ix86/isoboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz differ Files old/kiwi/system/boot/ix86/isoboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz and new/kiwi/system/boot/ix86/isoboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-linuxrc new/kiwi/system/boot/ix86/isoboot/suse-linuxrc --- old/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -33,6 +33,11 @@ export LOCAL_BOOT="no" #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions... #-------------------------------------- . /include @@ -300,4 +305,4 @@ #====================================== # 21) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage Files old/kiwi/system/boot/ix86/netboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz and new/kiwi/system/boot/ix86/netboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz differ Files old/kiwi/system/boot/ix86/netboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz and new/kiwi/system/boot/ix86/netboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2013-02-08 16:19:55.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -56,6 +56,11 @@ export kiwi_hybridpersistent=yes #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions #-------------------------------------- . /include @@ -1076,4 +1081,4 @@ #====================================== # 32) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/rhel-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -41,6 +41,11 @@ export OEM_PARTITION_CONFIG="/config.oempartition" #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions... #-------------------------------------- . /include @@ -675,4 +680,4 @@ #====================================== # 27 Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage Files old/kiwi/system/boot/ix86/oemboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz and new/kiwi/system/boot/ix86/oemboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz differ Files old/kiwi/system/boot/ix86/oemboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz and new/kiwi/system/boot/ix86/oemboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -41,6 +41,11 @@ export OEM_PARTITION_CONFIG="/config.oempartition" #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions... #-------------------------------------- . /include @@ -675,4 +680,4 @@ #====================================== # 27 Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -59,6 +59,11 @@ export SYSTEM_MD5STATUS #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions #-------------------------------------- . /include @@ -294,4 +299,4 @@ #====================================== # 23) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage Files old/kiwi/system/boot/ix86/vmxboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz and new/kiwi/system/boot/ix86/vmxboot/suse-12.3/root/usr/share/fbiterm/fonts/8x16.pcf.gz differ Files old/kiwi/system/boot/ix86/vmxboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz and new/kiwi/system/boot/ix86/vmxboot/suse-12.3/root/usr/share/fbiterm/fonts/b16.pcf.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ix86/vmxboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -59,6 +59,11 @@ export SYSTEM_MD5STATUS #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions #-------------------------------------- . /include @@ -294,4 +299,4 @@ #====================================== # 23) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc --- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2013-02-08 16:19:55.000000000 +0100 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -56,6 +56,11 @@ export kiwi_hybridpersistent=yes #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions #-------------------------------------- . /include @@ -1076,4 +1081,4 @@ #====================================== # 32) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-linuxrc new/kiwi/system/boot/ppc/oemboot/suse-linuxrc --- old/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ppc/oemboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -41,6 +41,11 @@ export OEM_PARTITION_CONFIG="/config.oempartition" #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions... #-------------------------------------- . /include @@ -675,4 +680,4 @@ #====================================== # 27 Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc --- old/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/ppc/vmxboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -59,6 +59,11 @@ export SYSTEM_MD5STATUS #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions #-------------------------------------- . /include @@ -295,4 +300,4 @@ #====================================== # 23) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc --- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2013-02-08 16:19:55.000000000 +0100 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -55,6 +55,11 @@ export kiwi_hybridpersistent=yes #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions #-------------------------------------- . /include @@ -1084,4 +1089,4 @@ #====================================== # 31) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc --- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -41,6 +41,11 @@ export OEM_PARTITION_CONFIG="/config.oempartition" #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions... #-------------------------------------- . /include @@ -679,4 +684,4 @@ #====================================== # 27 Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-linuxrc new/kiwi/system/boot/s390/vmxboot/suse-linuxrc --- old/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2013-02-06 22:22:37.000000000 +0100 +++ new/kiwi/system/boot/s390/vmxboot/suse-linuxrc 2013-02-13 15:41:25.000000000 +0100 @@ -59,6 +59,11 @@ export SYSTEM_MD5STATUS #====================================== +# Exports kernel options +#-------------------------------------- +export kernel_cmdline=($@) + +#====================================== # Functions #-------------------------------------- . /include @@ -298,4 +303,4 @@ #====================================== # 23) Unmount initrd / system init #-------------------------------------- -bootImage $@ +bootImage -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de