commit kiwi for openSUSE:Factory
Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Fri Oct 15 17:15:57 CEST 2010. -------- --- kiwi/kiwi.changes 2010-10-08 12:55:57.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2010-10-15 15:22:08.000000000 +0200 @@ -1,0 +2,70 @@ +Fri Oct 15 14:46:41 CEST 2010 - ms@suse.de + +- v4.63 released +- rebuild documentation +- rebuild schema documentation + +------------------------------------------------------------------- +Fri Oct 15 14:14:34 CEST 2010 - ms@suse.de + +- fixed repartition code, out of bounds partitioning + +------------------------------------------------------------------- +Thu Oct 14 14:50:11 CEST 2010 - ms@suse.de + +- added setupConsole() function to activate xvc and/or hvc consoles + if their device nodes are present + +------------------------------------------------------------------- +Wed Oct 13 23:39:11 CEST 2010 - ms@suse.de + +- fixed xenconfig creation, virtual framebuffer line wasn't written + +------------------------------------------------------------------- +Wed Oct 13 23:06:09 CEST 2010 - ms@suse.de + +- fixed suse-11.3/suse-xen-guest example by removing some + old static sysconfig files. Also remove the boot.xen service + script it's no longer required as we can use the xvc device + for the console + +------------------------------------------------------------------- +Wed Oct 13 22:01:06 CEST 2010 - ms@suse.de + +- added support for targetdevice option for filesystem images +- if the targetdevice option is used check if the device + exists before proceeding + +------------------------------------------------------------------- +Tue Oct 12 13:09:17 CEST 2010 - ms@suse.de + +- make sure volume is active again if no LVM repartition takes + place. This is because recreateVTOCTable has deactivated the + volume group before + +------------------------------------------------------------------- +Tue Oct 12 13:05:45 CEST 2010 - root@suse.de + +- fixed LVM based repartition code for s390 and DASD, it's required to + recreate the VTOC table here before you can create new partitions + +------------------------------------------------------------------- +Tue Oct 12 12:32:17 CEST 2010 - ms@suse.de + +- fixed creation of VTOC table; close active device maps first + +------------------------------------------------------------------- +Mon Oct 11 18:13:25 CEST 2010 - ms@suse.de + +- fixed spec file requirements, grub and clicfs only exists + on ix86 and x86_64 + +------------------------------------------------------------------- +Mon Oct 11 18:00:24 CEST 2010 - ms@suse.de + +- fixed use of satsolver if ensconce is used together with + pattern names. ensonce uses an already resolved manifest file + and thus it's not required to solve the patterns via + satsolver (bnc #643442) + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.1haOGW/_old 2010-10-15 17:15:44.000000000 +0200 +++ /var/tmp/diff_new_pack.1haOGW/_new 2010-10-15 17:15:44.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 4.62) +# spec file for package kiwi (Version 4.63) # # Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -50,17 +50,17 @@ Requires: perl-XML-LibXML perl-libwww-perl screen coreutils Requires: perl-XML-LibXML-Common perl-XML-SAX perl-Config-IniFiles Requires: kiwi-tools libxslt checkmedia -%ifarch %ix86 x86_64 -Requires: master-boot-code -%endif %if %{suse_version} > 1030 Requires: satsolver-tools %endif +%ifarch %ix86 x86_64 +Requires: master-boot-code %if %{suse_version} > 1110 Requires: clicfs %endif +%endif Summary: OpenSuSE - KIWI Image System -Version: 4.62 +Version: 4.63 Release: 1 Group: System/Management License: GPLv2 @@ -200,7 +200,10 @@ %package -n kiwi-desc-vmxboot License: GPLv2+ Requires: kiwi = %{version} -Requires: multipath-tools parted grub +Requires: multipath-tools parted +%ifarch %ix86 x86_64 +Requires: grub +%endif %if 0%{?suse_version} >= 1130 Requires: virt-utils %else @@ -249,7 +252,10 @@ %else Requires: qemu %endif -Requires: multipath-tools parted grub +Requires: multipath-tools parted +%ifarch %ix86 x86_64 +Requires: grub +%endif %if %{suse_version} > 1010 Requires: genisoimage %else ++++++ 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 2010-10-08 12:53:37.000000000 +0200 +++ new/kiwi/.revision 2010-10-15 15:17:16.000000000 +0200 @@ -1 +1 @@ -7d34bd83c7e630b672a804af7fd15fb5f0a29666 +d04a0c0ed79b83933469ceb5a48066f764f55ddb diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl --- old/kiwi/kiwi.pl 2010-10-08 12:53:37.000000000 +0200 +++ new/kiwi/kiwi.pl 2010-10-15 15:17:16.000000000 +0200 @@ -46,7 +46,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "4.62"; +our $Version = "4.63"; our $Publisher = "SUSE LINUX Products GmbH"; our $Preparer = "KIWI - http://kiwi.berlios.de"; our $openSUSE = "http://download.opensuse.org"; @@ -851,23 +851,23 @@ my $ok; SWITCH: for ($attr{type}) { /^ext2/ && do { - $ok = $image -> createImageEXT2 (); + $ok = $image -> createImageEXT2 ( $targetDevice ); last SWITCH; }; /^ext3/ && do { - $ok = $image -> createImageEXT3 (); + $ok = $image -> createImageEXT3 ( $targetDevice ); last SWITCH; }; /^ext4/ && do { - $ok = $image -> createImageEXT4 (); + $ok = $image -> createImageEXT4 ( $targetDevice ); last SWITCH; }; /^reiserfs/ && do { - $ok = $image -> createImageReiserFS (); + $ok = $image -> createImageReiserFS ( $targetDevice ); last SWITCH; }; /^btrfs/ && do { - $ok = $image -> createImageBTRFS (); + $ok = $image -> createImageBTRFS ( $targetDevice ); last SWITCH; }; /^squashfs/ && do { @@ -1505,6 +1505,11 @@ $kiwi -> failed (); my $code = kiwiExit (1); return $code; } + if (($targetDevice) && (! -b $targetDevice)) { + $kiwi -> error ("Target device $targetDevice doesn't exist"); + $kiwi -> failed (); + my $code = kiwiExit (1); return $code; + } if ((defined $IgnoreRepos) && (defined $SetRepository)) { $kiwi -> error ("Can't use ignore repos together with set repos"); $kiwi -> failed (); 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-10-01 15:53:31.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2010-10-15 15:17:17.000000000 +0200 @@ -306,37 +306,51 @@ } #========================================== -# createImageEXT2 +# createImageEXT #------------------------------------------ -sub createImageEXT2 { +sub createImageEXT { # ... # Create EXT2 image from source tree # --- my $this = shift; my $journal = shift; + my $device = shift; #========================================== # PRE filesystem setup #------------------------------------------ - my $name = $this -> preImage (); + my $name = $this -> preImage ($device); if (! defined $name) { return undef; } #========================================== # Create filesystem on extend #------------------------------------------ - if (! $this -> setupEXT2 ( $name,$journal )) { + if (! $this -> setupEXT2 ( $name,$journal,$device )) { return undef; } #========================================== # POST filesystem setup #------------------------------------------ - if (! $this -> postImage ($name)) { + if (! $this -> postImage ($name,undef,undef,$device)) { return undef; } return $this; } #========================================== +# createImageEXT2 +#------------------------------------------ +sub createImageEXT2 { + # ... + # create journaled EXT2 image from source tree + # --- + my $this = shift; + my $device = shift; + my $journal = "journaled-ext2"; + return $this -> createImageEXT ($journal,$device); +} + +#========================================== # createImageEXT3 #------------------------------------------ sub createImageEXT3 { @@ -344,7 +358,9 @@ # create journaled EXT3 image from source tree # --- my $this = shift; - return $this -> createImageEXT2 ("journaled-ext3"); + my $device = shift; + my $journal = "journaled-ext3"; + return $this -> createImageEXT ($journal,$device); } #========================================== @@ -355,7 +371,9 @@ # create journaled EXT4 image from source tree # --- my $this = shift; - return $this -> createImageEXT2 ("journaled-ext4"); + my $device = shift; + my $journal = "journaled-ext4"; + return $this -> createImageEXT ($journal,$device); } #========================================== @@ -366,23 +384,24 @@ # create journaled ReiserFS image from source tree # --- my $this = shift; + my $device = shift; #========================================== # PRE filesystem setup #------------------------------------------ - my $name = $this -> preImage (); + my $name = $this -> preImage ($device); if (! defined $name) { return undef; } #========================================== # Create filesystem on extend #------------------------------------------ - if (! $this -> setupReiser ( $name )) { + if (! $this -> setupReiser ( $name,$device )) { return undef; } #========================================== # POST filesystem setup #------------------------------------------ - if (! $this -> postImage ($name)) { + if (! $this -> postImage ($name,undef,undef,$device)) { return undef; } return $this; @@ -396,23 +415,24 @@ # create BTRFS image from source tree # --- my $this = shift; + my $device = shift; #========================================== # PRE filesystem setup #------------------------------------------ - my $name = $this -> preImage (); + my $name = $this -> preImage ($device); if (! defined $name) { return undef; } #========================================== # Create filesystem on extend #------------------------------------------ - if (! $this -> setupBTRFS ( $name )) { + if (! $this -> setupBTRFS ( $name,$device )) { return undef; } #========================================== # POST filesystem setup #------------------------------------------ - if (! $this -> postImage ($name)) { + if (! $this -> postImage ($name,undef,undef,$device)) { return undef; } return $this; @@ -2726,9 +2746,9 @@ # dependant tasks before the logical extend # has been created # --- - my $this = shift; + my $this = shift; my $haveExtend = shift; - my $quiet= shift; + my $quiet = shift; #========================================== # Get image creation date and name #------------------------------------------ @@ -2935,19 +2955,20 @@ my $name = shift; my $nozip = shift; my $fstype= shift; + my $device= shift; my $kiwi = $this->{kiwi}; my $xml = $this->{xml}; #========================================== # mount logical extend for data transfer #------------------------------------------ - my $extend = $this -> mountLogicalExtend ($name); + my $extend = $this -> mountLogicalExtend ($name,undef,$device); if (! defined $extend) { return undef; } #========================================== # copy physical to logical #------------------------------------------ - if (! $this -> installLogicalExtend ($extend)) { + if (! $this -> installLogicalExtend ($extend,undef,$device)) { $this -> cleanLuks(); return undef; } @@ -3187,6 +3208,7 @@ my $this = shift; my $extend = shift; my $source = shift; + my $device = shift; my $kiwi = $this->{kiwi}; my $imageTree = $this->{imageTree}; if (! defined $source) { @@ -3209,6 +3231,24 @@ return undef; } $kiwi -> done(); + #========================================== + # dump image file from device if requested + #------------------------------------------ + if ($device) { + $this -> cleanMount(); + $name = $this -> buildImageName (); + $kiwi -> info ("Dumping filesystem image from $device..."); + $data = qxx ("dd if=$device of=$this->{imageDest}/$name bs=32k 2>&1"); + $code = $? >> 8; + if ($code != 0) { + $kiwi -> failed (); + $kiwi -> error ("Failed to load filesystem image"); + $kiwi -> failed (); + $kiwi -> error ($data); + return undef; + } + $kiwi -> done(); + } return $extend; } @@ -3286,23 +3326,30 @@ # mountLogicalExtend #------------------------------------------ sub mountLogicalExtend { - my $this = shift; - my $name = shift; - my $opts = shift; - my $kiwi = $this->{kiwi}; + my $this = shift; + my $name = shift; + my $opts = shift; + my $device = shift; + my $kiwi = $this->{kiwi}; #========================================== # mount logical extend for data transfer #------------------------------------------ - mkdir "$this->{imageDest}/mnt-$$"; - my $mount = "mount -o loop"; + my $target = "$this->{imageDest}/$name"; + my $mount = "mount"; if (defined $opts) { - $mount = "mount $opts -o loop"; + $mount = "mount $opts"; + } + if ($device) { + $target = $device; + } else { + $mount .= " -o loop"; } + mkdir "$this->{imageDest}/mnt-$$"; #========================================== # check for filesystem options #------------------------------------------ my $fstype = qxx ( - "/sbin/blkid -c /dev/null -s TYPE -o value $this->{imageDest}/$name" + "/sbin/blkid -c /dev/null -s TYPE -o value $target" ); chomp $fstype; if ($fstype eq "ext4") { @@ -3313,7 +3360,7 @@ $mount .= ",nodelalloc"; } my $data= qxx ( - "$mount $this->{imageDest}/$name $this->{imageDest}/mnt-$$ 2>&1" + "$mount $target $this->{imageDest}/mnt-$$ 2>&1" ); my $code= $? >> 8; if ($code != 0) { @@ -3321,7 +3368,7 @@ $kiwi -> error ("Image loop mount failed:"); $kiwi -> failed (); $kiwi -> error ( - "mnt: $this->{imageDest}/$name -> $this->{imageDest}/mnt-$$: $data" + "mnt: $target -> $this->{imageDest}/mnt-$$: $data" ); return undef; } @@ -3469,6 +3516,7 @@ my $this = shift; my $name = shift; my $journal = shift; + my $device = shift; my $kiwi = $this->{kiwi}; my $xml = $this->{xml}; my %type = %{$xml->getImageTypeAndAttributes()}; @@ -3476,6 +3524,7 @@ my $tuneopts; my %FSopts = main::checkFSOptions(); my $fstool; + my $target = "$this->{imageDest}/$name"; if ((defined $journal) && ($journal eq "journaled-ext3")) { $fsopts = $FSopts{ext3}; $fstool = "mkfs.ext3"; @@ -3491,10 +3540,13 @@ } $tuneopts = $type{fsnocheck} eq "true" ? "-c 0 -i 0" : ""; $tuneopts = $FSopts{extfstune} if $FSopts{extfstune}; - my $data = qxx ("$fstool $fsopts $this->{imageDest}/$name 2>&1"); + if ($device) { + $target = $device; + } + my $data = qxx ("$fstool $fsopts $target 2>&1"); my $code = $? >> 8; if (!$code && $tuneopts) { - $data = qxx ("/sbin/tune2fs $tuneopts $this->{imageDest}/$name 2>&1"); + $data = qxx ("/sbin/tune2fs $tuneopts $target 2>&1"); $code = $? >> 8; } if ($code != 0) { @@ -3503,6 +3555,9 @@ $kiwi -> error ($data); return undef; } + if ($device) { + qxx ("touch $this->{imageDest}/$name"); + } $this -> restoreImageDest(); if ((defined $journal) && ($journal eq "journaled-ext3")) { $data = qxx ("cd $this->{imageDest} && ln -vs $name $name.ext3 2>&1"); @@ -3520,13 +3575,18 @@ # setupBTRFS #------------------------------------------ sub setupBTRFS { - my $this = shift; - my $name = shift; - my $kiwi = $this->{kiwi}; + my $this = shift; + my $name = shift; + my $device = shift; + my $kiwi = $this->{kiwi}; my %FSopts = main::checkFSOptions(); my $fsopts = $FSopts{btrfs}; + my $target = "$this->{imageDest}/$name"; + if ($device) { + $target = $device; + } my $data = qxx ( - "/sbin/mkfs.btrfs $fsopts $this->{imageDest}/$name 2>&1" + "/sbin/mkfs.btrfs $fsopts $target 2>&1" ); my $code = $? >> 8; if ($code != 0) { @@ -3535,6 +3595,9 @@ $kiwi -> error ($data); return undef; } + if ($device) { + qxx ("touch $this->{imageDest}/$name"); + } $this -> restoreImageDest(); $data = qxx ("cd $this->{imageDest} && ln -vs $name $name.btrfs 2>&1"); $this -> remapImageDest(); @@ -3546,14 +3609,19 @@ # setupReiser #------------------------------------------ sub setupReiser { - my $this = shift; - my $name = shift; + my $this = shift; + my $name = shift; + my $device = shift; my $kiwi = $this->{kiwi}; my %FSopts = main::checkFSOptions(); my $fsopts = $FSopts{reiserfs}; + my $target = "$this->{imageDest}/$name"; + if ($device) { + $target = $device; + } $fsopts.= "-f"; my $data = qxx ( - "/sbin/mkreiserfs $fsopts $this->{imageDest}/$name 2>&1" + "/sbin/mkreiserfs $fsopts $target 2>&1" ); my $code = $? >> 8; if ($code != 0) { @@ -3562,6 +3630,9 @@ $kiwi -> error ($data); return undef; } + if ($device) { + qxx ("touch $this->{imageDest}/$name"); + } $this -> restoreImageDest(); $data = qxx ("cd $this->{imageDest} && ln -vs $name $name.reiserfs 2>&1"); $this -> remapImageDest(); 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-10-08 12:53:38.000000000 +0200 +++ new/kiwi/modules/KIWIImageFormat.pm 2010-10-15 15:17:17.000000000 +0200 @@ -550,8 +550,11 @@ #------------------------------------------ if ($type{type} eq "xen") { print $FD 'root="'.$part.' ro"'."\n"; - print $FD 'vfb = ["type=vnc,vncunused=1,vnclisten=0.0.0.0"]'."\n"; } + #========================================== + # xen virtual framebuffer + #------------------------------------------ + print $FD 'vfb = ["type=vnc,vncunused=1,vnclisten=0.0.0.0"]'."\n"; close $FD; $kiwi -> done(); return $file; 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-10-08 12:53:38.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2010-10-15 15:17:17.000000000 +0200 @@ -1372,7 +1372,6 @@ local initrd="" local title="" local fbmode=$vga - local xencons=$xencons if [ ! -z "$OEM_RECOVERY" ];then local gdevreco=$recoid fi @@ -1499,8 +1498,10 @@ if [ ! -z "$swap" ];then echo -n " resume=$swapByID" >> $conf fi - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $conf + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $conf + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $conf fi echo -n " $KIWI_INITRD_PARAMS" >> $conf echo -n " $KIWI_KERNEL_OPTIONS" >> $conf @@ -1530,8 +1531,10 @@ if [ ! -z "$swap" ];then echo -n " resume=$swapByID" >> $conf fi - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $conf + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $conf + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $conf fi echo -n " $KIWI_INITRD_PARAMS" >> $conf echo -n " $KIWI_KERNEL_OPTIONS" >> $conf @@ -1600,7 +1603,6 @@ local title="" local rdisk="" local fbmode=$vga - local xencons=$xencons if [ ! -z "$OEM_RECOVERY" ];then local gdevreco=$(expr $recoid - 1) fi @@ -1711,8 +1713,10 @@ if [ ! -z "$swap" ];then echo -n " resume=$swapByID" >> $menu fi - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $menu + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $menu + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $menu fi echo -n " $KIWI_INITRD_PARAMS" >> $menu echo -n " $KIWI_KERNEL_OPTIONS" >> $menu @@ -1731,8 +1735,10 @@ if [ ! -z "$swap" ];then echo -n " resume=$swapByID" >> $menu fi - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $menu + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $menu + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $menu fi echo -n " $KIWI_INITRD_PARAMS" >> $menu echo -n " $KIWI_KERNEL_OPTIONS" >> $menu @@ -1763,8 +1769,10 @@ fi echo -n " showopts ide=nodma apm=off acpi=off" >> $menu echo -n " noresume selinux=0 nosmp" >> $menu - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $menu + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $menu + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $menu fi echo " noapic maxcpus=0 edd=off" >> $menu echo " module /boot/$initrd" >> $menu @@ -1782,8 +1790,10 @@ fi echo -n " showopts ide=nodma apm=off acpi=off" >> $menu echo -n " noresume selinux=0 nosmp" >> $menu - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $menu + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $menu + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $menu fi echo " noapic maxcpus=0 edd=off" >> $menu echo " initrd $gdev/boot/$initrd" >> $menu @@ -1861,7 +1871,6 @@ local title="" local rdisk="" local fbmode=$vga - local xencons=$xencons if [ -z "$fbmode" ];then fbmode=$DEFAULT_VGA fi @@ -1971,8 +1980,10 @@ if [ ! -z "$swap" ];then echo -n " resume=$swapByID" >> $conf fi - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $conf + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $conf + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $conf fi echo -n " $KIWI_INITRD_PARAMS" >> $conf echo -n " $KIWI_KERNEL_OPTIONS" >> $conf @@ -2002,8 +2013,10 @@ if [ ! -z "$swap" ];then echo -n " resume=$swapByID" >> $conf fi - if [ ! -z "$xencons" ]; then - echo -n " xencons=$xencons" >> $conf + if [ -e /dev/xvc0 ];then + echo -n " console=xvc console=tty" >> $conf + elif [ -e /dev/hvc0 ];then + echo -n " console=hvc console=tty" >> $conf fi echo -n " $KIWI_INITRD_PARAMS" >> $conf echo -n " $KIWI_KERNEL_OPTIONS" >> $conf @@ -5836,6 +5849,10 @@ value=$(echo ${pcmds[$index + 4]} | cut -f1 -dM | tr -d +) value=$(partedMBToCylinder $value) pstopp=$((1 + $pstopp + $value)) + if [ $pstopp -gt $partedCylCount ];then + # given size is out of bounds, reduce to end of disk + pstopp=$partedCylCount + fi fi cmdq="$cmdq mkpart primary $pstart $pstopp" partedWrite "$disk" "$cmdq" @@ -6334,6 +6351,24 @@ done } #====================================== +# setupConsole +#-------------------------------------- +function setupConsole { + # /.../ + # setup the xvc and/or hvc console if the device is present + # ---- + local itab=/etc/inittab + local stty=/etc/securetty + if [ -e /dev/xvc0 ];then + echo "X0:12345:respawn:/sbin/mingetty --noclear xvc0 linux" >> $itab + echo xvc0 >> $stty + fi + if [ -e /dev/hvc0 ];then + echo "H0:12345:respawn:/sbin/mingetty --noclear hvc0 linux" >> $itab + echo hvc0 >> $stty + fi +} +#====================================== # initialize #-------------------------------------- function initialize { 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-10-08 12:53:38.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2010-10-15 15:17:17.000000000 +0200 @@ -3263,7 +3263,9 @@ push @pattlist,"pattern:".$pattern; } if (@pattlist) { - if (($manager ne "zypper") && ($manager ne "yum")) { + if (($manager eq "ensconce")) { + # nothing to do for ensconce here... + } elsif (($manager ne "zypper") && ($manager ne "yum")) { #========================================== # turn patterns into pacs for this manager #------------------------------------------ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/suse-preinit new/kiwi/system/boot/ix86/isoboot/suse-preinit --- old/kiwi/system/boot/ix86/isoboot/suse-preinit 2010-05-07 13:06:34.000000000 +0200 +++ new/kiwi/system/boot/ix86/isoboot/suse-preinit 2010-10-15 15:17:17.000000000 +0200 @@ -31,11 +31,16 @@ updateMTAB #====================================== -# 3) create framebuffer devices +# 3) setup console +#-------------------------------------- +setupConsole + +#====================================== +# 4) create framebuffer devices #-------------------------------------- createFramebufferDevices #====================================== -# 4) clean mount +# 5) clean mount #-------------------------------------- umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-preinit new/kiwi/system/boot/ix86/netboot/suse-preinit --- old/kiwi/system/boot/ix86/netboot/suse-preinit 2010-03-18 15:04:10.000000000 +0100 +++ new/kiwi/system/boot/ix86/netboot/suse-preinit 2010-10-15 15:17:17.000000000 +0200 @@ -150,7 +150,12 @@ fi #====================================== -# 13) kill udev +# 13) setup console +#-------------------------------------- +setupConsole + +#====================================== +# 14) kill udev #-------------------------------------- if [ ! -z "$DISK" ] && [ "$systemIntegrity" = "clean" ]; then if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-preinit new/kiwi/system/boot/ix86/oemboot/suse-preinit --- old/kiwi/system/boot/ix86/oemboot/suse-preinit 2010-05-31 11:31:23.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-preinit 2010-10-15 15:17:17.000000000 +0200 @@ -146,7 +146,12 @@ fi #====================================== -# 11) kill udev +# 11) setup console +#-------------------------------------- +setupConsole + +#====================================== +# 12) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/usbboot/suse-preinit new/kiwi/system/boot/ix86/usbboot/suse-preinit --- old/kiwi/system/boot/ix86/usbboot/suse-preinit 2010-07-19 10:48:35.000000000 +0200 +++ new/kiwi/system/boot/ix86/usbboot/suse-preinit 2010-10-15 15:17:17.000000000 +0200 @@ -98,7 +98,12 @@ fi #====================================== -# 10) kill udev +# 10) setup console +#-------------------------------------- +setupConsole + +#====================================== +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/suse-preinit new/kiwi/system/boot/ix86/vmxboot/suse-preinit --- old/kiwi/system/boot/ix86/vmxboot/suse-preinit 2010-07-19 10:48:35.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/suse-preinit 2010-10-15 15:17:17.000000000 +0200 @@ -98,7 +98,12 @@ fi #====================================== -# 10) kill udev +# 10) setup console +#-------------------------------------- +setupConsole + +#====================================== +# 11) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems 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-10-01 15:53:33.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-repart 2010-10-15 15:17:17.000000000 +0200 @@ -391,6 +391,7 @@ Echo "Disk is too small, will not re-partition it" disableOEMParameters disableRepart + vgchange -a y $VGROUP fi #====================================== # write new partition table @@ -413,7 +414,7 @@ #-------------------------------------- if [ ! -z "$OEM_RECOVERY" ];then createPartitionerInput \ - n p $pID . +"$recoMByte"M t $pID $recoID + u y n p $pID . +"$recoMByte"M t $pID $recoID recoParam=$pID pID=$((pID + 1)) fi @@ -421,7 +422,7 @@ # add rest space LVM partition #-------------------------------------- createPartitionerInput \ - n p $pID . . t $pID 8e + u y n p $pID . . t $pID 8e extendID=$pID #====================================== # setup new device names @@ -688,6 +689,15 @@ # re-create VTOC re-using existing partition sizes # ---- Echo "Recreate VTOC table [ $imageDiskDevice ]" + if [ ! -z "$haveLVM" ];then + #====================================== + # close open device mappings + #-------------------------------------- + if [ "$haveLuks" = "yes" ];then + luksClose + fi + vgchange -an + fi createPartitionerInput u y w callPartitioner $input rm -f $input ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root@hilbert.suse.de