Hello community, here is the log from the commit of package kiwi checked in at Wed Nov 28 23:59:20 CET 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-11-27 18:58:38.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-11-28 23:58:50.093216000 +0100 @@ -1,0 +2,12 @@ +Wed Nov 28 11:51:35 CET 2007 - ms@suse.de + +- v1.98 +- fixed console redirect while booting into the system +- fixed oemboot descriptions, atftp is not required (#344546) + +------------------------------------------------------------------- +Wed Nov 28 10:45:36 CET 2007 - ms@suse.de + +- fixed build, tested with mbuild + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.I10041/_old 2007-11-28 23:58:59.000000000 +0100 +++ /var/tmp/diff_new_pack.I10041/_new 2007-11-28 23:58:59.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.97) +# spec file for package kiwi (Version 1.98) # # 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: 1.97 +Version: 1.98 Release: 1 Group: System/Management License: GPL v2 or later @@ -354,6 +354,12 @@ %{_datadir}/kiwi/image/oemboot/suse* %changelog +* Wed Nov 28 2007 - ms@suse.de +- v1.98 +- fixed console redirect while booting into the system +- fixed oemboot descriptions, atftp is not required (#344546) +* Wed Nov 28 2007 - ms@suse.de +- fixed build, tested with mbuild * Tue Nov 27 2007 - ms@suse.de - v1.97 - fixed package query call for older smart versions ++++++ 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-11-27 16:19:09.000000000 +0100 +++ new/kiwi/kiwi.pl 2007-11-28 11:44:12.000000000 +0100 @@ -39,7 +39,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.97"; +our $Version = "1.98"; 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/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-11-27 16:28:59.000000000 +0100 +++ new/kiwi/.revision 2007-11-28 12:39:08.000000000 +0100 @@ -1 +1 @@ -843 \ No newline at end of file +847 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-linuxrc new/kiwi/system/boot/isoboot/suse-linuxrc --- old/kiwi/system/boot/isoboot/suse-linuxrc 2007-11-20 15:19:40.000000000 +0100 +++ new/kiwi/system/boot/isoboot/suse-linuxrc 2007-11-28 11:41:47.000000000 +0100 @@ -307,7 +307,7 @@ # 20) call preinit phase #-------------------------------------- Echo "Calling preinit phase..." -cd /mnt && exec < dev/console >dev/console 2>&1 +cd /mnt /mnt/sbin/pivot_root . mnt >/dev/null 2>&1 if test $? != 0;then PIVOT=false @@ -332,7 +332,9 @@ export IFS=$IFS_ORIG mount -n -o remount,rw / &>/dev/null if [ $PIVOT = "true" ];then + exec < dev/console >dev/console 2>&1 exec umount -n -l /mnt else + exec < dev/console >dev/console 2>&1 exec chroot . /sbin/init $@ fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/.md5 new/kiwi/system/boot/.md5 --- old/kiwi/system/boot/.md5 2007-11-21 14:46:11.000000000 +0100 +++ new/kiwi/system/boot/.md5 2007-11-28 10:06:00.000000000 +0100 @@ -3,7 +3,8 @@ for dir in `find -type d`;do if [ -f $dir/config.xml ];then pushd $dir &>/dev/null - find -L -type f | grep -v .svn | xargs md5sum > .checksum.md5 + find -L -type f | grep -v .svn | grep -v .checksum.md5 |\ + xargs md5sum > .checksum.md5 popd &>/dev/null fi done 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-11-26 18:23:01.000000000 +0100 +++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-11-28 11:42:30.000000000 +0100 @@ -787,7 +787,7 @@ # 27) call preinit phase #-------------------------------------- Echo "Calling preinit phase..." -cd /mnt && exec < dev/console >dev/console 2>&1 +cd /mnt /mnt/sbin/pivot_root . mnt >/dev/null 2>&1 if test $? != 0;then PIVOT=false @@ -821,7 +821,9 @@ export IFS=$IFS_ORIG mount -n -o remount,rw / 2>/dev/null if [ $PIVOT = "true" ];then + exec < dev/console >dev/console 2>&1 exec umount -n -l /mnt else + exec < dev/console >dev/console 2>&1 exec chroot . /sbin/init $@ fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-linuxrc new/kiwi/system/boot/oemboot/suse-linuxrc --- old/kiwi/system/boot/oemboot/suse-linuxrc 2007-11-26 10:36:02.000000000 +0100 +++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-11-28 11:42:59.000000000 +0100 @@ -609,7 +609,7 @@ # 21) call preinit phase #-------------------------------------- Echo "Calling preinit phase..." -cd /mnt && exec < dev/console >dev/console 2>&1 +cd /mnt /mnt/sbin/pivot_root . mnt >/dev/null 2>&1 if test $? != 0;then PIVOT=false @@ -634,8 +634,10 @@ export IFS=$IFS_ORIG mount -n -o remount,rw / 2>/dev/null if [ $PIVOT = "true" ];then + exec < dev/console >dev/console 2>&1 exec umount -n -l /mnt else + exec < dev/console >dev/console 2>&1 exec chroot . /sbin/init $@ fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml 2007-11-16 16:08:09.000000000 +0100 +++ new/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml 2007-11-28 11:48:41.000000000 +0100 @@ -48,12 +48,8 @@ <repository type="yast2" status="replaceable"> <source path="ftp://dist.suse.de/install/SLP/SLED-10-SP1-GM/%arch/DVD1"/> </repository> - <repository type="rpm-dir"> - <source path="/usr/share/kiwi/image/netboot/suse-repo/suse-sles-repo"/> - </repository> <packages type="image"> <package name="psmisc"/> - <package name="atftp"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="dhcpcd"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml --- old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml 2007-11-16 16:08:08.000000000 +0100 +++ new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml 2007-11-28 11:48:54.000000000 +0100 @@ -48,12 +48,8 @@ <repository type="yast2" status="replaceable"> <source path="ftp://dist.suse.de/install/SLP/SLED-10-SP1-GM/%arch/DVD1"/> </repository> - <repository type="rpm-dir"> - <source path="/usr/share/kiwi/image/netboot/suse-repo/suse-sles-repo"/> - </repository> <packages type="image"> <package name="psmisc"/> - <package name="atftp"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="dhcpcd"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1/config.xml new/kiwi/system/boot/oemboot/suse-SLES10-SP1/config.xml --- old/kiwi/system/boot/oemboot/suse-SLES10-SP1/config.xml 2007-11-16 16:08:09.000000000 +0100 +++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1/config.xml 2007-11-28 11:49:12.000000000 +0100 @@ -48,12 +48,8 @@ <repository type="yast2" status="replaceable"> <source path="ftp://dist.suse.de/install/SLP/SLES-10-SP1-GM/%arch/DVD1"/> </repository> - <repository type="rpm-dir"> - <source path="/usr/share/kiwi/image/netboot/suse-repo/suse-sles-repo"/> - </repository> <packages type="image"> <package name="psmisc"/> - <package name="atftp"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="dhcpcd"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config.xml new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config.xml --- old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config.xml 2007-11-16 16:08:07.000000000 +0100 +++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config.xml 2007-11-28 11:49:22.000000000 +0100 @@ -48,12 +48,8 @@ <repository type="yast2" status="replaceable"> <source path="ftp://dist.suse.de/install/SLP/SLES-10-SP1-GM/%arch/DVD1"/> </repository> - <repository type="rpm-dir"> - <source path="/usr/share/kiwi/image/netboot/suse-repo/suse-sles-repo"/> - </repository> <packages type="image"> <package name="psmisc"/> - <package name="atftp"/> <package name="bind-libs"/> <package name="bind-utils"/> <package name="dhcpcd"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-linuxrc new/kiwi/system/boot/usbboot/suse-linuxrc --- old/kiwi/system/boot/usbboot/suse-linuxrc 2007-11-20 15:19:39.000000000 +0100 +++ new/kiwi/system/boot/usbboot/suse-linuxrc 2007-11-28 11:43:15.000000000 +0100 @@ -187,7 +187,7 @@ # 18) call preinit phase #-------------------------------------- Echo "Calling preinit phase..." -cd /mnt && exec < dev/console >dev/console 2>&1 +cd /mnt /mnt/sbin/pivot_root . mnt >/dev/null 2>&1 if test $? != 0;then PIVOT=false @@ -212,7 +212,9 @@ export IFS=$IFS_ORIG mount -n -o remount,rw / &>/dev/null if [ $PIVOT = "true" ];then + exec < dev/console >dev/console 2>&1 exec umount -n -l /mnt else + exec < dev/console >dev/console 2>&1 exec chroot . /sbin/init $@ fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-linuxrc new/kiwi/system/boot/vmxboot/suse-linuxrc --- old/kiwi/system/boot/vmxboot/suse-linuxrc 2007-11-20 15:19:40.000000000 +0100 +++ new/kiwi/system/boot/vmxboot/suse-linuxrc 2007-11-28 11:43:31.000000000 +0100 @@ -227,7 +227,7 @@ # 18) call preinit phase #-------------------------------------- Echo "Calling preinit phase..." -cd /mnt && exec < dev/console >dev/console 2>&1 +cd /mnt /mnt/sbin/pivot_root . mnt >/dev/null 2>&1 if test $? != 0;then PIVOT=false @@ -252,7 +252,9 @@ export IFS=$IFS_ORIG mount -n -o remount,rw / 2>/dev/null if [ $PIVOT = "true" ];then + exec < dev/console >dev/console 2>&1 exec umount -n -l /mnt else + exec < dev/console >dev/console 2>&1 exec chroot . /sbin/init $@ fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-linuxrc new/kiwi/system/boot/xenboot/suse-linuxrc --- old/kiwi/system/boot/xenboot/suse-linuxrc 2007-11-20 15:19:41.000000000 +0100 +++ new/kiwi/system/boot/xenboot/suse-linuxrc 2007-11-28 11:43:44.000000000 +0100 @@ -141,7 +141,7 @@ # 15) call preinit phase #-------------------------------------- Echo "Calling preinit phase..." -cd /mnt && exec < dev/console >dev/console 2>&1 +cd /mnt /mnt/sbin/pivot_root . mnt >/dev/null 2>&1 if test $? != 0;then PIVOT=false @@ -166,7 +166,9 @@ export IFS=$IFS_ORIG mount -n -o remount,rw / &>/dev/null if [ $PIVOT = "true" ];then + exec < dev/console >dev/console 2>&1 exec umount -n -l /mnt else + exec < dev/console >dev/console 2>&1 exec chroot . /sbin/init $@ fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 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