Mailinglist Archive: opensuse-commit (858 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kiwi
checked in at Fri Nov 2 16:51:23 CET 2007.

--------
--- arch/i386/kiwi/kiwi.changes 2007-10-31 17:11:41.000000000 +0100
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes      2007-11-02 
16:30:12.896416000 +0100
@@ -1,0 +2,12 @@
+Fri Nov  2 09:45:37 CET 2007 - ms@xxxxxxx
+
+- v1.81
+- fixed packagemanager adaption if system image and boot image
+  description doesn't use the same packagemanager (#338378)
+- added option --bootcd which allows to create a bootable CD
+  based on the given initrd file (#338467)
+- fixed oemboot missing md5 file problem
+- changed arch call to uname -m to prevent requirement on
+  util-linux package
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.L18097/_old  2007-11-02 16:51:08.000000000 +0100
+++ /var/tmp/diff_new_pack.L18097/_new  2007-11-02 16:51:08.000000000 +0100
@@ -1,5 +1,5 @@
 #
-# spec file for package kiwi (Version 1.80)
+# spec file for package kiwi (Version 1.81)
 #
 # 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.80
+Version:        1.81
 Release:        1
 Group:          System/Management
 License:        GPL v2 or later
@@ -53,7 +53,7 @@
     Marcus Schaefer <ms@xxxxxxxxxx>
 
 %package -n kiwi-tools
-Summary:        openSuSE - KIWI TFTP boot structure
+Summary:        openSuSE - KIWI tools collection
 Group:          System/Management
 
 %description -n kiwi-tools
@@ -353,6 +353,15 @@
 %doc %{_datadir}/kiwi/image/oemboot/README
 %{_datadir}/kiwi/image/oemboot/suse*
 %changelog
+* Fri Nov 02 2007 - ms@xxxxxxx
+- v1.81
+- fixed packagemanager adaption if system image and boot image
+  description doesn't use the same packagemanager (#338378)
+- added option --bootcd which allows to create a bootable CD
+  based on the given initrd file (#338467)
+- fixed oemboot missing md5 file problem
+- changed arch call to uname -m to prevent requirement on
+  util-linux package
 * Wed Oct 31 2007 - ms@xxxxxxx
 - v1.80
 - added kiwi-tools package (startshell), related to (#335678)

++++++ 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-10-31 16:38:46.000000000 +0100
+++ new/kiwi/kiwi.pl    2007-11-02 16:20:47.000000000 +0100
@@ -32,7 +32,7 @@
 #============================================
 # Globals (Version)
 #--------------------------------------------
-our $Version       = "1.80";
+our $Version       = "1.81";
 our $openSUSE      = "http://software.opensuse.org/download/";;
 our $ConfigFile    = "$ENV{'HOME'}/.kiwirc";
 our $ConfigStatus  = 0;
@@ -99,6 +99,7 @@
 our $BootVMSize;        # size of virtual disk
 our $InstallCD;         # Installation initrd booting from CD
 our $InstallCDSystem;   # virtual disk system image to be installed on disk
+our $BootCD;            # Boot initrd booting from CD
 our $InstallStick;      # Installation initrd booting from USB stick
 our $InstallStickSystem;# virtual disk system image to be installed on disk
 our $StripImage;        # strip shared objects and binaries
@@ -678,6 +679,21 @@
        }
 
        #==========================================
+       # Create a boot CD (ISO)
+       #------------------------------------------
+       if (defined $BootCD) {
+               $kiwi -> info ("Creating boot ISO from: $BootCD...\n");
+               $boot = new KIWIBoot ($kiwi,$BootCD);
+               if (! defined $boot) {
+                       my $code = kiwiExit (1); return $code;
+               }
+               if (! $boot -> setupInstallCD()) {
+                       my $code = kiwiExit (1); return $code;
+               }
+               my $code = kiwiExit (0); return $code;
+       }
+
+       #==========================================
        # Create an install CD (ISO)
        #------------------------------------------
        if (defined $InstallCD) {
@@ -796,6 +812,7 @@
                "bootvm-disksize=s"     => \$BootVMSize,
                "installcd=s"           => \$InstallCD,
                "installcd-system=s"    => \$InstallCDSystem,
+               "bootcd=s"              => \$BootCD,
                "installstick=s"        => \$InstallStick,
                "installstick-system=s" => \$InstallStickSystem,
                "strip|s"               => \$StripImage,
@@ -827,7 +844,7 @@
                (! defined $BootVMDisk) && (! defined $CreatePassword) &&
                (! defined $CreateInstSource) && (! defined $Migrate) &&
                (! defined $ListProfiles) && (! defined $InstallStick) &&
-               (! defined $listXMLInfo)
+               (! defined $listXMLInfo) && (! defined $BootCD)
        ) {
                $kiwi -> info ("No operation specified");
                $kiwi -> failed ();
@@ -908,6 +925,7 @@
        print "  kiwi --bootvm <initrd> --bootvm-system <systemImage> \\\n";
        print "     [ --bootvm-disksize <size> ]\n";
        print "     [ --bootvm-format <format> ]\n";
+       print "  kiwi --bootcd <initrd>\n";
        print "  kiwi --installcd <initrd>\n";
        print "       --installcd-system <vmx-system-image>\n";
        print "  kiwi --installstick <initrd>\n";
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        2007-10-30 13:34:29.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm        2007-11-02 16:20:46.000000000 +0100
@@ -127,7 +127,7 @@
                $syszip = $syszip / 1024 / 1024;
                $syszip = int $syszip;
        }
-       my $arch = qx (arch); chomp $arch;
+       my $arch = qx (uname -m); chomp $arch;
        #==========================================
        # Store object data
        #------------------------------------------
@@ -266,11 +266,20 @@
        $status = qx ( mv $tmpdir/usr/lib/grub/* $tmpdir/boot/grub 2>&1 );
        $result = $? >> 8;
        if ($result != 0) {
-               $kiwi -> failed ();
-               $kiwi -> error  ("Failed importing grub stages: $status");
-               $kiwi -> failed ();
-               qx (rm -rf $tmpdir);
-               return undef;
+               $kiwi -> skipped ();
+               $kiwi -> error   ("Failed importing grub stages: $status");
+               $kiwi -> skipped ();
+               $kiwi -> info    ("Trying to use grub stages from local 
machine");
+               $status = qx ( cp /usr/lib/grub/* $tmpdir/boot/grub 2>&1 );
+               $result = $? >> 8;
+               if ($result != 0) {
+                       $kiwi -> failed ();
+                       $kiwi -> error  ("Failed importing grub stages: 
$status");
+                       $kiwi -> failed ();
+                       qx (rm -rf $tmpdir);
+                       return undef;
+               }
+               $kiwi -> done();
        }
        $kiwi -> done ();
        #==========================================
@@ -566,20 +575,30 @@
        my $initrd  = $this->{initrd};
        my $system  = $this->{system};
        my $oldird  = $this->{initrd};
-       my $namecd  = basename ($system);
+       my $gotsys  = 1;
        my $status;
        my $result;
        my $ibasename;
        #==========================================
+       # check if system image is given
+       #------------------------------------------
+       if (! defined $system) {
+               $system = $initrd;
+               $gotsys = 0;
+       }
+       #==========================================
        # Setup image basename
        #------------------------------------------
-       if ($namecd !~ /(.*)-(\d+\.\d+\.\d+)\.raw$/) {
-               $kiwi -> error  ("Couldn't extract version information");
-               $kiwi -> failed ();
-               qx (rm -rf $tmpdir);
-               return undef;
+       my $namecd = basename ($system);
+       if ($gotsys) {
+               if ($namecd !~ /(.*)-(\d+\.\d+\.\d+)\.raw$/) {
+                       $kiwi -> error  ("Couldn't extract version 
information");
+                       $kiwi -> failed ();
+                       qx (rm -rf $tmpdir);
+                       return undef;
+               }
+               $ibasename = $1;
        }
-       $ibasename = $1;
        #==========================================
        # Setup initrd for install purpose
        #------------------------------------------
@@ -611,12 +630,22 @@
        $status = qx ( mv $tmpdir/$stage2 $tmpdir/boot/grub/stage2 2>&1 );
        $result = $? >> 8;
        if ($result != 0) {
-               $kiwi -> failed ();
-               $kiwi -> error  ("Failed importing grub stages: $status");
-               $kiwi -> failed ();
-               $this->{initrd} = $oldird;
-               qx (rm -rf $tmpdir);
-               return undef; 
+               $kiwi -> skipped ();
+               $kiwi -> error   ("Failed importing grub stages: $status");
+               $kiwi -> skipped ();
+               $kiwi -> info    ("Trying to use grub stages from local 
machine");
+               $status = qx ( cp /$stage1 $tmpdir/boot/grub/stage1 2>&1 );
+               $status = qx ( cp /$stage2 $tmpdir/boot/grub/stage2 2>&1 );
+               $result = $? >> 8;
+               if ($result != 0) {
+                       $kiwi -> failed ();
+                       $kiwi -> error  ("Failed importing grub stages: 
$status");
+                       $kiwi -> failed ();
+                       $this->{initrd} = $oldird;
+                       qx (rm -rf $tmpdir);
+                       return undef;
+               }
+               $kiwi -> done();
        }
        qx (rm -rf $tmpdir/usr 2>&1);
        qx (rm -rf $tmpdir/image 2>&1);
@@ -634,15 +663,19 @@
                qx (rm -rf $tmpdir);
                return undef;
        }
+       my $title = "KIWI CD Installation";
+       if (! $gotsys) {
+               $title = "KIWI CD Boot: $namecd";
+       }
        print FD "color cyan/blue white/blue\n";
        print FD "default 0\n";
        print FD "timeout 10\n";
        print FD "gfxmenu (cd)/boot/message\n";
-       print FD "title KIWI CD Installation\n";
+       print FD "title $title\n";
        print FD " kernel (cd)/boot/linux vga=0x314 splash=silent";
        print FD " ramdisk_size=512000 showopts\n";
        print FD " initrd (cd)/boot/initrd\n";
-       print FD "title Failsafe -- KIWI CD Installation\n";
+       print FD "title Failsafe -- $title\n";
        print FD " kernel (cd)/boot/linux vga=0x314 splash=silent";
        print FD " ramdisk_size=512000 showopts";
        print FD " ide=nodma apm=off acpi=off noresume selinux=0 nosmp";
@@ -652,9 +685,9 @@
        $kiwi -> done();
 
        #==========================================
-       # Copy system image if defined
+       # Copy system image if given
        #------------------------------------------
-       if (defined $system) {
+       if ($gotsys) {
                $kiwi -> info ("Importing system image: $system");
                $status = qx (cp $system $tmpdir/$ibasename 2>&1);
                $result = $? >> 8;
@@ -671,7 +704,12 @@
        # Create an iso image from the tree
        #------------------------------------------
        $kiwi -> info ("Creating ISO image");
-       my $name = $system; $name =~ s/raw$/iso/;
+       my $name = $system;
+       if ($gotsys) {
+               $name =~ s/raw$/iso/;
+       } else {
+               $name =~ s/gz$/iso/;
+       }
        my $base = "-R -b boot/grub/stage2";
        my $opts = "-no-emul-boot -boot-load-size 4 -boot-info-table";
        if ($name !~ /^\//) {
@@ -709,13 +747,22 @@
        my $oldird    = $this->{initrd};
        my $vmsize    = $this->{vmsize};
        my $diskname  = $system.".install.raw";
-       my $namecd    = basename ($system);
        my $loop      = "/dev/loop0";
        my $loopfound = 0;
+       my $gotsys    = 1;
        my $status;
        my $result;
        my $ibasename;
        #==========================================
+       # check if system image is given
+       #------------------------------------------
+       if (! defined $system) {
+               $system   = $initrd;
+               $diskname = $initrd;
+               $diskname =~ s/gz$/raw/;
+               $gotsys   = 0;
+       }
+       #==========================================
        # search free loop device
        #------------------------------------------
        $kiwi -> info ("Searching for free loop device...");
@@ -740,13 +787,16 @@
        #==========================================
        # Setup image basename
        #------------------------------------------
-       if ($namecd !~ /(.*)-(\d+\.\d+\.\d+)\.raw$/) {
-               $kiwi -> error  ("Couldn't extract version information");
-               $kiwi -> failed ();
-               qx (rm -rf $tmpdir);
-               return undef;
+       my $nameusb = basename ($system);
+       if ($gotsys) {
+               if ($nameusb !~ /(.*)-(\d+\.\d+\.\d+)\.raw$/) {
+                       $kiwi -> error  ("Couldn't extract version 
information");
+                       $kiwi -> failed ();
+                       qx (rm -rf $tmpdir);
+                       return undef;
+               }
+               $ibasename = $1;
        }
-       $ibasename = $1;
        #==========================================
        # Setup initrd for install purpose
        #------------------------------------------
@@ -772,12 +822,21 @@
        $status = qx ( mv $tmpdir/usr/lib/grub/* $tmpdir/boot/grub 2>&1 );
        $result = $? >> 8;
        if ($result != 0) {
-               $kiwi -> failed ();
-               $kiwi -> error  ("Failed importing grub stages: $status");
-               $kiwi -> failed ();
-               $this->{initrd} = $oldird;
-               qx (rm -rf $tmpdir);
-               return undef;
+               $kiwi -> skipped ();
+               $kiwi -> error   ("Failed importing grub stages: $status");
+               $kiwi -> skipped ();
+               $kiwi -> info    ("Trying to use grub stages from local 
machine");
+               $status = qx ( cp /usr/lib/grub/* $tmpdir/boot/grub 2>&1 );
+               $result = $? >> 8;
+               if ($result != 0) {
+                       $kiwi -> failed ();
+                       $kiwi -> error  ("Failed importing grub stages: 
$status");
+                       $kiwi -> failed ();
+                       $this->{initrd} = $oldird;
+                       qx (rm -rf $tmpdir);
+                       return undef;
+               }
+               $kiwi -> done();
        }
        $kiwi -> done ();
        #==========================================
@@ -792,16 +851,20 @@
                qx (rm -rf $tmpdir);
                return undef;
        }
+       my $title = "KIWI USB-Stick Installation";
+       if (! $gotsys) {
+               $title = "KIWI USB Boot: $nameusb";
+       }
        print FD "color cyan/blue white/blue\n";
        print FD "default 0\n";
        print FD "timeout 10\n";
        print FD "gfxmenu (hd0,0)/image/loader/message\n";
        print FD "\n";
-       print FD "title KIWI USB-Stick Installation\n";
+       print FD "title $title\n";
        print FD " root (hd0,0)\n";
        print FD " kernel /boot/linux.vmx vga=0x314 splash=silent showopts\n";
        print FD " initrd /boot/initrd.vmx\n";
-       print FD "title Failsafe -- KIWI USB-Stick Installation\n";
+       print FD "title Failsafe -- $title\n";
        print FD " root (hd0,0)\n";
        print FD " kernel /boot/linux.vmx vga=0x314 splash=silent showopts";
        print FD " ide=nodma apm=off acpi=off noresume selinux=0 nosmp";
@@ -940,7 +1003,7 @@
        #==========================================
        # Copy system image if defined
        #------------------------------------------
-       if (defined $system) {
+       if ($gotsys) {
                $kiwi -> info ("Installing image data to virtual disk");
                $status = qx (mount $data /mnt/ 2>&1);
                $result = $? >> 8;
@@ -1110,11 +1173,20 @@
        $status = qx ( mv $tmpdir/usr/lib/grub/* $tmpdir/boot/grub 2>&1 );
        $result = $? >> 8;
        if ($result != 0) {
-               $kiwi -> failed ();
-               $kiwi -> error  ("Failed importing grub stages: $status");
-               $kiwi -> failed ();
-               qx (rm -rf $tmpdir);
-               return undef;
+               $kiwi -> skipped ();
+               $kiwi -> error   ("Failed importing grub stages: $status");
+               $kiwi -> skipped ();
+               $kiwi -> info    ("Trying to use grub stages from local 
machine");
+               $status = qx ( cp /usr/lib/grub/* $tmpdir/boot/grub 2>&1 );
+               $result = $? >> 8;
+               if ($result != 0) {
+                       $kiwi -> failed ();
+                       $kiwi -> error  ("Failed importing grub stages: 
$status");
+                       $kiwi -> failed ();
+                       qx (rm -rf $tmpdir);
+                       return undef;
+               }
+               $kiwi -> done();        
        }
        $kiwi -> done ();
        #==========================================
@@ -1468,6 +1540,7 @@
                if ($format eq "iso") {
                        $this -> {system} = $diskname;
                        $kiwi -> info ("Creating install ISO image\n");
+                       $this -> buildMD5Sum ($diskname);
                        qx ( /sbin/losetup -d $loop );
                        if (! $this -> setupInstallCD()) {
                                return undef;
@@ -1748,4 +1821,30 @@
        return $label;
 }
 
+#==========================================
+# buildMD5Sum
+#------------------------------------------
+sub buildMD5Sum {
+       my $this = shift;
+       my $file = shift;
+       my $kiwi = $this->{kiwi};
+       $kiwi -> info ("Creating image MD5 sum...");
+       my $size = -s $file;
+       my $primes = qx (factor $size); $primes =~ s/^.*: //;
+       my $blocksize = 1;
+       for my $factor (split /\s/,$primes) {
+               last if ($blocksize * $factor > 8192);
+               $blocksize *= $factor;
+       }
+       my $blocks = $size / $blocksize;
+       my $sum  = qx (cat $file | md5sum - | cut -f 1 -d-);
+       chomp $sum;
+       if ($file =~ /\.raw$/) {
+               $file =~ s/raw$/md5/;
+       }
+       qx (echo "$sum $blocks $blocksize" > $file);
+       $kiwi -> done();
+       return $this;
+}
+
 1; 
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/modules/KIWIImage.pm new/kiwi/modules/KIWIImage.pm
--- old/kiwi/modules/KIWIImage.pm       2007-10-31 16:38:45.000000000 +0100
+++ new/kiwi/modules/KIWIImage.pm       2007-11-02 16:20:46.000000000 +0100
@@ -91,7 +91,7 @@
                        $kiwi -> setRootLog ($imageTree.".".$$.".screenrc.log");
                }
        }
-       my $arch = qx ( arch ); chomp ( $arch );
+       my $arch = qx (uname -m); chomp ( $arch );
        $arch = ".$arch";
        #==========================================
        # Store object data
@@ -601,20 +601,6 @@
                return undef;
        }
        #==========================================
-       # Create md5sum if not yet done
-       #------------------------------------------
-       if (defined $name->{imageTree}) {
-               my $nsys = $name->{systemImage}.".raw";
-               my $nmd5 = $name->{systemImage}.".md5";
-               if (! $this -> buildMD5Sum ($nsys)) {
-                       return undef;
-               }
-               $nsys = $main::Destination."/".$nsys.".md5";
-               $nmd5 = $main::Destination."/".$nmd5;
-               unlink ($nmd5);
-               rename ($nsys,$nmd5);
-       }
-       #==========================================
        # Create virtual disk configuration
        #------------------------------------------
        if ((defined $main::BootVMFormat) && ($main::BootVMFormat eq "vmdk")) {
@@ -1082,7 +1068,7 @@
        #------------------------------------------
        my $CD  = $main::Prepare."/cdboot";
        my $gfx = $main::RootTree."/image/loader";
-       my $isoarch = qx (arch); chomp $isoarch;
+       my $isoarch = qx (uname -m); chomp $isoarch;
        if ($isoarch =~ /i.86/) {
                $isoarch = "i386";
        }
@@ -1192,6 +1178,7 @@
        #------------------------------------------
        $kiwi -> info ("Calling mkisofs...");
        my $name = $imageDest."/".$namerw.".iso";
+       $kiwi -> loginfo ("Calling: $CD/isolinux.sh $main::RootTree/CD $name");
        $data = qx ($CD/isolinux.sh $main::RootTree/CD $name 2>&1);
        $code = $? >> 8;
        if ($code != 0) {
@@ -1234,7 +1221,6 @@
        my $mbytesro;
        my $mbytesrw;
        my $xmlsize;
-
        #==========================================
        # Get filesystem info for split image
        #------------------------------------------
@@ -1275,7 +1261,6 @@
                        $kiwi -> failed ();
                        return undef;
                }
-
                my $filter = sub {
                        my $file = $_;
                        my $dir = $File::Find::dir;
@@ -1305,7 +1290,6 @@
 
                $kiwi -> done();
        }
-       
        $imageTreeRW = $imageTree;
        $imageTreeRW =~ s/\/+$//;
        $imageTreeRW.= "-read-write";
@@ -1319,16 +1303,18 @@
                        $kiwi -> failed ();
                        return undef;
                }
-
                my @rwTrees = ("/etc", "/home", "/root", "/mnt", 
"/var/lib/rpm");
                foreach my $tree (@rwTrees) {
                        qx ( mkdir -p `dirname $tree` );
                        qx ( mv $imageTreeTmp$tree $imageTreeRW/`dirname $tree` 
2>&1 );
                        symlink ("/read-write$tree", "${imageTreeTmp}${tree}");
                }
-
-               my @rwFiles = ("/etc/fstab", "/etc/passwd", "/etc/group", 
"/etc/shadow", "/etc/mtab", "/boot",
-                                          "/etc/init.d/.depend.boot", 
"/etc/init.d/.depend.start", "/etc/init.d/.depend.stop");
+               my @rwFiles = (
+                       "/etc/fstab", "/etc/passwd", "/etc/group",
+                       "/etc/shadow", "/etc/mtab", "/boot",
+                       "/etc/init.d/.depend.boot", "/etc/init.d/.depend.start",
+                       "/etc/init.d/.depend.stop"
+               );
                foreach my $file (@rwFiles) {
                        my $tmpfile = "$imageTreeTmp"."$file";
                        my $rwfile = "$imageTreeRW"."$file";
@@ -1345,7 +1331,6 @@
                        symlink ("/read-write${file}", "$tmpfile");
                }
        }
-
        #==========================================
        # Embed tmp extend into ro extend
        #------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/modules/KIWIPattern.pm 
new/kiwi/modules/KIWIPattern.pm
--- old/kiwi/modules/KIWIPattern.pm     2007-10-29 10:29:16.000000000 +0100
+++ new/kiwi/modules/KIWIPattern.pm     2007-11-02 16:20:46.000000000 +0100
@@ -73,7 +73,7 @@
                kiwi -> failed ();
                return undef;
        }
-       my $arch = qx (arch); chomp $arch;
+       my $arch = qx (uname -m); chomp $arch;
        if ($arch =~ /^i.86/) {
                $arch = 'i*86';
        }
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-10-31 16:38:45.000000000 +0100
+++ new/kiwi/modules/KIWIXML.pm 2007-11-02 16:20:46.000000000 +0100
@@ -66,7 +66,7 @@
        if (($imageDesc !~ /\//) && (! -d $imageDesc)) {
                $imageDesc = $main::System."/".$imageDesc;
        }
-       my $arch = qx ( arch ); chomp $arch;
+       my $arch = qx (uname -m); chomp $arch;
        my $systemTree;
        my $controlFile = $imageDesc."/config.xml";
        my $systemXML   = new XML::LibXML;
@@ -147,9 +147,13 @@
                        my $manager = $foreignRepo->{packagemanager};
                        $kiwi -> done ();
                        $kiwi -> info ("Including foreign package manager: 
$manager");
-                       $optionsNodeList -> get_node(1) -> setAttribute (
-                               "packagemanager",$manager
-                       );
+                       my $addElement = new XML::LibXML::Element 
("packagemanager");
+                       $addElement -> appendText ($manager);
+                       my $opts = $optionsNodeList -> get_node(1);
+                       my $node = $opts -> getElementsByTagName 
("packagemanager")
+                               -> get_node(1);
+                       $opts -> removeChild ($node);
+                       $opts -> appendChild ($addElement);
                }
        }
        #==========================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision  2007-10-31 17:11:18.000000000 +0100
+++ new/kiwi/.revision  2007-11-02 16:30:05.000000000 +0100
@@ -1 +1 @@
-761
\ No newline at end of file
+772
\ 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-10-31 16:38:42.000000000 
+0100
+++ new/kiwi/system/boot/netboot/suse-linuxrc   2007-11-02 16:20:45.000000000 
+0100
@@ -761,10 +761,10 @@
 /mnt/sbin/pivot_root . mnt >/dev/null 2>&1
 if test $? != 0;then
        PIVOT=false
-       cleanInitrd && mount --move . / && chroot . ./preinit
-       chroot . rm -f  ./preinit
-       chroot . rm -f  ./include
-       chroot . rm -rf ./image
+       cleanInitrd && mount --move . / && /bin/chroot . ./preinit
+       /bin/chroot . rm -f  ./preinit
+       /bin/chroot . rm -f  ./include
+       /bin/chroot . rm -rf ./image
 else
        PIVOT=true
        ./preinit
@@ -792,5 +792,5 @@
 if [ $PIVOT = "true" ];then
        exec umount -n -l /mnt
 else
-       exec chroot . /sbin/init $@
+       exec /bin/chroot . /sbin/init $@
 fi
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kiwi/system/boot/oemboot/suse-SLES10-SP1/config/kernel-default 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1/config/kernel-default
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1/config/kernel-default  
1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1/config/kernel-default  
2007-11-02 16:20:44.000000000 +0100
@@ -0,0 +1,129 @@
+#!/bin/sh
+test -f /.profile && . /.profile
+
+echo "kernel-default: Image [$name]..."
+
+#==========================================
+# setup kernel version to deal with
+#------------------------------------------
+VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-default kernel-default`
+
+#==========================================
+# move interesting stuff to /tmp
+#------------------------------------------
+mv lib/modules/$VERSION/updates     /tmp
+mv lib/modules/$VERSION/kernel/*    /tmp
+mv lib/modules/$VERSION/modules.*   /tmp
+
+#==========================================
+# remove unneeded stuff
+#------------------------------------------
+rm -r lib/modules/$VERSION/*
+
+#==========================================
+# insert modules.* files
+#------------------------------------------
+mv /tmp/modules.* /lib/modules/$VERSION/
+mv /tmp/updates   /lib/modules/$VERSION/
+
+#==========================================
+# create driver-used dirs with .o's to use
+#------------------------------------------
+mkdir -p /tmp/usb-used
+mkdir -p /tmp/scsi-used/drivers/scsi
+mkdir -p /tmp/net-used/drivers/net
+mkdir -p /tmp/misc-used
+
+IFS_SAVE=$IFS
+IFS=","
+
+#==========================================
+# handle USB drivers...
+#------------------------------------------
+test ! -z "$usbdrivers";for i in $usbdrivers;do
+       path=`dirname $i`
+       test -f /tmp/drivers/$i && \
+       mkdir -p /tmp/usb-used/drivers/$path && \
+       mv /tmp/drivers/$i /tmp/usb-used/drivers/$path
+done
+
+#==========================================
+# handle SCSI drivers...
+#------------------------------------------
+test ! -z "$scsidrivers";for i in $scsidrivers;do
+       path=`dirname $i`
+       if [ $path = "." ];then
+               test -f /tmp/drivers/scsi/$i && \
+               mv /tmp/drivers/scsi/$i /tmp/scsi-used/drivers/scsi
+       else
+               test -f /tmp/drivers/scsi/$i && \
+               mkdir -p /tmp/scsi-used/drivers/scsi/$path && \
+               mv /tmp/drivers/scsi/$i /tmp/scsi-used/drivers/scsi/$path
+       fi
+done
+
+#==========================================
+# handle Network drivers...
+#------------------------------------------
+test ! -z "$netdrivers";for i in $netdrivers;do
+       path=`dirname $i`
+       if [ $path = "." ];then
+               test -f /tmp/drivers/net/$i && \
+               mv /tmp/drivers/net/$i /tmp/net-used/drivers/net
+       else
+               test -f /tmp/drivers/net/$i && \
+               mkdir -p /tmp/net-used/drivers/net/$path && \
+               mv /tmp/drivers/net/$i /tmp/net-used/drivers/net/$path
+       fi
+done
+
+#==========================================
+# handle misc drivers...
+#------------------------------------------
+test ! -z "$drivers";for i in $drivers;do
+       path=`/usr/bin/dirname $i`
+       base=`/usr/bin/basename $i`
+       if [ "$base" = "*" ];then
+               test -d /tmp/$path && \
+               mkdir -p /tmp/misc-used/$path && \
+               mv /tmp/$path/* /tmp/misc-used/$path
+       else
+               test -f /tmp/$i && \
+               mkdir -p /tmp/misc-used/$path && \
+               mv /tmp/$i /tmp/misc-used/$path
+       fi
+done
+
+#==========================================
+# Save all needed drivers...
+#------------------------------------------
+IFS=$IFS_SAVE
+for root in /tmp/scsi-used /tmp/net-used /tmp/usb-used /tmp/misc-used;do
+       cd $root
+       for dir in `find -type d`;do
+               if [ ! -d /lib/modules/$VERSION/kernel/$dir ];then
+                       mkdir -p /lib/modules/$VERSION/kernel/$dir 2>/dev/null
+               fi
+       done
+done
+for root in /tmp/scsi-used /tmp/net-used /tmp/usb-used /tmp/misc-used;do
+       cd $root
+       for file in `find -type f`;do
+               path=`dirname $file`
+               mv $file /lib/modules/$VERSION/kernel/$path;
+       done
+done
+
+#==========================================
+# Cleanup /tmp...
+#------------------------------------------
+rm -rf /tmp/*
+
+#==========================================
+# create common kernel files...
+#------------------------------------------
+cd /boot 
+mv vmlinux-$VERSION.gz vmlinux.gz
+mv vmlinuz-$VERSION vmlinuz
+
+exit 0
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     1970-01-01 
01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1/config.xml     2007-11-02 
16:20:44.000000000 +0100
@@ -0,0 +1,118 @@
+<image name="initrd-oemboot-suse-SLES10-SP1" schemeversion="1.4">
+       <description type="boot">
+               <author>Marcus Schaefer</author>
+               <contact>ms@xxxxxxxxxx</contact>
+               <specification>boot/initrd image used on OEM VMX 
disk</specification>
+       </description>
+       <preferences>
+               <type>cpio</type>
+               <version>2.1.1</version>
+               <compressed>yes</compressed>
+               <packagemanager>smart</packagemanager>
+               <rpm-check-signatures>False</rpm-check-signatures>
+       </preferences>
+       <drivers type="usbdrivers">
+               <file name="usb/host/usb-uhci.ko"/>
+               <file name="usb/host/usb-ohci.ko"/>
+               <file name="usb/host/ehci-hcd.ko"/>
+               <file name="usb/host/uhci-hcd.ko"/>
+               <file name="usb/core/usbcore.ko"/>
+               <file name="usb/storage/usb-storage.ko"/>
+       </drivers>
+       <drivers type="drivers">
+               <file name="drivers/ide/*"/>
+               <file name="net/packet/*"/>
+               <file name="fs/ext3/*"/>
+               <file name="fs/ext2/*"/>
+               <file name="fs/binfmt_aout.ko"/>
+               <file name="fs/binfmt_misc.ko"/>
+               <file name="fs/mbcache.ko"/>
+               <file name="fs/quota_v1.ko"/>
+               <file name="fs/quota_v2.ko"/>
+               <file name="fs/jbd/*"/>
+               <file name="fs/fat/*"/>
+               <file name="fs/vfat/*"/>
+               <file name="fs/reiserfs/*"/>
+               <file name="fs/nfs/*"/>
+               <file name="net/sunrpc/*"/>
+               <file name="fs/lockd/*"/>
+               <file name="fs/nfs_common/*"/>
+               <file name="net/ipv6/*"/>
+               <file name="drivers/cdrom/*"/>
+               <file name="drivers/ata/*"/>
+               <file name="drivers/cdrom/*"/>
+               <file name="drivers/scsi/*"/>
+               <file name="drivers/message/fusion/*"/>
+               <file name="drivers/net/*"/>
+       </drivers>
+       <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="atftp"/>
+               <package name="bind-libs"/>
+               <package name="bind-utils"/>
+               <package name="dhcpcd"/>
+               <package name="e2fsprogs"/>
+               <package name="file"/>
+               <package name="hwinfo"/>
+               <package name="module-init-tools"/>
+               <package name="net-tools"/>
+               <package name="netcfg"/>
+               <package name="parted"/>
+               <package name="reiserfs"/>
+               <package name="util-linux"/>
+               <package name="kernel-default"/>
+               <package name="diffutils"/>
+               <package name="procps"/>
+               <package name="lvm2"/>
+               <package name="gfxboot"/>
+               <package name="fribidi"/>
+               <package name="make"/>
+               <package name="grub"/>
+               <package name="bootsplash"/>
+               <package name="bootsplash-theme-SuSE-SLES"/>
+               <package name="eject"/>
+       </packages>
+       <packages type="boot">
+               <package name="filesystem"/>
+               <package name="glibc-locale"/>
+       </packages>
+       <packages type="delete">
+               <package name="perl"/>
+               <package name="glibc-locale"/>
+               <package name="man"/>
+               <package name="info"/>
+               <package name="smart"/>
+               <package name="python"/>
+               <package name="python-xml"/>
+               <package name="python-elementtree"/>
+               <package name="perl-gettext"/>
+               <package name="perl-Bootloader"/>
+               <package name="pam-modules"/>
+               <package name="gawk"/>
+               <package name="gnome-filesystem"/>
+               <package name="openslp"/>
+               <package name="rpm-python"/>
+               <package name="suse-build-key"/>
+               <package name="permissions"/>
+               <package name="fillup"/>
+               <package name="pam"/>
+               <package name="expat"/>
+               <package name="suse-release"/>
+               <package name="libxml2"/>
+               <package name="openldap2-client"/>
+               <package name="logrotate"/>
+               <package name="diffutils"/>
+               <package name="cpio"/>
+               <package name="insserv"/>
+               <package name="ash"/>
+               <package name="gdbm"/>
+               <package name="gfxboot"/>
+               <package name="fribidi"/>
+               <package name="make"/>
+       </packages>
+</image>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1/images.sh 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1/images.sh
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1/images.sh      1970-01-01 
01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1/images.sh      2007-11-02 
16:20:44.000000000 +0100
@@ -0,0 +1,29 @@
+#!/bin/sh
+test -f /.kconfig && . /.kconfig
+test -f /.profile && . /.profile
+
+echo "Configure image: [$name]..."
+
+#==========================================
+# setup gfxboot
+#------------------------------------------
+suseGFXBoot SLES grub
+
+#==========================================
+# remove unneeded packages
+#------------------------------------------
+for i in `baseGetPackagesForDeletion`;do
+       rpm -e $i --nodeps
+done
+
+#==========================================
+# remove unneeded files
+#------------------------------------------
+suseStripInitrd
+
+#==========================================
+# umount /proc
+#------------------------------------------
+umount /proc
+
+exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/include 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/include
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/include   1970-01-01 
01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/include   2007-11-02 
16:51:13.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to /usr/share/kiwi/modules/KIWILinuxRC.sh
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/linuxrc 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/linuxrc
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/linuxrc   1970-01-01 
01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/linuxrc   2007-11-02 
16:51:13.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to ../../suse-linuxrc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/preinit 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/preinit
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/preinit   1970-01-01 
01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1/root/preinit   2007-11-02 
16:51:13.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to ../../suse-preinit
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  
1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config/kernel-smp  
2007-11-02 16:20:42.000000000 +0100
@@ -0,0 +1,127 @@
+#!/bin/sh
+test -f /.profile && . /.profile
+
+echo "kernel-smp: Image [$name]..."
+
+#==========================================
+# setup kernel version to deal with
+#------------------------------------------
+VERSION=`rpm -q --qf %{VERSION}-%{RELEASE}-smp kernel-smp`
+
+#==========================================
+# move interesting stuff to /tmp
+#------------------------------------------
+mv lib/modules/$VERSION/kernel/*    /tmp
+mv lib/modules/$VERSION/modules.*   /tmp
+
+#==========================================
+# remove unneeded stuff
+#------------------------------------------
+rm -r lib/modules/$VERSION/*
+
+#==========================================
+# insert modules.* files
+#------------------------------------------
+mv /tmp/modules.* /lib/modules/$VERSION/
+
+#==========================================
+# create driver-used dirs with .o's to use
+#------------------------------------------
+mkdir -p /tmp/usb-used
+mkdir -p /tmp/scsi-used/drivers/scsi
+mkdir -p /tmp/net-used/drivers/net
+mkdir -p /tmp/misc-used
+
+IFS_SAVE=$IFS
+IFS=","
+
+#==========================================
+# handle USB drivers...
+#------------------------------------------
+test ! -z "$usbdrivers";for i in $usbdrivers;do
+       path=`dirname $i`
+       test -f /tmp/drivers/$i && \
+       mkdir -p /tmp/usb-used/drivers/$path && \
+       mv /tmp/drivers/$i /tmp/usb-used/drivers/$path
+done
+
+#==========================================
+# handle SCSI drivers...
+#------------------------------------------
+test ! -z "$scsidrivers";for i in $scsidrivers;do
+       path=`dirname $i`
+       if [ $path = "." ];then
+               test -f /tmp/drivers/scsi/$i && \
+               mv /tmp/drivers/scsi/$i /tmp/scsi-used/drivers/scsi
+       else
+               test -f /tmp/drivers/scsi/$i && \
+               mkdir -p /tmp/scsi-used/drivers/scsi/$path && \
+               mv /tmp/drivers/scsi/$i /tmp/scsi-used/drivers/scsi/$path
+       fi
+done
+
+#==========================================
+# handle Network drivers...
+#------------------------------------------
+test ! -z "$netdrivers";for i in $netdrivers;do
+       path=`dirname $i`
+       if [ $path = "." ];then
+               test -f /tmp/drivers/net/$i && \
+               mv /tmp/drivers/net/$i /tmp/net-used/drivers/net
+       else
+               test -f /tmp/drivers/net/$i && \
+               mkdir -p /tmp/net-used/drivers/net/$path && \
+               mv /tmp/drivers/net/$i /tmp/net-used/drivers/net/$path
+       fi
+done
+
+#==========================================
+# handle misc drivers...
+#------------------------------------------
+test ! -z "$drivers";for i in $drivers;do
+       path=`/usr/bin/dirname $i`
+       base=`/usr/bin/basename $i`
+       if [ "$base" = "*" ];then
+               test -d /tmp/$path && \
+               mkdir -p /tmp/misc-used/$path && \
+               mv /tmp/$path/* /tmp/misc-used/$path
+       else
+               test -f /tmp/$i && \
+               mkdir -p /tmp/misc-used/$path && \
+               mv /tmp/$i /tmp/misc-used/$path
+       fi
+done
+
+#==========================================
+# Save all needed drivers...
+#------------------------------------------
+IFS=$IFS_SAVE
+for root in /tmp/scsi-used /tmp/net-used /tmp/usb-used /tmp/misc-used;do
+       cd $root
+       for dir in `find -type d`;do
+               if [ ! -d /lib/modules/$VERSION/kernel/$dir ];then
+                       mkdir -p /lib/modules/$VERSION/kernel/$dir 2>/dev/null
+               fi
+       done
+done
+for root in /tmp/scsi-used /tmp/net-used /tmp/usb-used /tmp/misc-used;do
+       cd $root
+       for file in `find -type f`;do
+               path=`dirname $file`
+               mv $file /lib/modules/$VERSION/kernel/$path;
+       done
+done
+
+#==========================================
+# Cleanup /tmp...
+#------------------------------------------
+rm -rf /tmp/*
+
+#==========================================
+# create common kernel files...
+#------------------------------------------
+cd /boot 
+mv vmlinux-$VERSION.gz vmlinux.gz
+mv vmlinuz-$VERSION vmlinuz
+
+exit 0
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 1970-01-01 
01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/config.xml 2007-11-02 
16:20:42.000000000 +0100
@@ -0,0 +1,118 @@
+<image name="initrd-oemboot-suse-SLES10-SP1-smp" schemeversion="1.4">
+       <description type="boot">
+               <author>Marcus Schaefer</author>
+               <contact>ms@xxxxxxxxxx</contact>
+               <specification>boot/initrd image used on OEM VMX 
disk</specification>
+       </description>
+       <preferences>
+               <type>cpio</type>
+               <version>2.1.1</version>
+               <compressed>yes</compressed>
+               <packagemanager>smart</packagemanager>
+               <rpm-check-signatures>False</rpm-check-signatures>
+       </preferences>
+       <drivers type="usbdrivers">
+               <file name="usb/host/usb-uhci.ko"/>
+               <file name="usb/host/usb-ohci.ko"/>
+               <file name="usb/host/ehci-hcd.ko"/>
+               <file name="usb/host/uhci-hcd.ko"/>
+               <file name="usb/core/usbcore.ko"/>
+               <file name="usb/storage/usb-storage.ko"/>
+       </drivers>
+       <drivers type="drivers">
+               <file name="drivers/ide/*"/>
+               <file name="net/packet/*"/>
+               <file name="fs/ext3/*"/>
+               <file name="fs/ext2/*"/>
+               <file name="fs/binfmt_aout.ko"/>
+               <file name="fs/binfmt_misc.ko"/>
+               <file name="fs/mbcache.ko"/>
+               <file name="fs/quota_v1.ko"/>
+               <file name="fs/quota_v2.ko"/>
+               <file name="fs/jbd/*"/>
+               <file name="fs/fat/*"/>
+               <file name="fs/vfat/*"/>
+               <file name="fs/reiserfs/*"/>
+               <file name="fs/nfs/*"/>
+               <file name="net/sunrpc/*"/>
+               <file name="fs/lockd/*"/>
+               <file name="fs/nfs_common/*"/>
+               <file name="net/ipv6/*"/>
+               <file name="drivers/cdrom/*"/>
+               <file name="drivers/ata/*"/>
+               <file name="drivers/cdrom/*"/>
+               <file name="drivers/scsi/*"/>
+               <file name="drivers/message/fusion/*"/>
+               <file name="drivers/net/*"/>
+       </drivers>
+       <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="atftp"/>
+               <package name="bind-libs"/>
+               <package name="bind-utils"/>
+               <package name="dhcpcd"/>
+               <package name="e2fsprogs"/>
+               <package name="file"/>
+               <package name="hwinfo"/>
+               <package name="module-init-tools"/>
+               <package name="net-tools"/>
+               <package name="netcfg"/>
+               <package name="parted"/>
+               <package name="reiserfs"/>
+               <package name="util-linux"/>
+               <package name="kernel-smp"/>
+               <package name="diffutils"/>
+               <package name="procps"/>
+               <package name="lvm2"/>
+               <package name="gfxboot"/>
+               <package name="fribidi"/>
+               <package name="make"/>
+               <package name="grub"/>
+               <package name="bootsplash"/>
+               <package name="bootsplash-theme-SuSE-SLES"/>
+               <package name="eject"/>
+       </packages>
+       <packages type="boot">
+               <package name="filesystem"/>
+               <package name="glibc-locale"/>
+       </packages>
+       <packages type="delete">
+               <package name="perl"/>
+               <package name="glibc-locale"/>
+               <package name="man"/>
+               <package name="info"/>
+               <package name="smart"/>
+               <package name="python"/>
+               <package name="python-xml"/>
+               <package name="python-elementtree"/>
+               <package name="perl-gettext"/>
+               <package name="perl-Bootloader"/>
+               <package name="pam-modules"/>
+               <package name="gawk"/>
+               <package name="gnome-filesystem"/>
+               <package name="openslp"/>
+               <package name="rpm-python"/>
+               <package name="suse-build-key"/>
+               <package name="permissions"/>
+               <package name="fillup"/>
+               <package name="pam"/>
+               <package name="expat"/>
+               <package name="suse-release"/>
+               <package name="libxml2"/>
+               <package name="openldap2-client"/>
+               <package name="logrotate"/>
+               <package name="diffutils"/>
+               <package name="cpio"/>
+               <package name="insserv"/>
+               <package name="ash"/>
+               <package name="gdbm"/>
+               <package name="gfxboot"/>
+               <package name="fribidi"/>
+               <package name="make"/>
+       </packages>
+</image>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/images.sh 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/images.sh
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/images.sh  1970-01-01 
01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/images.sh  2007-11-02 
16:20:42.000000000 +0100
@@ -0,0 +1,29 @@
+#!/bin/sh
+test -f /.kconfig && . /.kconfig
+test -f /.profile && . /.profile
+
+echo "Configure image: [$name]..."
+
+#==========================================
+# setup gfxboot
+#------------------------------------------
+suseGFXBoot SLES grub
+
+#==========================================
+# remove unneeded packages
+#------------------------------------------
+for i in `baseGetPackagesForDeletion`;do
+       rpm -e $i --nodeps
+done
+
+#==========================================
+# remove unneeded files
+#------------------------------------------
+suseStripInitrd
+
+#==========================================
+# umount /proc
+#------------------------------------------
+umount /proc
+
+exit 0
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/include 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/include
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/include       
1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/include       
2007-11-02 16:51:13.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to /usr/share/kiwi/modules/KIWILinuxRC.sh
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/linuxrc 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/linuxrc
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/linuxrc       
1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/linuxrc       
2007-11-02 16:51:13.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to ../../suse-linuxrc
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn 
--exclude=.svnignore 
old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/preinit 
new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/preinit
--- old/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/preinit       
1970-01-01 01:00:00.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-SLES10-SP1-smp/root/preinit       
2007-11-02 16:51:13.000000000 +0100
@@ -0,0 +1 @@
+symbolic link to ../../suse-preinit


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx