Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Mon Oct 11 15:11:06 CEST 2010.
--------
--- kiwi/kiwi.changes 2010-09-16 16:08:02.000000000 +0200
+++ kiwi/kiwi.changes 2010-10-08 12:55:57.000000000 +0200
@@ -1,0 +2,114 @@
+Fri Oct 8 12:52:11 CEST 2010 - ms@suse.de
+
+- v4.62 released
+- rebuild documentation
+
+-------------------------------------------------------------------
+Thu Oct 7 16:09:15 CEST 2010 - ms@suse.de
+
+- added vfb (virtual framebuffer configuration) to the xenconfig file
+ written by kiwi. This allows easy graphics console access with
+ the virt-viewer program. If you want to run the xen domU in text
+ mode you have to manually pass the option xencons=tty in the pygrub
+ boot menu
+
+-------------------------------------------------------------------
+Thu Oct 7 12:45:50 CEST 2010 - ms@suse.de
+
+- added egrep for dasd_configure to initrd
+- fixed the creation of the boot partition if a real targetdevice
+ is used to prevent using the entire rest space for the boot image
+
+-------------------------------------------------------------------
+Thu Oct 7 11:17:34 CEST 2010 - root@suse.de
+
+- fixed boot device detection for zipl on dasd devices with LVM
+
+-------------------------------------------------------------------
+Thu Oct 7 10:39:17 CEST 2010 - ms@suse.de
+
+- removed xencons boot option for domU creation in .xenconfig
+ and from the bootloader kernel options (bnc #644138)
+
+-------------------------------------------------------------------
+Thu Oct 7 10:33:57 CEST 2010 - ms@suse.de
+
+- update and rebuild documentation
+
+-------------------------------------------------------------------
+Thu Oct 7 10:32:10 CEST 2010 - ms@suse.de
+
+- added support for setting up the boottimeout value prior
+ to the default value in the config.xml <type> section.
+ the unit for the timeout value is seconds if grub is used
+ as the boot loader and 1/10 seconds if syslinux is used
+
+
+ ...
+ </type>
+
+-------------------------------------------------------------------
+Thu Oct 7 10:17:51 CEST 2010 - ms@suse.de
+
+- fixed fdasd input creation, wrong 't' command setup
+
+-------------------------------------------------------------------
+Thu Oct 7 10:17:12 CEST 2010 - ms@suse.de
+
+- call udevPending before checking /sys/bus/usb/devices
+
+-------------------------------------------------------------------
+Mon Oct 4 12:07:38 CEST 2010 - ms@suse.de
+
+- DB: Deleted kiwi-doc-intro.xml and moved content to kiwi-doc-workflow.xml
+- DB: Removed xinclude of kiwi-doc-intro.xml from kiwi-doc.xml
+
+-------------------------------------------------------------------
+Fri Oct 1 15:50:28 CEST 2010 - ms@suse.de
+
+- v4.61 released
+- rebuild documentation
+
+-------------------------------------------------------------------
+Fri Oct 1 15:14:29 CEST 2010 - ms@suse.de
+
+- fixed creation of install CD if syslinux is used.
+- fixed syslinux dosfs boot partition setup by adding the
+ dosfstools package to the oemboot image descriptions
+
+-------------------------------------------------------------------
+Thu Sep 30 14:26:38 CEST 2010 - ms@suse.de
+
+- fixed OEMRepartStandard(). Additionally to the last commit, fixed
+ the use of the suggested last cylinder for swap and recovery only
+ if no oem-systemsize is set
+
+-------------------------------------------------------------------
+Thu Sep 30 12:34:55 CEST 2010 - ms@suse.de
+
+- fixed OEMRepartStandard() to use the suggested last cylinder for
+ the last partition to become created instead of a fixed value.
+ Also use the suggested last cylinder for the resize of the root
+ partition if there is no other partition to become created and
+ no oem-systemsize was specified
+
+-------------------------------------------------------------------
+Wed Sep 29 12:45:57 CEST 2010 - root@suse.de
+
+- fixed boot device detection for s390 KVM target
+
+-------------------------------------------------------------------
+Mon Sep 27 12:42:36 CEST 2010 - ms@suse.de
+
+- fixed typo in DHCPCD option test
+
+-------------------------------------------------------------------
+Mon Sep 27 11:27:49 CEST 2010 - ms@suse.de
+
+- added support for partition alignment with fdisk. Thus support
+ for 4k-sector size disks (logical 512 byte) with fdisk was added
+ when using parted the -align option is used in any case though.
+ In order to use the alignment when fdisk is used the oemconfig
+ element oem-align-partition must be set to 'true' (bnc #637333)
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.6LVtWu/_old 2010-10-11 15:06:46.000000000 +0200
+++ /var/tmp/diff_new_pack.6LVtWu/_new 2010-10-11 15:06:46.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 4.60)
+# spec file for package kiwi (Version 4.62)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -60,7 +60,7 @@
Requires: clicfs
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.60
+Version: 4.62
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.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2010-09-16 15:50:31.000000000 +0200
+++ new/kiwi/.revision 2010-10-08 12:53:37.000000000 +0200
@@ -1 +1 @@
-b0c6f445643ebb72a524e1a679a2386d9b793956
+7d34bd83c7e630b672a804af7fd15fb5f0a29666
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2010-09-16 15:50:31.000000000 +0200
+++ new/kiwi/kiwi.pl 2010-10-08 12:53:37.000000000 +0200
@@ -46,7 +46,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "4.60";
+our $Version = "4.62";
our $Publisher = "SUSE LINUX Products GmbH";
our $Preparer = "KIWI - http://kiwi.berlios.de";
our $openSUSE = "http://download.opensuse.org";
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 2010-09-16 15:50:33.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2010-10-08 12:53:37.000000000 +0200
@@ -1596,7 +1596,7 @@
$kiwi -> error ("LVM: No such directory $system/$pname");
$kiwi -> failed ();
return undef;
- }
+ }
#==========================================
# store volume sizes in lvmparts
#------------------------------------------
@@ -1791,9 +1791,6 @@
# add extra Xen boot options if necessary
#------------------------------------------
my $extra = "";
- if (($type{bootprofile} eq "xen") && ($xendomain eq "domU")) {
- $extra = "xencons=tty ";
- }
#==========================================
# Create boot loader configuration
#------------------------------------------
@@ -1908,24 +1905,31 @@
}
}
} else {
+ my $bootpartsize=".";
if ($bootloader =~ /(sys|ext)linux/) {
my $partid = 6;
if ($bootloader eq "extlinux" ) {
$partid = 83;
}
my $lvmsize = $this->{vmmbyte} - $syslbootMB;
+ if ($haveDiskDevice) {
+ $bootpartsize = "+".$syslbootMB."M";
+ }
@commands = (
"n","p","1",".","+".$lvmsize."M",
- "n","p","2",".",".",
+ "n","p","2",".",$bootpartsize,
"t","2",$partid,
"t","1","8e",
"a","2","w","q"
);
} else {
my $lvmsize = $this->{vmmbyte} - $lvmbootMB;
+ if ($haveDiskDevice) {
+ $bootpartsize = "+".$lvmbootMB."M";
+ }
@commands = (
"n","p","1",".","+".$lvmsize."M",
- "n","p","2",".",".",
+ "n","p","2",".",$bootpartsize,
"t","1","8e",
"a","2","w","q"
);
@@ -3186,7 +3190,8 @@
#------------------------------------------
print FD "color cyan/blue white/blue\n";
print FD "default $defaultBootNr\n";
- print FD "timeout 10\n";
+ my $bootTimeout = $type{boottimeout} ? int $type{boottimeout} : 10;
+ 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";
@@ -3368,7 +3373,8 @@
print FD "default $defaultBootLabel"."\n";
print FD "implicit 1"."\n";
print FD "prompt 1"."\n";
- print FD "timeout 200"."\n";
+ my $bootTimeout = $type{boottimeout} ? int $type{boottimeout} : 200;
+ print FD "timeout $bootTimeout"."\n";
if ($syslinux_new_format) {
print FD "ui gfxboot bootlogo isolinux.msg"."\n";
} else {
@@ -3862,7 +3868,10 @@
return undef;
}
} else {
- $bootdev = $diskname."1";
+ $bootdev = $diskname."2";
+ if (! -e $bootdev) {
+ $bootdev = $diskname."1";
+ }
$haveRealDevice = 1;
}
#==========================================
@@ -4183,11 +4192,13 @@
my $cmdref = shift;
my $tool = $this->{ptool};
my $kiwi = $this->{kiwi};
+ my $xml = $this->{xml};
my $tmpdir = $this->{tmpdir};
my @commands = @{$cmdref};
my $result;
my $status;
my $ignore;
+ my $action;
if (! defined $tool) {
$tool = "fdisk";
}
@@ -4210,6 +4221,9 @@
}
print FD "y\n";
foreach my $cmd (@commands) {
+ if ($cmd =~ /[ntwq]$/) {
+ $action = $cmd;
+ }
if (($ignore) && ($cmd =~ /[ntwq]$/)) {
undef $ignore;
} elsif ($ignore) {
@@ -4222,7 +4236,7 @@
if ($cmd eq "p") {
next;
}
- if ($cmd =~ /^[0-9]$/) {
+ if (($cmd =~ /^[0-9]$/) && ($action ne "t")) {
next;
}
if (($cmd eq "83") || ($cmd eq "8e")) {
@@ -4260,9 +4274,23 @@
$kiwi -> loginfo ($status);
return undef;
}
- if (! open (FD,"|/sbin/fdisk $device &> $tmpdir/fdisk.log")) {
+ if (! open (FD,"|/sbin/fdisk -u $device &> $tmpdir/fdisk.log")) {
return undef;
}
+ my $palign = $xml -> getOEMAlignPartition();
+ if (($palign) && ("$palign" eq "true")) {
+ # fix up the first sector
+ for (my $count=0;$count<@commands;$count++) {
+ if ($commands[$count] eq "n") {
+ if (($commands[$count+2] eq "1") &&
+ ($commands[$count+3] eq ".")
+ ) {
+ $commands[$count+3] = "64";
+ last;
+ }
+ }
+ }
+ }
foreach my $cmd (@commands) {
if ($cmd eq ".") {
print FD "\n";
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 2010-09-16 15:50:35.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2010-10-08 12:53:38.000000000 +0200
@@ -201,6 +201,10 @@
echo "Setting up OEM_REBOOT=1"
echo "OEM_REBOOT=1" >> $oemfile
fi
+ if [ ! -z "$kiwi_oemalign" ];then
+ echo "Setting up OEM_ALIGN=1"
+ echo "OEM_ALIGN=1" >> $oemfile
+ fi
if [ ! -z "$kiwi_oemdumphalt" ];then
echo "Setting up OEM_DUMPHALT=1"
echo "OEM_DUMPHALT=1" >> $oemfile
@@ -959,7 +963,7 @@
dmsetup dialog awk gawk clicfs cryptsetup clear blkid fbiterm
gettext diff bc utimer cmp busybox kexec pam_console_apply
setterm kpartx vgcfgbackup vgcfgrestore lsdasd dasd_configure
- qeth_configure fdasd
+ qeth_configure fdasd mkdosfs egrep
"
tools="$tools $@"
for path in /sbin /usr/sbin /usr/bin /bin;do
@@ -1026,8 +1030,8 @@
if [ ! -z "$kiwi_hybrid" ];then
loader="isolinux"
fi
- if [ "$loader" = "extlinux" ];then
- # need the same data for extlinux and for isolinux
+ if [ "$loader" = "extlinux" ] || [ "$loader" = "syslinux" ];then
+ # need the same data for sys|extlinux and for isolinux
loader="isolinux"
fi
if [ "$loader" = "zipl" ];then
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 2010-09-07 18:17:24.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2010-10-01 15:53:31.000000000 +0200
@@ -711,6 +711,7 @@
$main::ForeignRepo{"domain"} = $xml -> getXenDomain();
$main::ForeignRepo{"oem-partition-install"} =$xml->getOEMPartitionInstall();
$main::ForeignRepo{"oem-swap"} = $xml -> getOEMSwap();
+ $main::ForeignRepo{"oem-align-partition"} = $xml -> getOEMAlignPartition();
$main::ForeignRepo{"oem-swapsize"} = $xml -> getOEMSwapSize();
$main::ForeignRepo{"oem-systemsize"} = $xml -> getOEMSystemSize();
$main::ForeignRepo{"oem-home"} = $xml -> getOEMHome();
@@ -2511,6 +2512,7 @@
$main::ForeignRepo{"domain"} = $xml -> getXenDomain();
$main::ForeignRepo{"oem-partition-install"} =$xml->getOEMPartitionInstall();
$main::ForeignRepo{"oem-swap"} = $xml -> getOEMSwap();
+ $main::ForeignRepo{"oem-align-partition"} = $xml -> getOEMAlignPartition();
$main::ForeignRepo{"oem-swapsize"} = $xml -> getOEMSwapSize();
$main::ForeignRepo{"oem-systemsize"} = $xml -> getOEMSystemSize();
$main::ForeignRepo{"oem-home"} = $xml -> getOEMHome();
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 2010-09-07 18:17:24.000000000 +0200
+++ new/kiwi/modules/KIWIImageFormat.pm 2010-10-08 12:53:38.000000000 +0200
@@ -550,7 +550,7 @@
#------------------------------------------
if ($type{type} eq "xen") {
print $FD 'root="'.$part.' ro"'."\n";
- print $FD 'extra=" xencons=tty "'."\n";
+ print $FD 'vfb = ["type=vnc,vncunused=1,vnclisten=0.0.0.0"]'."\n";
}
close $FD;
$kiwi -> done();
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 2010-09-16 15:50:38.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2010-10-08 12:53:38.000000000 +0200
@@ -2510,6 +2510,7 @@
local hwicmd="/usr/sbin/hwinfo"
export HAVE_USB="no"
export SCAN_USB="not-started"
+ udevPending
if [ $HAVE_MODULES_ORDER = 0 ];then
#======================================
# load host controller modules
@@ -3274,7 +3275,7 @@
done
fi
export PXE_IFACE=$iface
- if $DHCPCD_HAVE_PERSIST -eq 0;then
+ if [ $DHCPCD_HAVE_PERSIST -eq 0 ];then
# /.../
# older version of dhcpd which doesn't have the
# options we want to pass
@@ -5508,12 +5509,18 @@
local input=$1
if [ $PARTITIONER = "sfdisk" ];then
Echo "Repartition the disk according to real geometry [ fdisk ]"
+ if [ ! -z "$OEM_ALIGN" ];then
+ local pstart=$(checkFDiskFirstSector $imageDiskDevice)
+ fi
echo "w" >> $input
echo "q" >> $input
fdisk $imageDiskDevice < $input 1>&2
if test $? != 0; then
systemException "Failed to create partition table" "reboot"
fi
+ if [ ! -z "$OEM_ALIGN" ];then
+ fixupFDiskSectors $input $pstart
+ fi
elif [ $PARTITIONER = "fdasd" ];then
Echo "Repartition the disk according to real geometry [ fdasd ]"
echo "w" >> $input
@@ -5591,6 +5598,69 @@
done
}
#======================================
+# checkFDiskFirstSector
+#--------------------------------------
+function checkFDiskFirstSector {
+ # /.../
+ # check original alignment using fdisk
+ # ----
+ local dev=$1
+ fdisk -ul ${dev} | grep '^'${dev}1 | \
+ sed -e's@'${dev}1'[ \*]*\([0-9]\+\) .*$@\1@'
+}
+#======================================
+# fixupFDiskSectors
+#--------------------------------------
+function fixupFDiskSectors {
+ # /.../
+ # align the partition start sectors using fdisk
+ # ----
+ local input=$1
+ local palign=$2
+ local pstart pend act psize ptype rest
+ case "$palign" in
+ 64) palign=8;;
+ 2048) palign=2048;;
+ *) return;;
+ esac
+ local numpdevs=$(fdisk -ul $imageDiskDevice | grep '^/dev/' | wc -l)
+ rm -f $input
+ fdisk -ul $imageDiskDevice | grep '^/dev/' | \
+ while read pdev act pstart pend psize ptype rest; do
+ pdev=${pdev#$imageDiskDevice}
+ if [ "$act" != '*' ]; then
+ ptype="$psize"
+ pend="$pstart"
+ pstart="$act"
+ fi
+ local aligned=$(( ( $pstart + $palign - 1 ) / $palign * $palign ))
+ if [ "$aligned" -ne "$pstart" ]; then
+ echo "d" >> $input
+ test $numpdevs -gt 1 && echo "$pdev" >> $input
+ echo "n" >> $input
+ echo "p" >> $input
+ test $numpdevs -lt 4 && echo "$pdev" >> $input
+ echo "$aligned" >> $input
+ echo "$pend" >> $input
+ echo "t" >> $input
+ test $numpdevs -gt 1 && echo "$pdev" >> $input
+ echo "$ptype" >> $input
+ if [ "$act" = '*' ]; then
+ echo "a" >> $input
+ echo "$pdev" >> $input
+ fi
+ fi
+ done
+ if [ -s $input ]; then
+ echo "w" >> $input
+ echo "q" >> $input
+ fdisk -u $imageDiskDevice < $input 1>&2
+ if test $? != 0; then
+ systemException "Failed to fix up partition table" "reboot"
+ fi
+ fi
+}
+#======================================
# createFDiskInput
#--------------------------------------
function createFDiskInput {
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rnc new/kiwi/modules/KIWISchema.rnc
--- old/kiwi/modules/KIWISchema.rnc 2010-08-27 15:35:43.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rnc 2010-10-08 12:53:38.000000000 +0200
@@ -992,6 +992,29 @@
}
#==========================================
+# common element <oem-align-partition>
+#
+div {
+ k.oem-align-partition.content = xsd:boolean
+ k.oem-align-partition.attlist = empty
+ k.oem-align-partition =
+ ## For oemboot driven images: align start sectors. This is only
+ ## done when fdisk is used. For parted the option -a is passed in
+ ## in any case
+ [
+ db:para [
+ "For oemboot driven images: align start sectors. This is only\x{a}"~
+ "done when fdisk is used. For parted the option -a is passed\x{a}"~
+ "in any case"
+ ]
+ ]
+ element oem-align-partition {
+ k.oem-align-partition.attlist,
+ k.oem-align-partition.content
+ }
+}
+
+#==========================================
# common element <oem-partition-install>
#
div {
@@ -1349,6 +1372,12 @@
attribute bootloader {
"extlinux" | "grub" | "syslinux" | "zipl"
}
+ k.type.boottimeout.attribute =
+ ## Specifies the boot timeout in seconds prior to launching
+ ## the default boot option. the unit for the timeout value
+ ## is seconds if GRUB is used as the boot loader and 1/10
+ ## seconds if syslinux is used
+ attribute boottimeout { xsd:nonNegativeInteger }
k.type.installboot.attribute =
## Specifies the bootloader default boot entry for the"
## initial boot of a kiwi install image. This value is"
@@ -1430,6 +1459,7 @@
k.type.hybrid.attribute? &
k.type.hybridpersistent.attribute? &
k.type.bootloader.attribute? &
+ k.type.boottimeout.attribute? &
k.type.installboot.attribute? &
k.type.compressed.attribute? &
k.type.vga.attribute? &
@@ -2126,6 +2156,7 @@
k.oemconfig.attlist &
k.oem-systemsize? &
k.oem-swap? &
+ k.oem-align-partition? &
k.oem-partition-install? &
k.oem-home? &
k.oem-boot-title? &
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWISchema.rng new/kiwi/modules/KIWISchema.rng
--- old/kiwi/modules/KIWISchema.rng 2010-08-27 15:35:43.000000000 +0200
+++ new/kiwi/modules/KIWISchema.rng 2010-10-08 12:53:38.000000000 +0200
@@ -1418,6 +1418,31 @@
</div>
<!--
==========================================
+ common element <oem-align-partition>
+
+ -->
+ <div>
+ <define name="k.oem-align-partition.content">
+ <data type="boolean"/>
+ </define>
+ <define name="k.oem-align-partition.attlist">
+ <empty/>
+ </define>
+ <define name="k.oem-align-partition">
+ <element name="oem-align-partition">
+ For oemboot driven images: align start sectors. This is only
+done when fdisk is used. For parted the option -a is passed in
+in any case
+ db:paraFor oemboot driven images: align start sectors. This is only
+done when fdisk is used. For parted the option -a is passed
+in any case
+ <ref name="k.oem-align-partition.attlist"/>
+ <ref name="k.oem-align-partition.content"/>
+ </element>
+ </define>
+ </div>
+ <!--
+ ==========================================
common element <oem-partition-install>
-->
@@ -1861,6 +1886,15 @@
</choice>
</attribute>
</define>
+ <define name="k.type.boottimeout.attribute">
+ <attribute name="boottimeout">
+ Specifies the boot timeout in seconds prior to launching
+the default boot option. the unit for the timeout value
+is seconds if GRUB is used as the boot loader and 1/10
+seconds if syslinux is used
+ <data type="nonNegativeInteger"/>
+ </attribute>
+ </define>
<define name="k.type.installboot.attribute">
<attribute name="installboot">
Specifies the bootloader default boot entry for the"
@@ -2033,6 +2067,9 @@
<ref name="k.type.bootloader.attribute"/>
</optional>
<optional>
+ <ref name="k.type.boottimeout.attribute"/>
+ </optional>
+ <optional>
<ref name="k.type.installboot.attribute"/>
</optional>
<optional>
@@ -3050,6 +3087,9 @@
<ref name="k.oem-swap"/>
</optional>
<optional>
+ <ref name="k.oem-align-partition"/>
+ </optional>
+ <optional>
<ref name="k.oem-partition-install"/>
</optional>
<optional>
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 2010-09-16 15:50:40.000000000 +0200
+++ new/kiwi/modules/KIWIXML.pm 2010-10-08 12:53:38.000000000 +0200
@@ -378,6 +378,9 @@
if (defined $foreignRepo->{"oem-swap"}) {
$this -> setForeignOEMOptionsElement ("oem-swap");
}
+ if (defined $foreignRepo->{"oem-align-partition"}) {
+ $this -> setForeignOEMOptionsElement ("oem-align-partition");
+ }
if (defined $foreignRepo->{"oem-partition-install"}) {
$this -> setForeignOEMOptionsElement ("oem-partition-install");
}
@@ -825,6 +828,7 @@
$record{installstick} = $node -> getAttribute("installstick");
$record{vga} = $node -> getAttribute("vga");
$record{bootloader} = $node -> getAttribute("bootloader");
+ $record{boottimeout} = $node -> getAttribute("boottimeout");
$record{installboot} = $node -> getAttribute("installboot");
$record{checkprebuilt} = $node -> getAttribute("checkprebuilt");
$record{baseroot} = $node -> getAttribute("baseroot");
@@ -1597,6 +1601,26 @@
}
#==========================================
+# getOEMAlignPartition
+#------------------------------------------
+sub getOEMAlignPartition {
+ # ...
+ # Obtain the oem-align-partition value or return undef
+ # ---
+ my $this = shift;
+ my $tnode= $this->{typeNode};
+ my $node = $tnode -> getElementsByTagName ("oemconfig") -> get_node(1);
+ if (! defined $node) {
+ return undef;
+ }
+ my $align = $node -> getElementsByTagName ("oem-align-partition");
+ if ((! defined $align) || ("$align" eq "")) {
+ return undef;
+ }
+ return $align;
+}
+
+#==========================================
# getOEMPartitionInstall
#------------------------------------------
sub getOEMPartitionInstall {
@@ -2560,6 +2584,9 @@
if ((%type) && ($type{bootloader})) {
$result{kiwi_bootloader} = $type{bootloader};
}
+ if ((%type) && ($type{boottimeout})) {
+ $result{KIWI_BOOT_TIMEOUT} = $type{boottimeout};
+ }
if ((%type) && ($type{installboot})) {
$result{kiwi_installboot} = $type{installboot};
}
@@ -2656,6 +2683,7 @@
my $oemswapMB= $node -> getElementsByTagName ("oem-swapsize");
my $oemrootMB= $node -> getElementsByTagName ("oem-systemsize");
my $oemswap = $node -> getElementsByTagName ("oem-swap");
+ my $oemalign = $node -> getElementsByTagName ("oem-align-partition");
my $oempinst = $node -> getElementsByTagName ("oem-partition-install");
my $oemhome = $node -> getElementsByTagName ("oem-home");
my $oemtitle = $node -> getElementsByTagName ("oem-boot-title");
@@ -2674,6 +2702,9 @@
} elsif ((defined $oemswapMB) && ("$oemswapMB" > 0)) {
$result{kiwi_oemswapMB} = $oemswapMB;
}
+ if ((defined $oemalign) && ("$oemalign" eq "true")) {
+ $result{kiwi_oemalign} = $oemalign;
+ }
if ((defined $oemhome) && ("$oemhome" eq "false")) {
$result{kiwi_oemhome} = "no";
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.1/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.1/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-11.1/config.xml 2010-08-11 17:26:11.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-11.1/config.xml 2010-10-01 15:53:32.000000000 +0200
@@ -139,6 +139,8 @@
<package name="gettext-runtime"/>
<package name="kexec-tools"/>
<package name="kpartx"/>
+ <package name="syslinux"/>
+ <package name="dosfstools"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.2/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.2/config.xml
--- old/kiwi/system/boot/ix86/oemboot/suse-11.2/config.xml 2010-09-16 15:50:53.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-11.2/config.xml 2010-10-01 15:53:32.000000000 +0200
@@ -138,6 +138,7 @@
<package name="kexec-tools"/>
<package name="kpartx"/>
<package name="syslinux"/>
+ <package name="dosfstools"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -147,7 +148,6 @@
<package name="procps"/>
</packages>
<packages type="delete">
- <package name="syslinux"/>
<package name="cracklib-dict-small"/>
<package name="cracklib-dict-full"/>
<package name="PolicyKit"/>
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 2010-09-16 15:50:53.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml 2010-10-01 15:53:33.000000000 +0200
@@ -141,6 +141,8 @@
<package name="gettext-runtime"/>
<package name="kexec-tools"/>
<package name="kpartx"/>
+ <package name="syslinux"/>
+ <package name="dosfstools"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
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 2010-08-11 17:26:12.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml 2010-10-01 15:53:33.000000000 +0200
@@ -105,6 +105,8 @@
<package name="fbiterm"/>
<package name="bc"/>
<package name="gettext"/>
+ <package name="syslinux"/>
+ <package name="dosfstools"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
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 2010-09-16 15:50:53.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2010-10-01 15:53:33.000000000 +0200
@@ -128,6 +128,7 @@
<package name="bc"/>
<package name="gettext-runtime"/>
<package name="syslinux"/>
+ <package name="dosfstools"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -138,7 +139,6 @@
<package name="openssl-certs"/>
</packages>
<packages type="delete">
- <package name="syslinux"/>
<package name="cracklib-dict-small"/>
<package name="cracklib-dict-full"/>
<package name="PolicyKit"/>
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 2010-08-11 17:26:12.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml 2010-10-01 15:53:33.000000000 +0200
@@ -107,6 +107,8 @@
<package name="bc"/>
<package name="gettext"/>
<package name="kexec-tools"/>
+ <package name="syslinux"/>
+ <package name="dosfstools"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
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 2010-09-16 15:50:53.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2010-10-01 15:53:33.000000000 +0200
@@ -132,6 +132,7 @@
<package name="kexec-tools"/>
<package name="kpartx"/>
<package name="syslinux"/>
+ <package name="dosfstools"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -142,7 +143,6 @@
<package name="openssl-certs"/>
</packages>
<packages type="delete">
- <package name="syslinux"/>
<package name="cracklib-dict-small"/>
<package name="cracklib-dict-full"/>
<package name="PolicyKit"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-repart new/kiwi/system/boot/ix86/oemboot/suse-repart
--- old/kiwi/system/boot/ix86/oemboot/suse-repart 2010-08-03 18:37:41.000000000 +0200
+++ new/kiwi/system/boot/ix86/oemboot/suse-repart 2010-10-01 15:53:33.000000000 +0200
@@ -62,6 +62,8 @@
# p1: ( root ) +luks
# p2: [ boot ]
# -------------------------------------
+ local newparts=0
+ local partsize=0
#======================================
# check for boot partition
#--------------------------------------
@@ -127,17 +129,41 @@
d 2
fi
#======================================
+ # count partitions to be created
+ #--------------------------------------
+ if [ -z "$OEM_WITHOUTSWAP" ];then
+ newparts=$((newparts + 1))
+ fi
+ if [ ! -z "$OEM_RECOVERY" ];then
+ newparts=$((newparts + 1))
+ fi
+ if [ ! -z "$bootXMBytes" ];then
+ newparts=$((newparts + 1))
+ fi
+ if [ -z "$OEM_WITHOUTHOME" ];then
+ newparts=$((newparts + 1))
+ fi
+ #======================================
# repart root partition
#--------------------------------------
+ partsize=+"$disk1MBytes"M
+ if [ -z "$OEM_SYSTEMSIZE" ] && [ $newparts -eq 0 ];then
+ partsize=.
+ fi
createPartitionerInput \
- d n p $pID . +"$disk1MBytes"M
+ d n p $pID . $partsize
#======================================
# add swap partition
#--------------------------------------
if [ -z "$OEM_WITHOUTSWAP" ];then
pID=$((pID + 1))
+ partsize=+"$swapsize"M
+ if [ -z "$OEM_SYSTEMSIZE" ] && [ $newparts -eq 1 ];then
+ partsize=.
+ fi
createPartitionerInput \
- n p $pID . +"$swapsize"M t 2 82
+ n p $pID . $partsize t 2 82
+ newparts=$((newparts - 1))
swapParam=$pID
fi
#======================================
@@ -145,8 +171,13 @@
#--------------------------------------
if [ ! -z "$OEM_RECOVERY" ];then
pID=$((pID + 1))
+ partsize=+"$recoMByte"M
+ if [ -z "$OEM_SYSTEMSIZE" ] && [ $newparts -eq 1 ];then
+ partsize=.
+ fi
createPartitionerInput \
- n p $pID . +"$recoMByte"M t $pID $recoID
+ n p $pID . $partsize t $pID $recoID
+ newparts=$((newparts - 1))
recoParam=$pID
fi
#======================================
@@ -154,8 +185,10 @@
#--------------------------------------
if [ ! -z "$bootXMBytes" ];then
pID=$((pID + 1))
+ partsize=+"$bootXMBytes"M
createPartitionerInput \
- n p $pID . +"$bootXMBytes"M t $pID $bootpartID
+ n p $pID . $partsize t $pID $bootpartID
+ newparts=$((newparts - 1))
bootParam=$pID
fi
#======================================
@@ -165,6 +198,7 @@
pID=$((pID + 1))
createPartitionerInput \
n p $pID . .
+ newparts=$((newparts - 1))
homeParam=$pID
fi
#======================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-linuxrc new/kiwi/system/boot/s390/oemboot/suse-linuxrc
--- old/kiwi/system/boot/s390/oemboot/suse-linuxrc 2010-09-07 18:17:25.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-linuxrc 2010-10-01 15:53:33.000000000 +0200
@@ -208,7 +208,11 @@
if [ -z "$pxe" ];then
Echo "Searching for boot device..."
if [ "$LOCAL_BOOT" = "no" ];then
- if ! searchBusIDBootDevice;then
+ searchBIOSBootDevice
+ if [ ! -e "$biosBootDevice" ];then
+ searchBusIDBootDevice
+ fi
+ if [ ! -e "$biosBootDevice" ];then
systemException "$biosBootDevice" "reboot"
fi
export imageDiskDevice=$biosBootDevice
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-repart new/kiwi/system/boot/s390/oemboot/suse-repart
--- old/kiwi/system/boot/s390/oemboot/suse-repart 2010-09-16 15:50:58.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-repart 2010-10-01 15:53:33.000000000 +0200
@@ -63,6 +63,8 @@
# p1: ( root ) +luks
# p2: [ boot ]
# -------------------------------------
+ local newparts=0
+ local partsize=0
#======================================
# check for boot partition
#--------------------------------------
@@ -128,17 +130,41 @@
d 2 u y
fi
#======================================
+ # count partitions to be created
+ #--------------------------------------
+ if [ -z "$OEM_WITHOUTSWAP" ];then
+ newparts=$((newparts + 1))
+ fi
+ if [ ! -z "$OEM_RECOVERY" ];then
+ newparts=$((newparts + 1))
+ fi
+ if [ ! -z "$bootXMBytes" ];then
+ newparts=$((newparts + 1))
+ fi
+ if [ -z "$OEM_WITHOUTHOME" ];then
+ newparts=$((newparts + 1))
+ fi
+ #======================================
# repart root partition
#--------------------------------------
+ partsize=+"$disk1MBytes"M
+ if [ -z "$OEM_SYSTEMSIZE" ] && [ $newparts -eq 0 ];then
+ partsize=.
+ fi
createPartitionerInput \
- d u y n p $pID . +"$disk1MBytes"M
+ d u y n p $pID . $partsize
#======================================
# add swap partition
#--------------------------------------
if [ -z "$OEM_WITHOUTSWAP" ];then
pID=$((pID + 1))
+ partsize=+"$swapsize"M
+ if [ -z "$OEM_SYSTEMSIZE" ] && [ $newparts -eq 1 ];then
+ partsize=.
+ fi
createPartitionerInput \
- n p $pID . +"$swapsize"M t 2 82
+ n p $pID . $partsize t 2 82
+ newparts=$((newparts - 1))
swapParam=$pID
fi
#======================================
@@ -146,8 +172,13 @@
#--------------------------------------
if [ ! -z "$OEM_RECOVERY" ];then
pID=$((pID + 1))
+ partsize=+"$recoMByte"M
+ if [ -z "$OEM_SYSTEMSIZE" ] && [ $newparts -eq 1 ];then
+ partsize=.
+ fi
createPartitionerInput \
- n p $pID . +"$recoMByte"M t $pID $recoID
+ n p $pID . $partsize t $pID $recoID
+ newparts=$((newparts - 1))
recoParam=$pID
fi
#======================================
@@ -155,8 +186,10 @@
#--------------------------------------
if [ ! -z "$bootXMBytes" ];then
pID=$((pID + 1))
+ partsize=+"$bootXMBytes"M
createPartitionerInput \
- n p $pID . +"$bootXMBytes"M t $pID $bootpartID
+ n p $pID . $partsize t $pID $bootpartID
+ newparts=$((newparts - 1))
bootParam=$pID
fi
#======================================
@@ -166,6 +199,7 @@
pID=$((pID + 1))
createPartitionerInput \
n p $pID . .
+ newparts=$((newparts - 1))
homeParam=$pID
fi
#======================================
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org