Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Mon Mar 28 10:30:02 CEST 2011.
--------
--- kiwi/kiwi.changes 2011-03-22 13:23:18.000000000 +0100
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-03-25
14:52:15.000000000 +0100
@@ -1,0 +2,46 @@
+Fri Mar 25 14:43:00 CET 2011 - m...@suse.de
+
+- v4.83 released
+
+-------------------------------------------------------------------
+Fri Mar 25 11:33:50 CET 2011 - m...@suse.de
+
+- option -s for qemu-img convert hast changed its meaning
+
+-------------------------------------------------------------------
+Thu Mar 24 12:17:23 CET 2011 - m...@suse.de
+
+- fixed pxeRaidCreate() function. Use --run option when creating
+ the array and write a more reliable mdadm.conf file (bnc #678076)
+
+-------------------------------------------------------------------
+Wed Mar 23 10:44:47 CET 2011 - m...@suse.de
+
+- fixed format string of hexdump. If the mbrid has leading
+ zero's the hexdump call removes them which leads to an
+ error when string matching the mbrid
+
+-------------------------------------------------------------------
+Wed Mar 23 10:19:44 CET 2011 - m...@suse.de
+
+- DB: update documentation, new option --mbrid
+
+-------------------------------------------------------------------
+Wed Mar 23 10:11:42 CET 2011 - m...@suse.de
+
+- added support for a custom mbr disk label with
+ the option --mbrid. The default is to create a random
+ mbr disk label.
+
+-------------------------------------------------------------------
+Tue Mar 22 16:47:21 CET 2011 - m...@suse.de
+
+- DB: update documentation, new info module 'version'
+
+-------------------------------------------------------------------
+Tue Mar 22 16:46:52 CET 2011 - m...@suse.de
+
+- added info 'version' selection to obtain the appliance
+ name and version information
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.lwnDdl/_old 2011-03-28 10:27:57.000000000 +0200
+++ /var/tmp/diff_new_pack.lwnDdl/_new 2011-03-28 10:27:57.000000000 +0200
@@ -65,8 +65,8 @@
%endif
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.82
-Release: 2
+Version: 4.83
+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-03-18 14:26:05.000000000 +0100
+++ new/kiwi/.revision 2011-03-25 14:47:34.000000000 +0100
@@ -1 +1 @@
-4c0dbabe52edd5da25069676731a5ab6124c2589
+8621cccfdfb696c71ba5811c847b7cb7588419a7
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2011-03-18 14:26:05.000000000 +0100
+++ new/kiwi/kiwi.pl 2011-03-25 14:47:34.000000000 +0100
@@ -49,7 +49,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "4.82";
+our $Version = "4.83";
our $Publisher = "SUSE LINUX Products GmbH";
our $Preparer = "KIWI - http://kiwi.berlios.de";;
our $openSUSE = "http://download.opensuse.org";;
@@ -222,6 +222,7 @@
our $FatStorage; # specify size of fat partition if syslinux is used
our $cmdL; # command line storage object
our $kiwi; # global logging handler object
+our $MBRID; # custom mbrid value
#============================================
# Globals
@@ -1242,6 +1243,7 @@
"check-config=s" => \$CheckConfig,
"yes|y" => \$defaultAnswer,
"debug" => \$Debug,
+ "mbrid=o" => \$MBRID,
"help|h" => \$Help
);
#========================================
@@ -1473,6 +1475,14 @@
if (defined $SetImageType) {
$cmdL -> setBuildType($SetImageType);
}
+ if (defined $MBRID) {
+ if ($MBRID < 0 || $MBRID > 0xffffffff) {
+ $kiwi -> error ("Invalid mbrid");
+ $kiwi -> failed ();
+ my $code = kiwiExit (1); return $code;
+ }
+ $MBRID = sprintf ("0x%08x", $MBRID);
+ }
}
#==========================================
@@ -1530,7 +1540,7 @@
print " kiwi --createhash <image-path>\n";
print " kiwi --info <image-path> --select <\n";
print " repo-patterns|patterns|types|sources|\n";
- print " size|profiles|packages\n";
+ print " size|profiles|packages|version\n";
print " > --select ...\n";
print " kiwi --setup-splash <initrd>\n";
print "\n";
@@ -1673,6 +1683,10 @@
print " Activates check for matching kernels between boot and\n";
print " system image. The kernel check also tries to fix the
boot\n";
print " image if no matching kernel was found.\n";
+ print "\n";
+ print " [ --mbrid <number>]\n";
+ print " Sets the disk id to the given value. The default is to\n";
+ print " generate a random id.\n";
print "--\n";
version ($exit);
}
@@ -1776,6 +1790,7 @@
$select{"size"} = "List install/delete size estimation";
$select{"packages"} = "List of packages to become installed";
$select{"profiles"} = "List profiles";
+ $select{"version"} = "List name and version";
#==========================================
# Create log object
#------------------------------------------
@@ -2058,6 +2073,17 @@
}
last SWITCH;
};
+ #==========================================
+ # version
+ #------------------------------------------
+ /^version/ && do {
+ my $version = $xml -> getImageVersion();
+ my $appname = $xml -> getImageName();
+ my $vnode = new XML::LibXML::Element ("image");
+ $vnode -> setAttribute ("version","$version");
+ $vnode -> setAttribute ("name","$appname");
+ $scan -> appendChild ($vnode);
+ };
}
}
#==========================================
@@ -3312,6 +3338,31 @@
}
}
+#==========================================
+# getMBRDiskLabel
+#------------------------------------------
+sub getMBRDiskLabel {
+ # ...
+ # set the mbrid to either the value given at the
+ # commandline or a random 4byte MBR disk label ID
+ # ---
+ my $this = shift;
+ my $range = 0xfe;
+ if (defined $main::MBRID) {
+ return $main::MBRID;
+ } else {
+ my @bytes;
+ for (my $i=0;$i<4;$i++) {
+ $bytes[$i] = 1 + int(rand($range));
+ redo if $bytes[0] <= 0xf;
+ }
+ my $nid = sprintf ("0x%02x%02x%02x%02x",
+ $bytes[0],$bytes[1],$bytes[2],$bytes[3]
+ );
+ return $nid;
+ }
+}
+
main();
# vim: set noexpandtab:
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-03-17 18:50:53.000000000 +0100
+++ new/kiwi/modules/KIWIBoot.pm 2011-03-25 14:47:34.000000000 +0100
@@ -417,7 +417,7 @@
#==========================================
# Store a disk label ID for this object
#------------------------------------------
- $this -> getMBRDiskLabel();
+ $this->{mbrid} = main::getMBRDiskLabel();
#==========================================
# find system architecture
#------------------------------------------
@@ -2824,28 +2824,6 @@
return $this;
}
-#==========================================
-# getMBRDiskLabel
-#------------------------------------------
-sub getMBRDiskLabel {
- # ...
- # create a random 4byte MBR disk label ID
- # ---
- my $this = shift;
- my $range = 0xfe;
- my @bytes;
- undef $this->{mbrid};
- for (my $i=0;$i<4;$i++) {
- $bytes[$i] = 1 + int(rand($range));
- redo if $bytes[0] <= 0x11;
- }
- my $nid = sprintf ("0x%02x%02x%02x%02x",
- $bytes[0],$bytes[1],$bytes[2],$bytes[3]
- );
- $this->{mbrid} = $nid;
- return $this;
-}
-
#==========================================
# writeMBRDiskLabel
#------------------------------------------
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-03-21 16:02:02.000000000 +0100
+++ new/kiwi/modules/KIWIImage.pm 2011-03-25 14:47:34.000000000 +0100
@@ -150,7 +150,7 @@
#==========================================
# Store a disk label ID for this object
#------------------------------------------
- $this -> getMBRDiskLabel();
+ $this->{mbrid} = main::getMBRDiskLabel();
#==========================================
# Clean kernel mounts if any
#------------------------------------------
@@ -4067,29 +4067,6 @@
}
#==========================================
-# getMBRDiskLabel
-#------------------------------------------
-sub getMBRDiskLabel {
- # ...
- # create a random 4byte MBR disk label ID, used
- # the isohybrid call as parameter
- # ---
- my $this = shift;
- my $range = 0xfe;
- my @bytes;
- undef $this->{mbrid};
- for (my $i=0;$i<4;$i++) {
- $bytes[$i] = 1 + int(rand($range));
- redo if $bytes[0] <= 0xf;
- }
- my $nid = sprintf ("0x%02x%02x%02x%02x",
- $bytes[0],$bytes[1],$bytes[2],$bytes[3]
- );
- $this->{mbrid} = $nid;
- return $this;
-}
-
-#==========================================
# buildImageName
#------------------------------------------
sub buildImageName {
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-03-15 12:07:25.000000000 +0100
+++ new/kiwi/modules/KIWIImageFormat.pm 2011-03-25 14:47:34.000000000 +0100
@@ -292,11 +292,7 @@
$kiwi -> info ("Creating $format image...");
$target =~ s/\.raw$/\.$format/;
$convert = "convert -f raw $source -O $format";
- if (($vmwc{vmware_disktype}) && ($vmwc{vmware_disktype}=~/^scsi/)) {
- $status = qxx ("qemu-img $convert -s $target 2>&1");
- } else {
- $status = qxx ("qemu-img $convert $target 2>&1");
- }
+ $status = qxx ("qemu-img $convert $target 2>&1");
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
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-03-22 13:18:53.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2011-03-25 14:47:34.000000000 +0100
@@ -3287,7 +3287,7 @@
if [ ! -b $curd ];then
continue
fi
- mbrML=`dd if=$curd bs=1 count=4 skip=$((0x1b8))|hexdump -n4 -e
'"0x%x"'`
+ mbrML=`dd if=$curd bs=1 count=4 skip=$((0x1b8))|hexdump -n4 -e
'"0x%08x"'`
mbrMB=`echo $mbrML | sed
's/^0x\(..\)\(..\)\(..\)\(..\)$/0x\4\3\2\1/'`
if [ "$mbrML" = "$mbrI" ] || [ "$mbrMB" = "$mbrI" ];then
ifix=1
@@ -6680,15 +6680,14 @@
fi
mdadm --zero-superblock $raidFirst
mdadm --zero-superblock $raidSecond
- yes | mdadm --create /dev/md$mdcount \
+ mdadm --create --run /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
+ echo "mdadm -Db /dev/md$mdcount" >> $conf
mdcount=$((mdcount + 1))
done
}
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
