Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Sep 19 17:32:36 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-09-09 15:00:09.000000000 +0200 +++ kiwi/kiwi.changes 2011-09-16 14:14:52.000000000 +0200 @@ -1,0 +2,82 @@ +Fri Sep 16 14:00:36 CEST 2011 - [email protected] + +- v4.97.1 released + +------------------------------------------------------------------- +Fri Sep 16 11:52:11 CEST 2011 - [email protected] + +- fixed baseSetRunlevel() to work with systemd as well + +------------------------------------------------------------------- +Fri Sep 16 11:49:34 CEST 2011 - [email protected] + +- don't use fuser -k to kill the debug shell, that could cause + the kill of other important processes like the fuse clicfs + +------------------------------------------------------------------- +Fri Sep 16 11:24:31 CEST 2011 - [email protected] + +- allow default path search for --init-cache too + +------------------------------------------------------------------- +Fri Sep 16 10:05:04 CEST 2011 - [email protected] + +- removed local s390 suse repo + +------------------------------------------------------------------- +Fri Sep 16 10:04:17 CEST 2011 - [email protected] + +- added SLE11 SP2 SDK repo for s390 boot images in order to receive + the kiwi-tools package from there + +------------------------------------------------------------------- +Tue Sep 13 21:10:17 CEST 2011 - [email protected] + +- allow installation via the kiwi install image into a ramdisk. + In order to activate this feature one has to specify the + following on the kernel commandline: 'ramdisk=1' The size + of the ramdisk can be set by ramdisk_size=<value-in-byte> + This fixes bug (bnc #717499) + +------------------------------------------------------------------- +Mon Sep 12 19:21:15 CEST 2011 - [email protected] + +- removed local x86 suse and rhel repo + +------------------------------------------------------------------- +Mon Sep 12 18:09:40 CEST 2011 - [email protected] + +- added 11.4 remote repo for oemboot + +------------------------------------------------------------------- +Mon Sep 12 17:52:37 CEST 2011 - [email protected] + +- moved RHEL5 repo from local to remote + +------------------------------------------------------------------- +Mon Sep 12 17:47:24 CEST 2011 - [email protected] + +- moved SLE11 repo from local to remote + +------------------------------------------------------------------- +Mon Sep 12 17:46:05 CEST 2011 - [email protected] + +- removed local kiwi repo from ppc boot images. There are + no ppc packages provided in a repo by kiwi + +------------------------------------------------------------------- +Mon Sep 12 17:32:32 CEST 2011 - [email protected] + +- moved SLE10 repo from local to remote + +------------------------------------------------------------------- +Mon Sep 12 16:42:04 CEST 2011 - [email protected] + +- fixed __getPartID reg exp (bnc #716718) + +------------------------------------------------------------------- +Sun Sep 11 20:19:12 CEST 2011 - [email protected] + +- more colorful list image output + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.KyXAjg/_old 2011-09-19 17:32:25.000000000 +0200 +++ /var/tmp/diff_new_pack.KyXAjg/_new 2011-09-19 17:32:25.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.96.1 +Version: 4.97.1 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi-repo.tar.bz2 ++++++ kiwi/kiwi-repo.tar.bz2 kiwi/kiwi-repo.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/.revision 2011-09-16 14:03:53.000000000 +0200 @@ -1 +1 @@ -d554aae73da6e58d54acf288930a447773d6d664 +2f9955419b6b08fa443dfa7925b43278239ec0b5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/kiwi.pl 2011-09-16 14:03:53.000000000 +0200 @@ -1051,6 +1051,12 @@ } $Build =~ s/\/$//; } + if (defined $InitCache) { + if (($InitCache !~ /^\//) && (! -d $InitCache)) { + $InitCache = $gdata->{System}."/".$InitCache; + } + $InitCache =~ s/\/$//; + } #======================================== # store uniq path to image description #---------------------------------------- @@ -1513,7 +1519,7 @@ "$system/$image" ); if ($controlFile) { - $kiwi -> info ("* ".$image."\n"); + $kiwi -> info ("* \033[1;32m".$image."\033[m\017\n"); my $xml = new KIWIXML ( $kiwi,$system."/".$image,undef,undef,$cmdL ); 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 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-09-16 10:07:37.000000000 +0200 @@ -5280,7 +5280,7 @@ my $fd = new FileHandle; if ($fd -> open ("parted -m $disk print | cut -f1,7 -d:|")) { while (my $line = <$fd>) { - if ($line =~ /^(\d):$flag/) { + if ($line =~ /^(\d):[ ,]*$flag/) { return $1; } } 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 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2011-09-16 14:03:53.000000000 +0200 @@ -1574,6 +1574,11 @@ 1|2|3|5) sed -i "s/id:[0123456]:initdefault:/id:$RUNLEVEL:initdefault:/" \ /etc/inittab + if test -d /etc/systemd/system; then + ln -sf \ + /lib/systemd/system/runlevel$RUNLEVEL.target \ + /etc/systemd/system/default.target + fi ;; *) echo "Invalid runlevel argument: $RUNLEVEL" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm new/kiwi/modules/KIWIGlobals.pm --- old/kiwi/modules/KIWIGlobals.pm 2011-09-09 14:16:42.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-09-16 14:03:53.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.96.1"; + $data{Version} = "4.97.1"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de";; $data{ConfigName} = "config.xml"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWILinuxRC.sh new/kiwi/modules/KIWILinuxRC.sh --- old/kiwi/modules/KIWILinuxRC.sh 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-09-16 14:03:53.000000000 +0200 @@ -4252,7 +4252,11 @@ modfile=/etc/modprobe.conf.local fi if [ -f $modfile ];then - sed -i -e s"@rd_size=.*@rd_size=$ramdisk_size@" $modfile + if grep -q rd_size $modfile;then + sed -i -e s"@rd_size=.*@rd_size=$ramdisk_size@" $modfile + else + echo "options brd rd_size=$ramdisk_size" >> $modfile + fi fi fi if [ ! -z "$lang" ];then @@ -5009,6 +5013,8 @@ if [ -z "$kiwistderr" ] && [ ! -z $kiwidebug ];then Echo "Starting boot shell on $ELOG_BOOTSHELL" setctsid -f $ELOG_BOOTSHELL /bin/bash -i + ELOGSHELL_PID=$(fuser $ELOG_BOOTSHELL | tr -d " ") + echo ELOGSHELL_PID=$ELOGSHELL_PID >> /iprocs fi } #====================================== @@ -5023,9 +5029,9 @@ mount -t proc proc /proc umountProc=1 fi - if [ -z "$kiwistderr" ];then + if [ ! -z "$ELOGSHELL_PID" ];then Echo "Stopping boot shell" - fuser -k $ELOG_BOOTSHELL >/dev/null + kill $ELOGSHELL_PID &>/dev/null fi if [ $umountProc -eq 1 ];then umount /proc @@ -6191,6 +6197,10 @@ fi echo $1"-part"$2 return + elif echo $1 | grep -q "^\/dev\/ram";then + name=$(echo $1 | tr -d /dev) + echo /dev/mapper/${name}p$2 + return fi local lastc=$(echo $1 | sed -e 's@\(^.*\)\(.$\)@\2@') if echo $lastc | grep -qP "^\d+$";then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml new/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml --- old/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml 2011-09-07 11:42:59.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/rhel-05.4/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -62,7 +62,7 @@ <source path="iso:///image/CDs/RHEL-5.4-%arch-DVD.iso/Server"/> </repository> <repository type="rpm-md" status="fixed" priority="1"> - <source path="/usr/share/kiwi/repo/rhel-repo/rhel-054-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/rhel-054/RedHat_RHEL-5"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -53,7 +53,7 @@ <source path="/mounts/machcd2/dists/full-sle10-sp2-%arch"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> @@ -84,7 +84,7 @@ <package name="gfxboot"/> <package name="syslinux"/> <package name="make"/> - <package name="memtest86"/> + <package name="memtest86+"/> <package name="hdparm"/> <package name="grub"/> <package name="bootsplash"/> @@ -126,6 +126,6 @@ <package name="syslinux"/> <package name="gfxboot"/> <package name="make"/> - <package name="memtest86"/> + <package name="memtest86+"/> </packages> </image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLED11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -70,7 +70,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -53,7 +53,7 @@ <source path="/mounts/machcd2/dists/full-sle10-sp2-%arch"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> @@ -85,7 +85,7 @@ <package name="gfxboot"/> <package name="syslinux"/> <package name="make"/> - <package name="memtest86"/> + <package name="memtest86+"/> <package name="hdparm"/> <package name="grub"/> <package name="bootsplash"/> @@ -132,6 +132,6 @@ <package name="syslinux"/> <package name="gfxboot"/> <package name="make"/> - <package name="memtest86"/> + <package name="memtest86+"/> </packages> </image> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -70,7 +70,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-11.3/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -139,7 +139,7 @@ <source path="/image/CDs/full-11.3-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml 2011-08-23 10:25:54.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -56,7 +56,7 @@ <source path="ftp://dist.suse.de/install/SLP/SLED-10-SP2-GMC/%arch/DVD1"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLED11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -133,7 +133,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml 2011-08-23 10:25:54.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -56,7 +56,7 @@ <source path="ftp://dist.suse.de/install/SLP/SLES-10-SP2-GMC/%arch/DVD1"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -133,7 +133,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -28,6 +28,7 @@ <file name="drivers/hwmon/*"/> <file name="drivers/acpi/*"/> <file name="drivers/virtio/*"/> + <file name="drivers/block/brd.ko"/> <file name="drivers/block/cciss.ko"/> <file name="drivers/block/virtio_blk.ko"/> <file name="drivers/char/hw_random/virtio-rng.ko"/> @@ -82,7 +83,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -28,6 +28,7 @@ <file name="drivers/hwmon/*"/> <file name="drivers/acpi/*"/> <file name="drivers/virtio/*"/> + <file name="drivers/block/brd.ko"/> <file name="drivers/block/cciss.ko"/> <file name="drivers/block/virtio_blk.ko"/> <file name="drivers/char/hw_random/virtio-rng.ko"/> @@ -84,6 +85,9 @@ <repository type="yast2" status="replaceable"> <source path="/image/CDs/full-i386"/> </repository> + <repository type="rpm-md" status="fixed"> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-11.4/openSUSE_11.4"/> + </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> </packages> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -28,6 +28,7 @@ <file name="drivers/hwmon/*"/> <file name="drivers/acpi/*"/> <file name="drivers/virtio/*"/> + <file name="drivers/block/brd.ko"/> <file name="drivers/block/cciss.ko"/> <file name="drivers/block/virtio_blk.ko"/> <file name="drivers/char/hw_random/virtio-rng.ko"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -59,7 +59,7 @@ <source path="ftp://dist.suse.de/install/SLP/SLED-10-SP2-GMC/%arch/DVD1"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -30,6 +30,7 @@ <file name="drivers/acpi/*"/> <file name="drivers/usb/*"/> <file name="drivers/virtio/*"/> + <file name="drivers/block/brd.ko"/> <file name="drivers/block/cciss.ko"/> <file name="drivers/block/virtio_blk.ko"/> <file name="drivers/char/hw_random/virtio-rng.ko"/> @@ -73,7 +74,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -59,7 +59,7 @@ <source path="ftp://dist.suse.de/install/SLP/SLES-10-SP2-GMC/%arch/DVD1"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -30,6 +30,7 @@ <file name="drivers/acpi/*"/> <file name="drivers/usb/*"/> <file name="drivers/virtio/*"/> + <file name="drivers/block/brd.ko"/> <file name="drivers/block/cciss.ko"/> <file name="drivers/block/virtio_blk.ko"/> <file name="drivers/char/hw_random/virtio-rng.ko"/> @@ -73,7 +74,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2011-09-07 11:42:59.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2011-09-16 10:07:37.000000000 +0200 @@ -185,6 +185,9 @@ cut -f1 -d"("` fi export deviceDisks=`echo $deviceDisks` + if [ ! -z "$ramdisk" ];then + deviceDisks="$deviceDisks /dev/ram1" + fi if [ -z "$deviceDisks" ];then systemException \ "No device(s) for installation found... abort" \ @@ -777,6 +780,9 @@ #-------------------------------------- if [ -z "$OEM_PARTITION_INSTALL" ];then blockdev --rereadpt $imageDevice + if echo $imageDevice | grep -q "^\/dev\/ram";then + kpartx -a $imageDevice + fi deviceTest=$(ddn $imageDevice 1) if ! waitForStorageDevice $deviceTest;then systemException \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml new/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml --- old/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-05.4/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -62,7 +62,7 @@ <source path="iso:///image/CDs/RHEL-5.4-%arch-DVD.iso/Server"/> </repository> <repository type="rpm-md" status="fixed" priority="1"> - <source path="/usr/share/kiwi/repo/rhel-repo/rhel-054-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/rhel-054/RedHat_RHEL-5"/> </repository> <packages type="image" profiles="std"> <package name="kernel"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED10/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLED10/config.xml 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -52,7 +52,7 @@ <source path="/mounts/machcd2/dists/full-sle10-sp2-%arch"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLED11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -61,7 +61,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES10/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES10/config.xml 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES10/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -52,7 +52,7 @@ <source path="/mounts/machcd2/dists/full-sle10-sp2-%arch"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -61,7 +61,7 @@ <source path="/image/CDs/full-i386"/> </repository> <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle11/SLE_11_SP1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -127,10 +127,10 @@ <file name="drivers/net/yellowfin.ko"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="/image/CDs/full-ppc64"/> + <source path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/> </repository> - <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <repository type="yast2" status="fixed"> + <source path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -61,10 +61,10 @@ <file name="drivers/xen/*"/> </drivers> <repository type="yast2" status="replaceable"> - <source path="/image/CDs/full-i386"/> + <source path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/> </repository> - <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <repository type="yast2" status="fixed"> + <source path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -54,8 +54,8 @@ <repository type="yast2" status="replaceable"> <source path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/> </repository> - <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <repository type="yast2" status="fixed"> + <source path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/> </repository> <packages type="image" profiles="default"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -60,8 +60,8 @@ <repository type="yast2" status="replaceable"> <source path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/> </repository> - <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <repository type="yast2" status="fixed"> + <source path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -49,8 +49,8 @@ <repository type="yast2" status="replaceable"> <source path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/> </repository> - <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <repository type="yast2" status="fixed"> + <source path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml --- old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -46,8 +46,8 @@ <repository type="yast2" status="replaceable"> <source path="http://download.suse.de/install/SLP/SLES-11-SP1-GM/%arch/DVD1/"/> </repository> - <repository type="rpm-md" status="fixed"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle11-repo"/> + <repository type="yast2" status="fixed"> + <source path="http://download.suse.de/install/SLP/SLE-11-SP2-SDK-LATEST/%arch/DVD1"/> </repository> <packages type="image" profiles="std"> <package name="kernel-default"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-05.4-JeOS/config.xml new/kiwi/template/ix86/rhel-05.4-JeOS/config.xml --- old/kiwi/template/ix86/rhel-05.4-JeOS/config.xml 2011-09-07 11:43:00.000000000 +0200 +++ new/kiwi/template/ix86/rhel-05.4-JeOS/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -33,7 +33,7 @@ <source path="iso:///image/CDs/RHEL-5.4-%arch-DVD.iso/Server"/> </repository> <repository type="rpm-md"> - <source path="/usr/share/kiwi/repo/rhel-repo/rhel-054-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/rhel-054/RedHat_RHEL-5"/> </repository> <packages type="image"> <package name="grub"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/suse-SLE10-JeOS/config.xml new/kiwi/template/ix86/suse-SLE10-JeOS/config.xml --- old/kiwi/template/ix86/suse-SLE10-JeOS/config.xml 2011-04-08 14:27:57.000000000 +0200 +++ new/kiwi/template/ix86/suse-SLE10-JeOS/config.xml 2011-09-16 10:07:37.000000000 +0200 @@ -68,7 +68,7 @@ <source path="obs:///SUSE:SLE-10-SP2:GA/standard"/> </repository> <repository type="rpm-md"> - <source path="/usr/share/kiwi/repo/suse-repo/suse-sle10-repo"/> + <source path="http://download.opensuse.org/repositories/Virtualization:/Appliances:/suse-sle10/SLE_10_SDK"/> </repository> <packages type="bootstrap"> <package name="aaa_base"/> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
