Hello community, here is the log from the commit of package kiwi checked in at Tue Nov 6 22:29:05 CET 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-11-05 16:51:52.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-11-06 17:46:16.510055000 +0100 @@ -1,0 +2,11 @@ +Tue Nov 6 11:06:33 CET 2007 - ms@suse.de + +- v1.84 +- fixed killing dhcpcd if no system update is required (#339460) +- fixed fstab setup, overwritten due to wrong IO redirection (#339458) +- added /etc/ImagePackages file on initial deployment +- added hwinfo to be part of the usbboot boot images +- added baseSetupInPlaceGITRepository() function +- added integrity check for --force-new-root option + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.pw7901/_old 2007-11-06 22:27:57.000000000 +0100 +++ /var/tmp/diff_new_pack.pw7901/_new 2007-11-06 22:27:57.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.83) +# spec file for package kiwi (Version 1.84) # # 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.83 +Version: 1.84 Release: 1 Group: System/Management License: GPL v2 or later @@ -353,6 +353,14 @@ %doc %{_datadir}/kiwi/image/oemboot/README %{_datadir}/kiwi/image/oemboot/suse* %changelog +* Tue Nov 06 2007 - ms@suse.de +- v1.84 +- fixed killing dhcpcd if no system update is required (#339460) +- fixed fstab setup, overwritten due to wrong IO redirection (#339458) +- added /etc/ImagePackages file on initial deployment +- added hwinfo to be part of the usbboot boot images +- added baseSetupInPlaceGITRepository() function +- added integrity check for --force-new-root option * Mon Nov 05 2007 - ms@suse.de - v1.83 - cleaned KIWILinuxRC.sh code according to shell syntax ++++++ 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-05 16:01:01.000000000 +0100 +++ new/kiwi/kiwi.pl 2007-11-06 17:36:55.000000000 +0100 @@ -32,7 +32,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.83"; +our $Version = "1.84"; our $openSUSE = "http://software.opensuse.org/download/"; 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-10-29 10:29:16.000000000 +0100 +++ new/kiwi/modules/KIWIConfig.sh 2007-11-06 17:36:53.000000000 +0100 @@ -340,6 +340,28 @@ } #====================================== +# baseSetupInPlaceGITRepository +#-------------------------------------- +function baseSetupInPlaceGITRepository { + # /.../ + # create an in place git repository of the root + # directory. This process may take some time and you + # may expect problems with binary data handling + # ---- + if [ -x /usr/bin/git ];then + echo "git not installed... skipped" + return + fi + pushd / + echo /proc > .gitignore + echo /sys >> .gitignore + echo /dev >> .gitignore + git init && git add . && \ + git commit -m "deployed" + popd +} + +#====================================== # suseStripInitrd #-------------------------------------- function suseStripInitrd { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2007-11-05 16:00:58.000000000 +0100 +++ new/kiwi/modules/KIWIXML.pm 2007-11-06 17:36:53.000000000 +0100 @@ -1638,6 +1638,12 @@ rmdir $root; if ( -e $root && -d $root && $main::ForceNewRoot ) { $kiwi -> info ("Removing old root directory '$root'"); + if (-e $root."/base-system") { + $kiwi -> failed(); + $kiwi -> info ("Mount point /base-system exists"); + $kiwi -> failed(); + return undef; + } qx (rm -R $root); $kiwi -> done(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-11-05 16:42:18.000000000 +0100 +++ new/kiwi/.revision 2007-11-06 17:43:41.000000000 +0100 @@ -1 +1 @@ -784 \ No newline at end of file +791 \ No newline at end of file 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-05 15:59:58.000000000 +0100 +++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-11-06 17:36:50.000000000 +0100 @@ -636,9 +636,7 @@ # 16) send DHCP_RELEASE, reset cache #-------------------------------------- if [ $LOCAL_BOOT = "no" ] && [ -z "$NFSROOT" ] && [ -z "$NBDROOT" ];then - if test $systemIntegrity = "clean";then - dhcpcd -k - fi + dhcpcd -k fi #====================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-preinit new/kiwi/system/boot/netboot/suse-preinit --- old/kiwi/system/boot/netboot/suse-preinit 2007-10-08 17:29:59.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-preinit 2007-11-06 17:36:50.000000000 +0100 @@ -58,7 +58,17 @@ fi #====================================== -# 6) Reset systemIntegrity +# 6) create /etc/ImagePackages +#-------------------------------------- +if test $systemIntegrity = "clean";then + if [ -x /bin/rpm ];then + Echo "Creating initial image package info file" + rpm -qa --last > /etc/ImagePackages + fi +fi + +#====================================== +# 7) Reset systemIntegrity #-------------------------------------- if test ! -z $DISK;then if test ! -z $RELOAD_CONFIG;then @@ -67,7 +77,7 @@ fi #====================================== -# 7) check for valid mount points +# 8) check for valid mount points #-------------------------------------- if test ! -z $DISK;then IFS=":" ; for i in $PART_MOUNT;do @@ -80,7 +90,7 @@ fi #====================================== -# 8) Update /etc/ImageVersion files +# 9) Update /etc/ImageVersion files #-------------------------------------- if test ! -z $DISK;then count=0 @@ -106,7 +116,7 @@ fi #====================================== -# 9) setup network for nfs boot +# 10) setup network for nfs boot #-------------------------------------- if test ! -z $NFSROOT;then mount -o nolock -t proc proc /proc 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-05 15:59:44.000000000 +0100 +++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-11-06 17:36:49.000000000 +0100 @@ -540,7 +540,7 @@ setupDefaultFstab /config updateSwapDeviceFstab /config $deviceSwap if [ -z "$UNIONFS_CONFIG" ]; then - echo "$deviceRoot / $FSTYPE defaults 0 0" > /config/etc/fstab + echo "$deviceRoot / $FSTYPE defaults 0 0" >> /config/etc/fstab echo "$deviceHome /home ext3 defaults 0 0" >> /config/etc/fstab else mkdir -p /config/kiwiboot diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-preinit new/kiwi/system/boot/oemboot/suse-preinit --- old/kiwi/system/boot/oemboot/suse-preinit 2007-10-08 17:29:55.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-preinit 2007-11-06 17:36:49.000000000 +0100 @@ -68,3 +68,11 @@ if [ $grubOK = 1 ];then installBootLoaderGrub fi + +#====================================== +# 6) create /etc/ImagePackages +#-------------------------------------- +if [ -x /bin/rpm ];then + Echo "Creating initial image package info file" + rpm -qa --last > /etc/ImagePackages +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-10.2/config.xml new/kiwi/system/boot/usbboot/suse-10.2/config.xml --- old/kiwi/system/boot/usbboot/suse-10.2/config.xml 2007-10-11 15:33:08.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-10.2/config.xml 2007-11-06 17:36:51.000000000 +0100 @@ -60,6 +60,7 @@ <package name="fribidi"/> <package name="make"/> <package name="grub"/> + <package name="hwinfo"/> <package name="bootsplash"/> <package name="bootsplash-theme-SuSE"/> </packages> @@ -76,8 +77,6 @@ <package name="cpio"/> <package name="cyrus-sasl"/> <package name="db"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> @@ -87,7 +86,6 @@ <package name="glibc-locale"/> <package name="gnome-filesystem"/> <package name="gpg"/> - <package name="hal"/> <package name="info"/> <package name="insserv"/> <package name="iproute2"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-10.3/config.xml new/kiwi/system/boot/usbboot/suse-10.3/config.xml --- old/kiwi/system/boot/usbboot/suse-10.3/config.xml 2007-10-09 13:30:13.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-10.3/config.xml 2007-11-06 17:36:52.000000000 +0100 @@ -66,6 +66,7 @@ <package name="fribidi"/> <package name="make"/> <package name="grub"/> + <package name="hwinfo"/> <package name="bootsplash"/> <package name="bootsplash-theme-SuSE"/> </packages> @@ -82,8 +83,6 @@ <package name="cpio"/> <package name="cyrus-sasl"/> <package name="db"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> <package name="expat"/> <package name="fillup"/> <package name="gawk"/> @@ -92,7 +91,6 @@ <package name="glibc-locale"/> <package name="gnome-filesystem"/> <package name="gpg"/> - <package name="hal"/> <package name="info"/> <package name="insserv"/> <package name="iproute2"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-11.0/config.xml new/kiwi/system/boot/usbboot/suse-11.0/config.xml --- old/kiwi/system/boot/usbboot/suse-11.0/config.xml 2007-11-05 16:00:05.000000000 +0100 +++ new/kiwi/system/boot/usbboot/suse-11.0/config.xml 2007-11-06 17:36:51.000000000 +0100 @@ -64,6 +64,7 @@ <package name="fribidi"/> <package name="make"/> <package name="grub"/> + <package name="hwinfo"/> <package name="bootsplash"/> <package name="bootsplash-theme-SuSE"/> </packages> @@ -80,8 +81,6 @@ <package name="cpio"/> <package name="cyrus-sasl"/> <package name="db"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> <package name="expat"/> <package name="fillup"/> <package name="gawk"/> @@ -90,7 +89,6 @@ <package name="glibc-locale"/> <package name="gnome-filesystem"/> <package name="gpg"/> - <package name="hal"/> <package name="info"/> <package name="insserv"/> <package name="iproute2"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-preinit new/kiwi/system/boot/usbboot/suse-preinit --- old/kiwi/system/boot/usbboot/suse-preinit 2007-10-08 17:30:01.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-preinit 2007-11-06 17:36:52.000000000 +0100 @@ -28,3 +28,13 @@ # 2) create framebuffer devices #-------------------------------------- createFramebufferDevices + +#====================================== +# 3) create /etc/ImagePackages +#-------------------------------------- +if test $systemIntegrity = "clean";then + if [ -x /bin/rpm ];then + Echo "Creating initial image package info file" + rpm -qa --last > /etc/ImagePackages + fi +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-SLED10/config.xml new/kiwi/system/boot/usbboot/suse-SLED10/config.xml --- old/kiwi/system/boot/usbboot/suse-SLED10/config.xml 2007-10-17 16:10:48.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-SLED10/config.xml 2007-11-06 17:36:50.000000000 +0100 @@ -63,6 +63,7 @@ <package name="fribidi"/> <package name="make"/> <package name="grub"/> + <package name="hwinfo"/> <package name="bootsplash"/> <package name="bootsplash-theme-SuSE-NLD"/> </packages> @@ -79,8 +80,6 @@ <package name="cpio"/> <package name="cyrus-sasl"/> <package name="db"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> @@ -90,7 +89,6 @@ <package name="glibc-locale"/> <package name="gnome-filesystem"/> <package name="gpg"/> - <package name="hal"/> <package name="info"/> <package name="insserv"/> <package name="iproute2"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml 2007-10-17 16:10:49.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml 2007-11-06 17:36:50.000000000 +0100 @@ -63,6 +63,7 @@ <package name="fribidi"/> <package name="make"/> <package name="grub"/> + <package name="hwinfo"/> <package name="bootsplash"/> <package name="bootsplash-theme-SuSE-NLD"/> </packages> @@ -79,8 +80,6 @@ <package name="cpio"/> <package name="cyrus-sasl"/> <package name="db"/> - <package name="dbus-1"/> - <package name="dbus-1-glib"/> <package name="diffutils"/> <package name="expat"/> <package name="fillup"/> @@ -90,7 +89,6 @@ <package name="glibc-locale"/> <package name="gnome-filesystem"/> <package name="gpg"/> - <package name="hal"/> <package name="info"/> <package name="insserv"/> <package name="iproute2"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-preinit new/kiwi/system/boot/vmxboot/suse-preinit --- old/kiwi/system/boot/vmxboot/suse-preinit 2007-10-08 17:30:04.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-preinit 2007-11-06 17:36:52.000000000 +0100 @@ -53,3 +53,11 @@ if [ $grubOK = 1 ];then installBootLoaderGrub fi + +#====================================== +# 6) create /etc/ImagePackages +#-------------------------------------- +if [ -x /bin/rpm ];then + Echo "Creating initial image package info file" + rpm -qa --last > /etc/ImagePackages +fi diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-preinit new/kiwi/system/boot/xenboot/suse-preinit --- old/kiwi/system/boot/xenboot/suse-preinit 2007-10-08 17:30:06.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-preinit 2007-11-06 17:36:53.000000000 +0100 @@ -28,3 +28,13 @@ # 2) create framebuffer devices #-------------------------------------- createFramebufferDevices + +#====================================== +# 3) create /etc/ImagePackages +#-------------------------------------- +if test $systemIntegrity = "clean";then + if [ -x /bin/rpm ];then + Echo "Creating initial image package info file" + rpm -qa --last > /etc/ImagePackages + fi +fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org