Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Feb 18 13:16:26 CET 2011. -------- --- kiwi/kiwi.changes 2011-02-15 18:04:23.000000000 +0100 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-02-18 12:24:02.000000000 +0100 @@ -1,0 +2,64 @@ +Fri Feb 18 12:18:05 CET 2011 - ms@suse.de + +- v4.75 released + +------------------------------------------------------------------- +Fri Feb 18 11:45:08 CET 2011 - ms@suse.de + +- fixed default behavior for oem-swap. If not specified the default + should be to create a swap partition. This was accidently changed + +------------------------------------------------------------------- +Fri Feb 18 11:43:58 CET 2011 - ms@suse.de + +- DB: fixed description about default partitions created + +------------------------------------------------------------------- +Fri Feb 18 11:23:58 CET 2011 - ms@suse.de + +- allow creation of ec2 format even without credentials. In that + case only the adaptions to the root image will be made but the + ec2-bundle process will be skipped + +------------------------------------------------------------------- +Fri Feb 18 11:13:06 CET 2011 - ms@suse.de + +- fixed use of uninitialized value in squashfs version check + +------------------------------------------------------------------- +Fri Feb 18 11:09:56 CET 2011 - ms@suse.de + +- DB: update documentation according to the pxe raid feature change + +------------------------------------------------------------------- +Fri Feb 18 11:05:37 CET 2011 - ms@suse.de + +- changed raid 1 support for pxe images. The former implementation + can only use raid for the root partition. This implementation + allows a custom partition table to be mapped in one raid 1 per + partition + +------------------------------------------------------------------- +Wed Feb 16 17:40:37 CET 2011 - ms@suse.de + +- fixed linuxPartition() to be fine with a raid partition too + +------------------------------------------------------------------- +Wed Feb 16 16:44:08 CET 2011 - ms@suse.de + +- fixed raid partition setup. The wrong id was set. If there + is only one raid partition on the disk fdisk doesn't require + a number for the 't' command + +------------------------------------------------------------------- +Wed Feb 16 09:23:51 CET 2011 - ms@suse.de + +- DB: update documentation + +------------------------------------------------------------------- +Tue Feb 15 18:24:42 CET 2011 - ms@suse.de + +- restore copy of temporary files only if they are not provided + by the overlay tree. This affects /etc/hosts and /etc/resolv.conf + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.PZHyGl/_old 2011-02-18 13:15:48.000000000 +0100 +++ /var/tmp/diff_new_pack.PZHyGl/_new 2011-02-18 13:15:48.000000000 +0100 @@ -65,8 +65,8 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.74 -Release: 2 +Version: 4.75 +Release: 1 Group: System/Management License: GPLv2 Source: %{name}.tar.bz2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.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-02-15 11:04:07.000000000 +0100 +++ new/kiwi/.revision 2011-02-18 12:20:07.000000000 +0100 @@ -1 +1 @@ -2e43b9ad0d173a2dddd5e4625914b25e4da588d7 +a985c4bce3a6fa4b151d98f0536adda5165c1deb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2011-02-15 11:04:07.000000000 +0100 +++ new/kiwi/kiwi.pl 2011-02-18 12:20:07.000000000 +0100 @@ -47,7 +47,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.74"; +our $Version = "4.75"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de"; our $openSUSE = "http://download.opensuse.org"; @@ -2364,25 +2364,27 @@ #------------------------------------------ if ($check_mksquashfs) { my $km = glob ("$root/lib/modules/*/kernel/fs/squashfs/squashfs.ko"); - my $mktool_vs = qxx ("mksquashfs -version 2>&1 | head -n 1"); - my $module_vs = qxx ("modinfo -d $km 2>&1"); - my $error = 0; - if ($mktool_vs =~ /^mksquashfs version (\d\.\d) \(/) { - $mktool_vs = $1; - $error++; - } - if ($module_vs =~ /^squashfs (\d\.\d),/) { - $module_vs = $1; - $error++; - } - $kiwi -> loginfo ("squashfs mktool version: $mktool_vs\n"); - $kiwi -> loginfo ("squashfs module version: $module_vs\n"); - if (($error == 2) && ($mktool_vs ne $module_vs)) { - $kiwi -> error ( - "--> squashfs tool/driver mismatch: $mktool_vs vs $module_vs" - ); - $kiwi -> failed (); - return undef; + if ($km) { + my $mktool_vs = qxx ("mksquashfs -version 2>&1 | head -n 1"); + my $module_vs = qxx ("modinfo -d $km 2>&1"); + my $error = 0; + if ($mktool_vs =~ /^mksquashfs version (\d\.\d) \(/) { + $mktool_vs = $1; + $error++; + } + if ($module_vs =~ /^squashfs (\d\.\d),/) { + $module_vs = $1; + $error++; + } + $kiwi -> loginfo ("squashfs mktool version: $mktool_vs\n"); + $kiwi -> loginfo ("squashfs module version: $module_vs\n"); + if (($error == 2) && ($mktool_vs ne $module_vs)) { + $kiwi -> error ( + "--> squashfs tool/driver mismatch: $mktool_vs vs $module_vs" + ); + $kiwi -> failed (); + return undef; + } } } #========================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIImageFormat.pm new/kiwi/modules/KIWIImageFormat.pm --- old/kiwi/modules/KIWIImageFormat.pm 2011-02-07 14:45:57.000000000 +0100 +++ new/kiwi/modules/KIWIImageFormat.pm 2011-02-18 12:20:07.000000000 +0100 @@ -380,7 +380,7 @@ #========================================== # Check AWS account information #------------------------------------------ - $kiwi -> info ("Creating $format image..."); + $kiwi -> info ("Creating $format image...\n"); $target =~ s/\/$//; $target .= ".$format"; $aminame.= ".ami"; @@ -388,33 +388,29 @@ my $arch = qxx ("uname -m"); chomp ( $arch ); my %type = %{$xml->getImageTypeAndAttributes()}; my %ec2 = $xml->getEc2Config(); + my $have_account = 1; if (! defined $ec2{AWSAccountNr}) { - $kiwi -> failed (); - $kiwi -> error ("Missing AWS account number"); - $kiwi -> failed (); - return undef; + $kiwi -> warning ("Missing AWS account number"); + $kiwi -> skipped (); + $have_account = 0; } if (! defined $ec2{EC2CertFile}) { - $kiwi -> failed (); - $kiwi -> error ("Missing AWS user's PEM encoded RSA pubkey cert file"); - $kiwi -> failed (); - return undef; + $kiwi -> warning ("Missing AWS user's PEM encoded RSA pubkey cert file"); + $kiwi -> skipped (); + $have_account = 0; } elsif (! -f $ec2{EC2CertFile}) { - $kiwi -> failed (); - $kiwi -> error ("EC2 file: $ec2{EC2CertFile} does not exist"); - $kiwi -> failed (); - return undef; + $kiwi -> warning ("EC2 file: $ec2{EC2CertFile} does not exist"); + $kiwi -> skipped (); + $have_account = 0; } if (! defined $ec2{EC2PrivateKeyFile}) { - $kiwi -> failed (); - $kiwi -> error ("Missing AWS user's PEM encoded RSA private key file"); - $kiwi -> failed (); - return undef; + $kiwi -> warning ("Missing AWS user's PEM encoded RSA private key file"); + $kiwi -> skipped (); + $have_account = 0; } elsif (! -f $ec2{EC2PrivateKeyFile}) { - $kiwi -> failed (); - $kiwi -> error ("EC2 file: $ec2{EC2PrivateKeyFile} does not exist"); - $kiwi -> failed (); - return undef; + $kiwi -> warning ("EC2 file: $ec2{EC2PrivateKeyFile} does not exist"); + $kiwi -> skipped (); + $have_account = 0; } if ($arch =~ /i.86/) { $arch = "i386"; @@ -604,6 +600,11 @@ #========================================== # call ec2-bundle-image (Amazon toolkit) #------------------------------------------ + if ($have_account == 0) { + $kiwi -> warning ("EC2 bundle creation skipped due to missing credentials"); + $kiwi -> skipped (); + return $source; + } my $pk = $ec2{EC2PrivateKeyFile}; my $ca = $ec2{EC2CertFile}; my $nr = $ec2{AWSAccountNr}; 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-01-28 15:48:06.000000000 +0100 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-02-18 12:20:07.000000000 +0100 @@ -1208,7 +1208,7 @@ # check for device by ID #-------------------------------------- local diskByID=`getDiskID $rdev` - local swapByID=`getDiskID $swap` + local swapByID=`getDiskID $swap swap` #====================================== # check for boot image .profile #-------------------------------------- @@ -1409,7 +1409,7 @@ # check for device by ID #-------------------------------------- local diskByID=`getDiskID $rdev` - local swapByID=`getDiskID $swap` + local swapByID=`getDiskID $swap swap` #====================================== # check for boot image .profile #-------------------------------------- @@ -1642,7 +1642,7 @@ # check for device by ID #-------------------------------------- local diskByID=`getDiskID $rdev` - local swapByID=`getDiskID $swap` + local swapByID=`getDiskID $swap swap` #====================================== # check for boot image .profile #-------------------------------------- @@ -1907,7 +1907,7 @@ # check for device by ID #-------------------------------------- local diskByID=`getDiskID $rdev` - local swapByID=`getDiskID $swap` + local swapByID=`getDiskID $swap swap` #====================================== # check for boot image .profile #-------------------------------------- @@ -3584,7 +3584,7 @@ # ---- local diskDevice=$1 local diskPartitionType=`partitionID $diskDevice 2` - if test "$diskPartitionType" = "83";then + if [ "$diskPartitionType" = "83" ] || [ "$diskPartitionType" = "fd" ];then return 0 fi return 1 @@ -4817,6 +4817,7 @@ # name into the udev ID based representation # ---- local device=$1 + local swap=$2 if [ -z "$device" ];then return fi @@ -4824,6 +4825,10 @@ echo $device return fi + if [ -z "$swap" ] && echo $device | grep -q "dev\/md"; then + echo $device + return + fi for i in /dev/disk/by-id/*;do if [ -z "$i" ];then continue @@ -6022,6 +6027,14 @@ index=$(($index + 1)) fi ;; + "t") + partid=${pcmds[$index + 1]} + if ! echo $partid | grep -q "^[0-4]$";then + # make sure there is a ID set for the type + index_fix=$(($index_fix + 1)) + pcmds_fix[$index_fix]=1 + fi + ;; esac index=$(($index + 1)) index_fix=$(($index_fix + 1)) @@ -6443,16 +6456,127 @@ fi if [ $count -eq 1 ];then echo -n "n p $count 1 $partSize " + if [ $partID = "82" ] || [ $partID = "8e" ];then + echo -n "t $partID " + fi else echo -n "n p $count . $partSize " + if [ $partID = "82" ] || [ $partID = "8e" ];then + echo -n "t $count $partID " + fi fi - if [ $partID = "82" ] || [ $partID = "8e" ];then + done + echo "w q" +} +#====================================== +# pxeRaidPartitionInput +#-------------------------------------- +function pxeRaidPartitionInput { + local field=0 + local count=0 + local IFS="," + for i in $PART;do + field=0 + count=$((count + 1)) + IFS=";" ; for n in $i;do + case $field in + 0) partSize=$n ; field=1 ;; + 1) partID=$n ; field=2 ;; + 2) partMount=$n; + esac + done + partSize=$(pxeSizeToMB $partSize) + partID=fd + if [ $count -eq 1 ];then + echo -n "n p $count 1 $partSize " + echo -n "t $partID " + else + echo -n "n p $count . $partSize " echo -n "t $count $partID " fi done echo "w q" } #====================================== +# pxeRaidCreate +#-------------------------------------- +function pxeRaidCreate { + local count=0 + local mdcount=0 + local IFS="," + local raidFirst + local raidSecond + local conf=/mdadm.conf + touch $conf + for i in $PART;do + count=$((count + 1)) + raidFirst=$(ddn $raidDiskFirst $count) + raidSecond=$(ddn $raidDiskSecond $count) + if ! waitForStorageDevice $raidFirst;then + return + fi + if ! waitForStorageDevice $raidSecond;then + return + fi + mdadm --zero-superblock $raidFirst + mdadm --zero-superblock $raidSecond + yes | mdadm --create /dev/md$mdcount \ + --level=$raidLevel --raid-disks=2 $raidFirst $raidSecond + if [ ! $? = 0 ];then + systemException \ + "Failed to create raid array... fatal !" \ + "reboot" + fi + echo "DEVICE $raidFirst $raidSecond" >> $conf + echo "ARRAY /dev/md$mdcount devices=$raidFirst,$raidSecond" >> $conf + mdcount=$((mdcount + 1)) + done +} +#====================================== +# pxeRaidAssemble +#-------------------------------------- +function pxeRaidAssemble { + local count=0 + local mdcount=0 + local field=0 + local IFS=";" + local raidFirst + local raidSecond + for n in $RAID;do + case $field in + 0) raidLevel=$n ; field=1 ;; + 1) raidDiskFirst=$n ; field=2 ;; + 2) raidDiskSecond=$n; field=3 + esac + done + IFS="," + for i in $PART;do + count=$((count + 1)) + raidFirst=$(ddn $raidDiskFirst $count) + raidSecond=$(ddn $raidDiskSecond $count) + if ! waitForStorageDevice $raidFirst;then + return + fi + if ! waitForStorageDevice $raidSecond;then + return + fi + mdadm --assemble /dev/md$mdcount \ + $raidFirst $raidSecond + mdcount=$((mdcount + 1)) + done +} +#====================================== +# pxeRaidStop +#-------------------------------------- +function pxeRaidStop { + local count=0 + local IFS="," + for i in $PART;do + mdadm --stop /dev/md$count + count=$((count + 1)) + done +} +#====================================== # pxeSwapDevice #-------------------------------------- function pxeSwapDevice { @@ -6479,6 +6603,34 @@ done } #====================================== +# pxeRaidSwapDevice +#-------------------------------------- +function pxeRaidSwapDevice { + local field=0 + local count=0 + local mdcount=0 + local device + local IFS="," + for i in $PART;do + field=0 + count=$((count + 1)) + IFS=";" ; for n in $i;do + case $field in + 0) partSize=$n ; field=1 ;; + 1) partID=$n ; field=2 ;; + 2) partMount=$n; + esac + done + if test $partID = "82" -o $partID = "S";then + device=/dev/md$mdcount + waitForStorageDevice $device + echo $device + return + fi + mdcount=$((mdcount + 1)) + done +} +#====================================== # pxeBootDevice #-------------------------------------- function pxeBootDevice { diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm --- old/kiwi/modules/KIWIRoot.pm 2011-02-11 14:21:47.000000000 +0100 +++ new/kiwi/modules/KIWIRoot.pm 2011-02-16 09:32:37.000000000 +0100 @@ -1015,22 +1015,28 @@ #======================================== # cleanup temporary copy of resolv.conf #---------------------------------------- - if ((-f "$root/etc/resolv.conf") && (-f "/etc/resolv.conf")) { - my $data = qxx ("diff -q /etc/resolv.conf $root/etc/resolv.conf"); - my $code = $? >> 8; - if ($code == 0) { - $kiwi -> info ("Cleanup temporary copy of resolv.conf"); - qxx ("rm -f $root/etc/resolv.conf"); - $kiwi -> done (); + if (! -e "$imageDesc/root/etc/resolv.conf") { + # restore only if overlay tree doesn't contain a resolv.conf + if ((-f "$root/etc/resolv.conf") && (-f "/etc/resolv.conf")) { + my $data = qxx ("diff -q /etc/resolv.conf $root/etc/resolv.conf"); + my $code = $? >> 8; + if ($code == 0) { + $kiwi -> info ("Cleanup temporary copy of resolv.conf"); + qxx ("rm -f $root/etc/resolv.conf"); + $kiwi -> done (); + } } } #======================================== # cleanup temporary copy of hosts #---------------------------------------- - if (-f "$root/etc/hosts.rpmnew") { - $kiwi -> info ("Cleanup temporary copy of hosts"); - qxx ("mv $root/etc/hosts.rpmnew $root/etc/hosts"); - $kiwi -> done (); + if (! -e "$imageDesc/root/etc/hosts") { + # restore only if overlay tree doesn't contain a hosts + if (-f "$root/etc/hosts.rpmnew") { + $kiwi -> info ("Cleanup temporary copy of hosts"); + qxx ("mv $root/etc/hosts.rpmnew $root/etc/hosts"); + $kiwi -> done (); + } } #======================================== # cleanup temporary .buildenv 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 2011-02-11 14:21:47.000000000 +0100 +++ new/kiwi/modules/KIWIXML.pm 2011-02-18 12:20:07.000000000 +0100 @@ -2269,8 +2269,8 @@ if ((defined $oempinst) && ("$oempinst" eq "true")) { $result{kiwi_oempartition_install} = $oempinst; } - if ((defined $oemswap) && ("$oemswap" eq "true")) { - $result{kiwi_oemswap} = $oemswap; + if ("$oemswap" ne "false") { + $result{kiwi_oemswap} = "true"; if ((defined $oemswapMB) && ("$oemswapMB" ne "") && (int($oemswapMB) > 0) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-02-11 14:21:47.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-02-18 12:20:07.000000000 +0100 @@ -289,9 +289,12 @@ fi #====================================== -# 12) Check for installed system +# 13) Check for installed system #-------------------------------------- if [ $LOCAL_BOOT = "no" ] && [ $haveDisk = "1" ];then + if [ ! -z "$RAID" ];then + pxeRaidAssemble + fi IMAGE_FIRST=$(echo $IMAGE | cut -f1 -d,) for i in $IMAGE_FIRST;do field=0 @@ -302,19 +305,6 @@ 2) imageVersion=$n; field=3 esac done - if [ ! -z "$RAID" ];then - field=0 - IFS=";" ; for n in $RAID;do - case $field in - 0) raidLevel=$n ; field=1 ;; - 1) raidFirst=$n ; field=2 ;; - 2) raidSecond=$n; field=3 - esac - done - IFS=$IFS_ORIG - mdadm --assemble $imageDevice \ - $raidFirst $raidSecond - fi updateNeeded initialize if linuxPartition $imageDiskDevice;then if mountSystem $imageDevice;then @@ -334,9 +324,6 @@ else systemIntegrity="clean" fi - if [ $systemIntegrity = "fine" ] && [ ! -z "$RAID" ];then - mdadm --stop $imageDevice - fi done fi @@ -349,26 +336,26 @@ # Create partition table #-------------------------------------- Echo "Creating partition table..." - cleanPartitionTable - createPartitionerInput $(pxePartitionInput) - callPartitioner $input - if [ ! -z "$RAID" ];then + if [ -z "$RAID" ];then #====================================== - # Setup raid partitions + # Standard table + #-------------------------------------- + cleanPartitionTable + createPartitionerInput $(pxePartitionInput) + callPartitioner $input + else + #====================================== + # Raid1 table #-------------------------------------- field=0 IFS=";" ; for n in $RAID;do case $field in - 0) raidLevel=$n ; field=1 ;; - 1) raidFirst=$n ; field=2 ;; - 2) raidSecond=$n; field=3 + 0) raidLevel=$n ; field=1 ;; + 1) raidDiskFirst=$n ; field=2 ;; + 2) raidDiskSecond=$n; field=3 esac done IFS=$IFS_ORIG - raidDiskFirst=$(dn $raidFirst) - raidDiskSecond=$(dn $raidSecond) - raidIDFirst=$(nd $raidFirst) - raidIDSecond=$(nd $raidSecond) #====================================== # wait for raid disks to appear #-------------------------------------- @@ -382,47 +369,34 @@ "Disk $raidDiskSecond doesn't appear... fatal !" \ "reboot" fi - rm -f $input - imageDiskDevice=$raidDiskFirst - createPartitionerInput n p $raidIDFirst . . t $raidIDFirst fd - callPartitioner $input - rm -f $input - imageDiskDevice=$raidDiskSecond - cleanPartitionTable - createPartitionerInput n p $raidIDSecond . . t $raidIDSecond fd - callPartitioner $input - rm -f $input #====================================== - # wait for raid partitions to appear + # stop eventually assembled raid #-------------------------------------- - if ! waitForStorageDevice $raidFirst;then - systemException \ - "Disk $raidFirst doesn't appear... fatal !" \ - "reboot" - fi - if ! waitForStorageDevice $raidSecond;then - systemException \ - "Disk $raidSecond doesn't appear... fatal !" \ - "reboot" - fi + pxeRaidStop + #====================================== + # call partitioner on each raid disk + #-------------------------------------- + for raid_dev in $raidDiskFirst $raidDiskSecond;do + imageDiskDevice=$raid_dev + rm -f $input + cleanPartitionTable + createPartitionerInput $(pxeRaidPartitionInput) + callPartitioner $input + done imageDiskDevice=$DISK #====================================== # Create raid array #-------------------------------------- - mdadm --zero-superblock $raidFirst - mdadm --zero-superblock $raidSecond - yes | mdadm --create /dev/md0 \ - --level=$raidLevel --raid-disks=2 $raidFirst $raidSecond - if [ ! $? = 0 ];then - systemException \ - "Failed to create raid array... fatal !" \ - "reboot" - fi + pxeRaidCreate fi #====================================== # Setup swap space if requested #-------------------------------------- - export imageSwapDevice=$(pxeSwapDevice) + if [ -z "$RAID" ];then + export imageSwapDevice=$(pxeSwapDevice) + else + export imageSwapDevice=$(pxeRaidSwapDevice) + fi if [ ! -z "$imageSwapDevice" ];then if ! mkswap $imageSwapDevice 1>&2;then systemException "Failed to create swap signature" "reboot" @@ -431,9 +405,11 @@ #====================================== # Setup boot space if requested #-------------------------------------- - export imageBootDevice=$(pxeBootDevice) - if [ ! -z "$imageBootDevice" ];then - createFilesystem $imageBootDevice + if [ -z "$RAID" ];then + export imageBootDevice=$(pxeBootDevice) + if [ ! -z "$imageBootDevice" ];then + createFilesystem $imageBootDevice + fi fi runHook postpartition fi @@ -774,6 +750,14 @@ rm -rf /mnt/boot/* && mount $imageBootDevice /mnt/boot cd /mnt/boot && tar -xf /tmp/boot.tgz rm -f /tmp/boot.tgz +else + export bootid=$(nd $imageRootDevice) +fi +if [ ! -z "$RAID" ];then + # raid md devices start with 0 but partition id's start with 1 + bootid=$((bootid + 1)) + # make mdadm.conf available in system image + cp /mdadm.conf /mnt/etc fi #====================================== @@ -847,8 +831,8 @@ setupDefaultPXENetwork /config setupDefaultFstab /config updateRootDeviceFstab /config "$imageRootDevice" - if test ! -z $DISK;then - updateSwapDeviceFstab /config ${DISK}1 + if [ ! -z "$DISK" ];then + updateSwapDeviceFstab /config $imageSwapDevice updateOtherDeviceFstab /config setupBootLoader /mnt /config $(($bootid - 1)) \ $imageRootDevice NET $imageSwapDevice Files old/kiwi/tools/dcounter/dcounter and new/kiwi/tools/dcounter/dcounter differ Files old/kiwi/tools/driveready/driveready and new/kiwi/tools/driveready/driveready differ Files old/kiwi/tools/startshell/startshell and new/kiwi/tools/startshell/startshell differ Files old/kiwi/tools/utimer/utimer and new/kiwi/tools/utimer/utimer differ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org