Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Jul 18 09:40:55 CEST 2011. -------- --- kiwi/kiwi.changes 2011-07-08 15:41:02.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-07-15 17:00:59.000000000 +0200 @@ -1,0 +2,93 @@ +Fri Jul 15 16:55:44 CEST 2011 - ms@suse.de + +- v4.93.1 released + +------------------------------------------------------------------- +Fri Jul 15 16:41:05 CEST 2011 - ms@suse.de + +- fixed installstick creation if sys|extlinux bootloader is + used. Also fixed size setup of install stick. Problem here + was that the uncompressed size of the raw install file was + used and not the compressed size which ends up in a too big + installstick image + +------------------------------------------------------------------- +Fri Jul 15 14:07:54 CEST 2011 - ms@suse.de + +- added support for hybrid installiso media. In order to create + the hybrid the attribute bootloader must be either set to + syslinux or extlinux + +------------------------------------------------------------------- +Thu Jul 14 16:51:43 CEST 2011 - ms@suse.de + +- moved zypper version check outside of the loop. It's enough + to check this one time + +------------------------------------------------------------------- +Thu Jul 14 16:34:56 CEST 2011 - ms@suse.de + +- improve the OpenNebula example. I recently created a separate + package for the OpenNebula Web-UI server (sunstone) and with + the package "cleanup/separation" from the main opennebula package + showing how to use the Web-UI is easier now. + +------------------------------------------------------------------- +Thu Jul 14 16:13:02 CEST 2011 - ms@suse.de + +- use the --one-file-system option for tar when copying the + system image tree. This prevents the copy of files existing + beyond the local filesystem (bnc #705717) + +------------------------------------------------------------------- +Thu Jul 14 16:04:19 CEST 2011 - ms@suse.de + +- added log information if a hijacked command is called. + That check only works inside the studio environment were + a hijacked command has 'cmd'_real replacement. + +------------------------------------------------------------------- +Thu Jul 14 16:03:16 CEST 2011 - ms@suse.de + +- fixed use of uninitialized value $ENV{'HOME'} (bnc #705717) + +------------------------------------------------------------------- +Thu Jul 14 15:38:47 CEST 2011 - ms@suse.de + +- added %post script for kiwi-templates which removes old JeOS + template directories for distros we no longer support a JeOS + image from. + +------------------------------------------------------------------- +Wed Jul 13 14:39:00 CEST 2011 - ms@suse.de + +- cleaned up relocateCatalog calls which does not receive + a parameter anymore. Also fixed return value of fixCatalog + function + +------------------------------------------------------------------- +Wed Jul 13 14:37:07 CEST 2011 - ms@suse.de + +- make sure relocateCatalog and fixCatalog is called + for SuSE installation media (bnc #705208) + +------------------------------------------------------------------- +Wed Jul 13 11:13:55 CEST 2011 - ms@suse.de + +- added README file to make github happy + +------------------------------------------------------------------- +Mon Jul 11 17:06:12 CEST 2011 - ms@suse.de + +- use predefined set of configuration settings if a bootcd + without system image was requested. The initrd itself doesn't + contain further XML information so we set vga to normal and + disabled the boot menu along with a boot timeout of zero + seconds (immediate boot) + +------------------------------------------------------------------- +Mon Jul 11 15:19:48 CEST 2011 - ms@suse.de + +- fixed --bootcd creation mode + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.WHjlMe/_old 2011-07-18 09:34:58.000000000 +0200 +++ /var/tmp/diff_new_pack.WHjlMe/_new 2011-07-18 09:34:58.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.92.2 +Version: 4.93.1 Release: 1 Group: System/Management License: GPLv2 @@ -362,6 +362,14 @@ fi %endif +%post -n kiwi-templates +#============================================================ +# Clean up old old template directories if the exists +oldDists=( 10.1 10.2 10.3 11.0 11.1 11.2 ) +for dist in ${oldDists[@]};do + rm -rf /usr/share/kiwi/image/suse-$dist-JeOS +done + %clean rm -rf $RPM_BUILD_ROOT #================================================= ++++++ 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-06-12 21:49:13.000000000 +0200 +++ new/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200 @@ -1 +1 @@ -ee597b3cb48ce426edff219edf7d46e6dec145f2 +6f33406e6824b28c1038daf9e023dab8a227aea8 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/README new/kiwi/README --- old/kiwi/README 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/README 2011-07-15 16:58:11.000000000 +0200 @@ -0,0 +1,44 @@ +KIWI +==== + +The openSUSE KIWI Image System provides a complete operating +system image solution for Linux supported hardware platforms as +well as for virtualization systems like Xen, VMware, etc. The KIWI +architecture was designed as a two level system. The first stage, +based on a valid software package source, creates a so called +unpacked image according to the provided image description. +The second stage creates from a required unpacked image an +operating system image. The result of the second stage is called +a packed image or short an image. + +Installation +------------ + +packages for kiwi are provided at the openSUSE buildservice: +http://download.opensuse.org/repositories/Virtualization:/Appliances/ + +Usage +----- + +* make sure you have the kiwi-templates package installed +* build a live ISO example: + + kiwi --build suse-XXX-JeOS -d /tmp/myimage --type iso + +* run your OS in a VM like kvm + + kvm -cdrom /tmp/myimage/*.iso + +Contributing +------------ + +1. Fork it. +2. Create a branch (`git checkout -b my_kiwi`) +3. Commit your changes (`git commit -am "Added Snarkdown"`) +4. Push to the branch (`git push origin my_kiwi`) +5. Create an [Issue][1] with a link to your branch +6. Enjoy a refreshing Diet Coke and wait + +also see the git-review gem + +Remember to have fun :) 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-07-01 16:20:06.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-07-15 16:58:11.000000000 +0200 @@ -658,6 +658,7 @@ my %type; my $haveDiskDevice; my $version; + my $FD; #========================================== # Check for disk device #------------------------------------------ @@ -670,6 +671,19 @@ $this->{system} = $system; } #========================================== + # read MBR disk label + #------------------------------------------ + if (! open $FD,"dd 2>/dev/null if=$system bs=1 count=4 skip=\$((0x1b8))|") { + $kiwi -> error ("Couldn't open: $system: $!"); + $kiwi -> failed (); + return undef; + } + my $mbrid = sprintf "0x%08x", unpack "V", <$FD>; + if (($this->{mbrid}) && ($mbrid ne $this->{mbrid})) { + $this->{mbrid} = $mbrid; + } + close $FD; + #========================================== # read config XML attributes #------------------------------------------ if (defined $xml) { @@ -690,7 +704,12 @@ #========================================== # create tmp directory #------------------------------------------ - my $basedir = dirname ($system); + my $basedir; + if ($system) { + $basedir = dirname ($system); + } else { + $basedir = dirname ($initrd); + } $tmpdir = qxx ( "mktemp -q -d $basedir/kiwicdinst.XXXXXX" ); chomp $tmpdir; $result = $? >> 8; if ($result != 0) { @@ -711,7 +730,7 @@ #========================================== # check if system image is given #------------------------------------------ - if (! defined $system) { + if (! $system) { $system = $initrd; $gotsys = 0; } @@ -979,8 +998,13 @@ return undef; } $kiwi -> done (); + if ($bootloader =~ /(sys|ext)linux/) { + if (! $iso->createHybrid($this->{mbrid})) { + return undef; + } + } if ($arch !~ /ppc|ppc64/) { - if (! $iso -> relocateCatalog ($name)) { + if (! $iso -> relocateCatalog ()) { $iso -> cleanISO (); return undef; } @@ -1169,6 +1193,7 @@ } $kiwi -> done(); $system = $system.".squashfs"; + $vmsize = -s $system; } #========================================== # setup required disk size @@ -1251,15 +1276,21 @@ # create disk partitions #------------------------------------------ $kiwi -> info ("Create partition table for disk"); + my $partid = "83"; + if ($bootloader eq "syslinux" ) { + $partid = "c"; + } if ($gotsys) { @commands = ( "n","p","1",".","+".$irdsize."M", "n","p","2",".",".", + "t","1",$partid, "a","1","w","q" ); } else { @commands = ( "n","p","1",".",".", + "t","1",$partid, "a","1","w","q" ); } @@ -1334,17 +1365,23 @@ #------------------------------------------ foreach my $root ($boot,$data) { next if ! defined $root; - $kiwi -> info ("Creating ext3 filesystem on $root partition"); - my %FSopts = $main::global -> checkFSOptions( - @{$cmdL -> getFilesystemOptions()} - ); - my $fsopts = $FSopts{ext3}; - my $fstool = "mkfs.ext3"; - if (($root eq $data) && ($this->{inodes})) { - $fsopts.= " -N $this->{inodes}"; + if (($root eq $boot) && ($bootloader eq "syslinux")) { + $kiwi -> info ("Creating DOS boot filesystem"); + $status = qxx ("/sbin/mkdosfs $root 2>&1"); + $result = $? >> 8; + } else { + $kiwi -> info ("Creating ext3 filesystem on $root partition"); + my %FSopts = $main::global -> checkFSOptions( + @{$cmdL -> getFilesystemOptions()} + ); + my $fsopts = $FSopts{ext3}; + my $fstool = "mkfs.ext3"; + if (($root eq $data) && ($this->{inodes})) { + $fsopts.= " -N $this->{inodes}"; + } + $status = qxx ( "$fstool $fsopts $root 2>&1" ); + $result = $? >> 8; } - $status = qxx ( "$fstool $fsopts $root 2>&1" ); - $result = $? >> 8; if ($result != 0) { $kiwi -> failed (); $kiwi -> error ("Failed creating filesystem: $status"); @@ -2147,7 +2184,9 @@ # Copy root tree to disk #------------------------------------------ $kiwi -> info ("Copying system image tree on disk"); - $status = qxx ("tar -cf - -C $system . | tar -x -C $loopdir 2>&1"); + $status = qxx ( + "tar --one-file-system -cf - -C $system . | tar -x -C $loopdir 2>&1" + ); $result = $? >> 8; if ($result != 0) { $kiwi -> failed (); @@ -3065,15 +3104,30 @@ my $lvm = $this->{lvm}; my $vgroup = $this->{lvmgroup}; my $xml = $this->{xml}; - my %type = %{$xml->getImageTypeAndAttributes()}; - my $cmdline = $type{cmdline}; my $bloader = "grub"; + my $cmdline; + my %type; my $title; #========================================== # setup boot loader default boot label/nr #------------------------------------------ my $defaultBootLabel = $label; my $defaultBootNr = 0; + if ($xml) { + %type = %{$xml->getImageTypeAndAttributes()}; + $cmdline = $type{cmdline}; + } + if ($type =~ /^KIWI CD Boot/) { + # /.../ + # use predefined set of parameters for simple boot CD + # not including a system image + # ---- + $type{installboot} = "install"; + $type{boottimeout} = 1; + $type{fastboot} = 1; + $cmdline="kiwistderr=/dev/hvc0"; + $vga="normal"; + } if ((($type =~ /^KIWI (CD|USB)/)) && ($type{installboot})) { # In install mode we have the following menu layout # ---- @@ -3157,10 +3211,15 @@ print FD "color cyan/blue white/blue\n"; print FD "default $defaultBootNr\n"; my $bootTimeout = $type{boottimeout} ? int $type{boottimeout} : 10; + if ($type{fastboot}) { + $bootTimeout = 0; + } print FD "timeout $bootTimeout\n"; if ($type =~ /^KIWI (CD|USB)/) { my $dev = $1 eq 'CD' ? '(cd)' : '(hd0,0)'; - print FD "gfxmenu $dev/boot/message\n"; + if (! $type{fastboot}) { + print FD "gfxmenu $dev/boot/message\n"; + } print FD "title Boot from Hard Disk\n"; if ($dev eq '(cd)') { print FD " rootnoverify (hd0)\n"; @@ -3368,7 +3427,7 @@ print FD "append initrd=initrd "; print FD "vga=$vga loader=$bloader splash=silent "; print FD "ramdisk_size=512000 ramdisk_blocksize=4096 "; - print FD "cdinst=1"; + print FD "cdinst=1 kiwi_hybrid=1"; } elsif (($type=~ /^KIWI USB/)||($imgtype=~ /vmx|oem|split/)) { print FD "kernel /boot/linux.vmx\n"; print FD "append initrd=/boot/initrd.vmx "; @@ -3416,7 +3475,7 @@ print FD "append initrd=initrd "; print FD "vga=$vga loader=$bloader splash=silent "; print FD "ramdisk_size=512000 ramdisk_blocksize=4096 "; - print FD "cdinst=1"; + print FD "cdinst=1 kiwi_hybrid=1"; } elsif (($type=~ /^KIWI USB/)||($imgtype=~ /vmx|oem|split/)) { print FD "kernel /boot/linux.vmx\n"; print FD "append initrd=/boot/initrd.vmx "; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2011-06-07 10:46:56.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2011-07-15 16:58:11.000000000 +0200 @@ -671,6 +671,12 @@ else { $this->logMsg("I", "Created Iso image <$isoname>"); } + if (! $iso->relocateCatalog()) { + return 1; + } + if (! $iso->fixCatalog()) { + return 1; + } if ($hybridmedia) { if(!$iso->createHybrid()) { $this->logMsg("E", "Isohybrid call failed"); 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-07-08 15:37:36.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-07-15 16:58:11.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.92.2"; + $data{Version} = "4.93.1"; $data{Publisher} = "SUSE LINUX Products GmbH"; $data{Preparer} = "KIWI - http://kiwi.berlios.de"; $data{ConfigName} = "config.xml"; @@ -52,9 +52,9 @@ #============================================ # Read .kiwirc #-------------------------------------------- - my $file = "$ENV{'HOME'}/.kiwirc"; - if (! -f $file) { - $file = ".kiwirc"; + my $file = ".kiwirc"; + if (($ENV{'HOME'}) && (-f $ENV{'HOME'}."/.kiwirc")) { + $file = "$ENV{'HOME'}/.kiwirc"; } my $kiwi = new KIWILog("tiny"); if ( -f $file) { 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 2011-07-01 16:20:06.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2011-07-15 16:58:11.000000000 +0200 @@ -3212,7 +3212,9 @@ $kiwi -> info ("Copying physical to logical [$name]..."); my $free = qxx ("df -h $extend 2>&1"); $kiwi -> loginfo ("getSize: mount: $free\n"); - my $data = qxx ("tar -cf - -C $source . | tar -x -C $extend 2>&1"); + my $data = qxx ( + "tar --one-file-system -cf - -C $source . | tar -x -C $extend 2>&1" + ); my $code = $? >> 8; if ($code != 0) { $kiwi -> failed (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIIsoLinux.pm new/kiwi/modules/KIWIIsoLinux.pm --- old/kiwi/modules/KIWIIsoLinux.pm 2011-05-27 14:38:08.000000000 +0200 +++ new/kiwi/modules/KIWIIsoLinux.pm 2011-07-15 16:58:11.000000000 +0200 @@ -951,6 +951,7 @@ $kiwi -> skipped(); } close $ISO; + return $this; } #========================================== 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-07-08 15:37:36.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-07-15 16:58:11.000000000 +0200 @@ -3085,7 +3085,8 @@ function CDMount { # /.../ # search all CD/DVD drives and use the one we can find - # the CD configuration on + # the CD configuration on. This also includes hybrid + # devices which appears as a disk # ---- local count=0 local ecode=0 @@ -3097,7 +3098,7 @@ #====================================== # check for hybrid mbr ID #-------------------------------------- - if [ -z "$cdinst" ];then + if [ ! -z "$kiwi_hybrid" ];then searchBIOSBootDevice ecode=$? if [ ! $ecode = 0 ];then @@ -3106,8 +3107,6 @@ fi unset kiwi_hybrid fi - else - unset kiwi_hybrid fi #====================================== # walk through media @@ -3339,16 +3338,6 @@ pred=$curd done #====================================== - # Check for OEM ISO installation mode - #-------------------------------------- - if [ ! -z "$cdinst" ];then - CDMount - umount $cddev - curd=$cddev - export biosBootDevice=$curd - return 0 - fi - #====================================== # Search and copy all mbrid files #-------------------------------------- mkdir -p $cmpd diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2011-05-27 14:38:08.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2011-07-15 16:58:11.000000000 +0200 @@ -785,6 +785,14 @@ if (! $chroot) { $stype = "public"; } + if ($chroot) { + $data = qxx ("@kchroot zypper --version 2>&1 | cut -c 8"); + if ($data < 1) { + $kiwi -> info ("image zypper version is too old"); + $kiwi -> skipped (); + return $this; + } + } foreach my $alias (keys %{$source{$stype}}) { my @sopts = @{$source{$stype}{$alias}}; my @zopts = (); @@ -846,16 +854,8 @@ } else { my @zypper= @{$this->{zypper_chroot}}; $kiwi -> info ("Adding chroot zypper service: $alias"); - $data = qxx ("@kchroot zypper --version 2>&1 | cut -c 8"); - if ($data >= 1) { - $data = qxx ("@kchroot @zypper $sadd 2>&1"); - $code = $? >> 8; - } else { - $kiwi -> skipped (); - $kiwi -> info ("image zypper version is too old"); - $kiwi -> skipped (); - return $this; - } + $data = qxx ("@kchroot @zypper $sadd 2>&1"); + $code = $? >> 8; } if ($code != 0) { $kiwi -> failed (); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIQX.pm new/kiwi/modules/KIWIQX.pm --- old/kiwi/modules/KIWIQX.pm 2011-05-27 14:38:08.000000000 +0200 +++ new/kiwi/modules/KIWIQX.pm 2011-07-15 16:58:11.000000000 +0200 @@ -106,6 +106,14 @@ return "$prog: command not found"; } #========================================== + # Check if the command is studio hijacked + #------------------------------------------ + if (-e $prog."_real") { + if ((defined $main::kiwi) && ($QXXLOG)) { + $main::kiwi -> loginfo ("EXEC WARNING [$prog is hijacked]\n"); + } + } + #========================================== # Call command line #------------------------------------------ return qx ($cmd); 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-07-08 15:37:36.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2011-07-15 16:58:11.000000000 +0200 @@ -175,15 +175,9 @@ IFS=$IFS_ORIG Echo "Searching harddrive for $OEMInstallType installation" hwinfo=/usr/sbin/hwinfo - if [ "$OEMInstallType" = "USB" ];then - deviceDisks=`$hwinfo --disk |\ - grep "Device File:" | cut -f2 -d: |\ - cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"` - else - deviceDisks=`$hwinfo --disk |\ - grep "Device File:" | cut -f2 -d: |\ - cut -f1 -d"("` - fi + deviceDisks=`$hwinfo --disk |\ + grep "Device File:" | cut -f2 -d: |\ + cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"` export deviceDisks=`echo $deviceDisks` if [ -z "$deviceDisks" ];then systemException \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-linuxrc new/kiwi/system/boot/ix86/oemboot/suse-linuxrc --- old/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2011-04-11 17:15:55.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-linuxrc 2011-07-15 16:58:11.000000000 +0200 @@ -217,7 +217,11 @@ Echo "Searching for boot device..." if [ "$LOCAL_BOOT" = "no" ];then if ! searchBIOSBootDevice;then - systemException "$biosBootDevice" "reboot" + if [ ! -z "$cdinst" ];then + biosBootDevice=/dev/cdrom + else + systemException "$biosBootDevice" "reboot" + fi fi export imageDiskDevice=$biosBootDevice else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump new/kiwi/system/boot/ppc/oemboot/suse-dump --- old/kiwi/system/boot/ppc/oemboot/suse-dump 2011-07-01 16:20:06.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2011-07-15 16:58:11.000000000 +0200 @@ -175,15 +175,9 @@ IFS=$IFS_ORIG Echo "Searching harddrive for $OEMInstallType installation" hwinfo=/usr/sbin/hwinfo - if [ "$OEMInstallType" = "USB" ];then - deviceDisks=`$hwinfo --disk |\ - grep "Device File:" | cut -f2 -d: |\ - cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"` - else - deviceDisks=`$hwinfo --disk |\ - grep "Device File:" | cut -f2 -d: |\ - cut -f1 -d"("` - fi + deviceDisks=`$hwinfo --disk |\ + grep "Device File:" | cut -f2 -d: |\ + cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"` export deviceDisks=`echo $deviceDisks` if [ -z "$deviceDisks" ];then systemException \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump new/kiwi/system/boot/s390/oemboot/suse-dump --- old/kiwi/system/boot/s390/oemboot/suse-dump 2011-07-01 16:20:06.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-dump 2011-07-15 16:58:12.000000000 +0200 @@ -175,15 +175,9 @@ IFS=$IFS_ORIG Echo "Searching harddrive for $OEMInstallType installation" hwinfo=/usr/sbin/hwinfo - if [ "$OEMInstallType" = "USB" ];then - deviceDisks=`$hwinfo --disk |\ - grep "Device File:" | cut -f2 -d: |\ - cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"` - else - deviceDisks=`$hwinfo --disk |\ - grep "Device File:" | cut -f2 -d: |\ - cut -f1 -d"("` - fi + deviceDisks=`$hwinfo --disk |\ + grep "Device File:" | cut -f2 -d: |\ + cut -f1 -d"(" | sed -e s"@$imageDiskDevice@@"` export deviceDisks=`echo $deviceDisks` if [ -z "$deviceDisks" ];then systemException \ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org