Hello community, here is the log from the commit of package kiwi checked in at Thu Dec 6 16:15:48 CET 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-12-04 18:02:53.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-12-06 11:13:43.093420000 +0100 @@ -1,0 +2,8 @@ +Wed Dec 5 23:57:46 CET 2007 - ms@suse.de + +- v2.01 +- fixed size check and decompression for gz images (#345896) +- call hash -r at the end of cleanInitrd (#346356) +- use killproc to stop udevd (#332678) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.X18522/_old 2007-12-06 16:15:30.000000000 +0100 +++ /var/tmp/diff_new_pack.X18522/_new 2007-12-06 16:15:30.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 2.00) +# spec file for package kiwi (Version 2.01) # # Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine @@ -18,7 +18,7 @@ %endif Requires: perl perl-XML-LibXML perl-libwww-perl screen coreutils Summary: OpenSuSE - KIWI Image System -Version: 2.00 +Version: 2.01 Release: 1 Group: System/Management License: GPL v2 or later @@ -359,6 +359,11 @@ %{_datadir}/kiwi/image/oemboot/suse* %changelog +* Wed Dec 05 2007 - ms@suse.de +- v2.01 +- fixed size check and decompression for gz images (#345896) +- call hash -r at the end of cleanInitrd (#346356) +- use killproc to stop udevd (#332678) * Fri Nov 30 2007 - ms@suse.de - v2.00 - fixed netboot atftp download, patch by ++++++ kiwi.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2007-12-04 17:52:38.000000000 +0100 +++ new/kiwi/kiwi.pl 2007-12-06 11:04:47.000000000 +0100 @@ -41,7 +41,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "2.00"; +our $Version = "2.01"; our $openSUSE = "http://download.opensuse.org/repositories/"; our $ConfigFile = "$ENV{'HOME'}/.kiwirc"; our $ConfigStatus = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIConfig.sh new/kiwi/modules/KIWIConfig.sh --- old/kiwi/modules/KIWIConfig.sh 2007-11-29 15:20:31.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2007-12-06 11:04:45.000000000 +0100 @@ -425,7 +425,7 @@ blockdev posbios ping killall killall5 udevcontrol udevd udevsettle udevtrigger mknod stat path_id hwup scsi_id scsi_tur usb_id ata_id vol_id edd_id setctsid dumpe2fs debugreiserfs - fuser udevadm blogd showconsole + fuser udevadm blogd showconsole killproc " tools="$tools $@" for path in /sbin /usr/sbin /usr/bin /bin;do 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 2007-12-04 17:52:37.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2007-12-06 11:04:45.000000000 +0100 @@ -292,13 +292,12 @@ /sbin/udevtrigger # 30 sec - just long enough /sbin/udevsettle --timeout=30 - udevPID=`/sbin/pidof udevd` } #====================================== # udevKill #-------------------------------------- function udevKill { - kill $udevPID + killproc /sbin/udevd rm -f /var/log/boot.msg umount -t devpts /mnt/dev/pts mkdir -p /mnt/var/log @@ -1633,28 +1632,6 @@ return 0 } #====================================== -# validateRAM -#-------------------------------------- -function validateRAM { - # /.../ - # check if the image fits into the ramdisk. - # An information about the sizes is printed out - # ---- - needRAM=`expr $blocks \* $blocksize` - needRAM=`expr $needRAM / 1024` - needRAM=`expr $needRAM + 128` - needMByte=`expr $needRAM / 1024` - hasRAM=`cat /proc/meminfo | grep MemFree | cut -f2 -d:` - hasRAM=`echo $hasRAM | cut -f1 -d" "` - hasMByte=`expr $hasRAM / 1024` - Echo "Have size: $imageDevice -> $hasRAM KBytes [ $hasMByte MB ]" - Echo "Need size: $needRAM KBytes [ $needMByte MB ]" - if test $hasRAM -gt $needRAM;then - return 0 - fi - return 1 -} -#====================================== # includeKernelParameters #-------------------------------------- function includeKernelParameters { @@ -1852,6 +1829,7 @@ function cleanInitrd { cp /usr/bin/chroot /bin cp /usr/sbin/klogconsole /bin + cp /sbin/killproc /bin cp /sbin/halt /bin/reboot for dir in /*;do case "$dir" in @@ -1874,6 +1852,7 @@ fi # mount opens fstab so we give them one touch /etc/fstab + hash -r } #====================================== # searchAlternativeConfig diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-12-04 18:01:51.000000000 +0100 +++ new/kiwi/.revision 2007-12-06 11:13:33.000000000 +0100 @@ -1 +1 @@ -866 \ No newline at end of file +868 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp --- old/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp 2007-09-20 17:37:42.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-smp/config/kernel-smp 2007-12-06 11:04:44.000000000 +0100 @@ -1,18 +1,29 @@ #!/bin/sh test -f /.profile && . /.profile -echo "kernel-smp: Image [$name]..." +sname=`basename $0` +bname=`echo $sname | cut -f2 -d-` +echo "$sname: Image [$name]..." #========================================== # setup kernel version to deal with #------------------------------------------ -VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-smp kernel-smp` +VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-$bname $sname` +if [ ! -d lib/modules/$VERSION ];then + for VERSION in $(ls -1 lib/modules);do :; done +fi #========================================== # move interesting stuff to /tmp #------------------------------------------ -mv lib/modules/$VERSION/kernel/* /tmp -mv lib/modules/$VERSION/modules.* /tmp +if [ -d lib/modules/$VERSION/updates ];then + mv lib/modules/$VERSION/updates /tmp +fi +if [ -d lib/modules/$VERSION/weak-updates ];then + mv lib/modules/$VERSION/weak-updates /tmp +fi +mv lib/modules/$VERSION/kernel/* /tmp +mv lib/modules/$VERSION/modules.* /tmp #========================================== # remove unneeded stuff @@ -23,6 +34,12 @@ # insert modules.* files #------------------------------------------ mv /tmp/modules.* /lib/modules/$VERSION/ +if [ -d /tmp/updates ];then + mv /tmp/updates /lib/modules/$VERSION/ +fi +if [ -d /tmp/weak-updates ];then + mv /tmp/weak-updates /lib/modules/$VERSION/ +fi #========================================== # create driver-used dirs with .o's to use @@ -120,7 +137,7 @@ #========================================== # create common kernel files... #------------------------------------------ -cd /boot +cd /boot mv vmlinux-$VERSION.gz vmlinux.gz mv vmlinuz-$VERSION vmlinuz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp --- old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-09-20 17:37:42.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-12-06 11:04:44.000000000 +0100 @@ -1,18 +1,29 @@ #!/bin/sh test -f /.profile && . /.profile -echo "kernel-smp: Image [$name]..." +sname=`basename $0` +bname=`echo $sname | cut -f2 -d-` +echo "$sname: Image [$name]..." #========================================== # setup kernel version to deal with #------------------------------------------ -VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-smp kernel-smp` +VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-$bname $sname` +if [ ! -d lib/modules/$VERSION ];then + for VERSION in $(ls -1 lib/modules);do :; done +fi #========================================== # move interesting stuff to /tmp #------------------------------------------ -mv lib/modules/$VERSION/kernel/* /tmp -mv lib/modules/$VERSION/modules.* /tmp +if [ -d lib/modules/$VERSION/updates ];then + mv lib/modules/$VERSION/updates /tmp +fi +if [ -d lib/modules/$VERSION/weak-updates ];then + mv lib/modules/$VERSION/weak-updates /tmp +fi +mv lib/modules/$VERSION/kernel/* /tmp +mv lib/modules/$VERSION/modules.* /tmp #========================================== # remove unneeded stuff @@ -23,6 +34,12 @@ # insert modules.* files #------------------------------------------ mv /tmp/modules.* /lib/modules/$VERSION/ +if [ -d /tmp/updates ];then + mv /tmp/updates /lib/modules/$VERSION/ +fi +if [ -d /tmp/weak-updates ];then + mv /tmp/weak-updates /lib/modules/$VERSION/ +fi #========================================== # create driver-used dirs with .o's to use @@ -120,7 +137,7 @@ #========================================== # create common kernel files... #------------------------------------------ -cd /boot +cd /boot mv vmlinux-$VERSION.gz vmlinux.gz mv vmlinuz-$VERSION vmlinuz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp --- old/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp 2007-09-20 17:37:39.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-smp/config/kernel-smp 2007-12-06 11:04:43.000000000 +0100 @@ -1,18 +1,29 @@ #!/bin/sh test -f /.profile && . /.profile -echo "kernel-smp: Image [$name]..." +sname=`basename $0` +bname=`echo $sname | cut -f2 -d-` +echo "$sname: Image [$name]..." #========================================== # setup kernel version to deal with #------------------------------------------ -VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-smp kernel-smp` +VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-$bname $sname` +if [ ! -d lib/modules/$VERSION ];then + for VERSION in $(ls -1 lib/modules);do :; done +fi #========================================== # move interesting stuff to /tmp #------------------------------------------ -mv lib/modules/$VERSION/kernel/* /tmp -mv lib/modules/$VERSION/modules.* /tmp +if [ -d lib/modules/$VERSION/updates ];then + mv lib/modules/$VERSION/updates /tmp +fi +if [ -d lib/modules/$VERSION/weak-updates ];then + mv lib/modules/$VERSION/weak-updates /tmp +fi +mv lib/modules/$VERSION/kernel/* /tmp +mv lib/modules/$VERSION/modules.* /tmp #========================================== # remove unneeded stuff @@ -23,6 +34,12 @@ # insert modules.* files #------------------------------------------ mv /tmp/modules.* /lib/modules/$VERSION/ +if [ -d /tmp/updates ];then + mv /tmp/updates /lib/modules/$VERSION/ +fi +if [ -d /tmp/weak-updates ];then + mv /tmp/weak-updates /lib/modules/$VERSION/ +fi #========================================== # create driver-used dirs with .o's to use @@ -120,7 +137,7 @@ #========================================== # create common kernel files... #------------------------------------------ -cd /boot +cd /boot mv vmlinux-$VERSION.gz vmlinux.gz mv vmlinuz-$VERSION vmlinuz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp --- old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-09-20 17:37:39.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-12-06 11:04:43.000000000 +0100 @@ -1,18 +1,29 @@ #!/bin/sh test -f /.profile && . /.profile -echo "kernel-smp: Image [$name]..." +sname=`basename $0` +bname=`echo $sname | cut -f2 -d-` +echo "$sname: Image [$name]..." #========================================== # setup kernel version to deal with #------------------------------------------ -VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-smp kernel-smp` +VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-$bname $sname` +if [ ! -d lib/modules/$VERSION ];then + for VERSION in $(ls -1 lib/modules);do :; done +fi #========================================== # move interesting stuff to /tmp #------------------------------------------ -mv lib/modules/$VERSION/kernel/* /tmp -mv lib/modules/$VERSION/modules.* /tmp +if [ -d lib/modules/$VERSION/updates ];then + mv lib/modules/$VERSION/updates /tmp +fi +if [ -d lib/modules/$VERSION/weak-updates ];then + mv lib/modules/$VERSION/weak-updates /tmp +fi +mv lib/modules/$VERSION/kernel/* /tmp +mv lib/modules/$VERSION/modules.* /tmp #========================================== # remove unneeded stuff @@ -23,6 +34,12 @@ # insert modules.* files #------------------------------------------ mv /tmp/modules.* /lib/modules/$VERSION/ +if [ -d /tmp/updates ];then + mv /tmp/updates /lib/modules/$VERSION/ +fi +if [ -d /tmp/weak-updates ];then + mv /tmp/weak-updates /lib/modules/$VERSION/ +fi #========================================== # create driver-used dirs with .o's to use @@ -120,7 +137,7 @@ #========================================== # create common kernel files... #------------------------------------------ -cd /boot +cd /boot mv vmlinux-$VERSION.gz vmlinux.gz mv vmlinuz-$VERSION vmlinuz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-linuxrc new/kiwi/system/boot/netboot/suse-linuxrc --- old/kiwi/system/boot/netboot/suse-linuxrc 2007-12-04 17:52:38.000000000 +0100 +++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-12-06 11:04:42.000000000 +0100 @@ -380,18 +380,10 @@ fi IFS=" " read sum1 blocks blocksize < /etc/image.md5 - if test -z $DISK;then - if ! validateRAM;then - systemException \ - "Not enough RAM available for this image" \ - "reboot" - fi - else - if ! validateSize;then - systemException \ - "Not enough space available for this image" \ - "reboot" - fi + if ! validateSize;then + systemException \ + "Not enough space available for this image" \ + "reboot" fi validateBlockSize # /.../ @@ -401,25 +393,31 @@ if test "$imageZipped" = "compressed"; then Echo "Compressed image found: Disable multicast download" multicast="off" - test ! -p /dev/compressed_image && mkfifo /dev/compressed_image - cat /dev/compressed_image | gzip -d > $imageDevice 2>/dev/null & - imageDevice_orig=$imageDevice + fi + Echo "Loading $imageName [$imageDevice BS:$imageBlkSize Byte]..." + if test "$imageZipped" = "compressed"; then imageName_orig=$imageName - imageDevice="/dev/compressed_image" imageName="$imageName.gz" + atftp \ + --option "multicast $multicast" \ + --option "blksize $imageBlkSize" -g -r $imageName \ + -l /dev/stdout $imageServer 2>/tmp/transfer.errors |\ + gzip -d > $imageDevice 2>>/tmp/transfer.errors + loadCode=$? + loadStatus=`cat /tmp/transfer.errors` + else + loadStatus=`atftp \ + --option "multicast $multicast" \ + --option "blksize $imageBlkSize" \ + -g -r $imageName -l $imageDevice $imageServer 2>&1` + loadCode=$? fi - Echo "Loading $imageName [$imageDevice BS:$imageBlkSize Byte]..." - loadStatus=`atftp \ - --option "multicast $multicast" \ - --option "blksize $imageBlkSize" \ - -g -r $imageName -l $imageDevice $imageServer 2>&1` - if ! loadOK "$loadStatus";then + if test $loadCode != 0 || ! loadOK "$loadStatus";then systemException \ "Download of $imageName failed: atftp output: $loadStatus" \ "reboot" fi if test "$imageZipped" = "compressed"; then - imageDevice=$imageDevice_orig imageName=$imageName_orig fi # /.../ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp --- old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-09-20 17:37:29.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config/kernel-smp 2007-12-06 11:04:42.000000000 +0100 @@ -1,18 +1,29 @@ #!/bin/sh test -f /.profile && . /.profile -echo "kernel-smp: Image [$name]..." +sname=`basename $0` +bname=`echo $sname | cut -f2 -d-` +echo "$sname: Image [$name]..." #========================================== # setup kernel version to deal with #------------------------------------------ -VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-smp kernel-smp` +VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-$bname $sname` +if [ ! -d lib/modules/$VERSION ];then + for VERSION in $(ls -1 lib/modules);do :; done +fi #========================================== # move interesting stuff to /tmp #------------------------------------------ -mv lib/modules/$VERSION/kernel/* /tmp -mv lib/modules/$VERSION/modules.* /tmp +if [ -d lib/modules/$VERSION/updates ];then + mv lib/modules/$VERSION/updates /tmp +fi +if [ -d lib/modules/$VERSION/weak-updates ];then + mv lib/modules/$VERSION/weak-updates /tmp +fi +mv lib/modules/$VERSION/kernel/* /tmp +mv lib/modules/$VERSION/modules.* /tmp #========================================== # remove unneeded stuff @@ -23,6 +34,12 @@ # insert modules.* files #------------------------------------------ mv /tmp/modules.* /lib/modules/$VERSION/ +if [ -d /tmp/updates ];then + mv /tmp/updates /lib/modules/$VERSION/ +fi +if [ -d /tmp/weak-updates ];then + mv /tmp/weak-updates /lib/modules/$VERSION/ +fi #========================================== # create driver-used dirs with .o's to use @@ -120,7 +137,7 @@ #========================================== # create common kernel files... #------------------------------------------ -cd /boot +cd /boot mv vmlinux-$VERSION.gz vmlinux.gz mv vmlinuz-$VERSION vmlinuz diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config/kernel-smp new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config/kernel-smp --- old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-11-02 16:20:42.000000000 +0100 +++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config/kernel-smp 2007-12-06 11:04:41.000000000 +0100 @@ -1,18 +1,29 @@ #!/bin/sh test -f /.profile && . /.profile -echo "kernel-smp: Image [$name]..." +sname=`basename $0` +bname=`echo $sname | cut -f2 -d-` +echo "$sname: Image [$name]..." #========================================== # setup kernel version to deal with #------------------------------------------ -VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-smp kernel-smp` +VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-$bname $sname` +if [ ! -d lib/modules/$VERSION ];then + for VERSION in $(ls -1 lib/modules);do :; done +fi #========================================== # move interesting stuff to /tmp #------------------------------------------ -mv lib/modules/$VERSION/kernel/* /tmp -mv lib/modules/$VERSION/modules.* /tmp +if [ -d lib/modules/$VERSION/updates ];then + mv lib/modules/$VERSION/updates /tmp +fi +if [ -d lib/modules/$VERSION/weak-updates ];then + mv lib/modules/$VERSION/weak-updates /tmp +fi +mv lib/modules/$VERSION/kernel/* /tmp +mv lib/modules/$VERSION/modules.* /tmp #========================================== # remove unneeded stuff @@ -23,6 +34,12 @@ # insert modules.* files #------------------------------------------ mv /tmp/modules.* /lib/modules/$VERSION/ +if [ -d /tmp/updates ];then + mv /tmp/updates /lib/modules/$VERSION/ +fi +if [ -d /tmp/weak-updates ];then + mv /tmp/weak-updates /lib/modules/$VERSION/ +fi #========================================== # create driver-used dirs with .o's to use @@ -120,7 +137,7 @@ #========================================== # create common kernel files... #------------------------------------------ -cd /boot +cd /boot mv vmlinux-$VERSION.gz vmlinux.gz mv vmlinuz-$VERSION vmlinuz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- 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