Mailinglist Archive: opensuse-commit (1083 mails)

[root@xxxxxxxxxxxxxxx (h_root)]

Hello community,

here is the log from the commit of package kiwi
checked in at Thu Sep 20 16:30:00 CEST 2007.

--------
--- arch/i386/kiwi/kiwi.changes 2007-09-20 12:02:17.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes      2007-09-20 16:20:38.368777000 +0200
@@ -1,0 +2,6 @@
+Thu Sep 20 14:44:02 CEST 2007 - ms@xxxxxxx
+
+- fixed oemboot linuxrc for vmx raw boot (#309800)
+- fixed repartition code in oemboot for small disks (#309800)
+
+-------------------------------------------------------------------

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.Et1387/_old  2007-09-20 16:29:49.000000000 +0200
+++ /var/tmp/diff_new_pack.Et1387/_new  2007-09-20 16:29:49.000000000 +0200
@@ -16,7 +16,7 @@
 Requires:       perl perl-XML-LibXML perl-libwww-perl screen
 Summary:        OpenSuSE - KIWI Image System
 Version:        1.64
-Release:        14
+Release:        15
 Group:          System/Management
 License:        GPL v2 or later
 Source:         kiwi.tar.bz2
@@ -326,6 +326,9 @@
 %doc %{_datadir}/kiwi/image/oemboot/README
 %{_datadir}/kiwi/image/oemboot/suse*
 %changelog
+* Thu Sep 20 2007 - ms@xxxxxxx
+- fixed oemboot linuxrc for vmx raw boot (#309800)
+- fixed repartition code in oemboot for small disks (#309800)
 * Wed Sep 19 2007 - ms@xxxxxxx
 - added check for isolinux-config in suse-isolinux
 - added checks for copy calls in KIWIImage.pm while creating

++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision  2007-09-20 12:01:29.000000000 +0200
+++ new/kiwi/.revision  2007-09-20 16:17:40.000000000 +0200
@@ -1 +1 @@
-632
\ No newline at end of file
+633
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-linuxrc new/kiwi/system/boot/oemboot/suse-linuxrc
--- old/kiwi/system/boot/oemboot/suse-linuxrc   2007-09-20 11:57:55.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-linuxrc   2007-09-20 16:14:04.000000000 +0200
@@ -134,6 +134,8 @@
                        export UNIONFS_CONFIG="$deviceDisk"3,"$deviceDisk"2,aufs
                        export deviceRoot="$deviceDisk"2
                        export deviceSwap="$deviceDisk"4
+               else
+                       export deviceRoot="$deviceDisk"1
                fi
                Echo "Using root partition $deviceRoot on disk $deviceDisk"
        fi
@@ -345,7 +347,26 @@
                # ----
                input=/part.input
                rm -f $input
-               for cmd in d n p 2 1 +10240M n p 1 . +"$swapsize"M n p 3 . . t 1 82 w;do
+               disk1MBytes=10240
+               diskXMBytes=`sfdisk -s $deviceDisk`
+               diskXMBytes=`expr $diskXMBytes / 1024`
+               if [ $disk1MBytes -gt $diskXMBytes ];then
+                       # /.../
+                       # Very small disk, we use half of the size for root and
+                       # assume the rest is ok for /home and /. Additionally we set
+                       # the swap space to 50MB. All this could fail if the disk
+                       # is really small so that / doesn't fit into half of
+                       # $diskXMBytes
+                       # ----
+                       disk1MBytes=`expr $diskXMBytes / 2`
+                       swapsize=50
+               fi
+               for cmd in \
+                       d n p 2 1 +"$disk1MBytes"M \
+                       n p 1 . +"$swapsize"M \
+                       n p 3 . . \
+                       t 1 82 w
+               do
                        if [ $cmd = "." ];then
                                echo >> $input
                                continue
@@ -391,6 +412,18 @@
                disk2MBytes=`expr $disk2MBytes / 1024`
                disk3MBytes=`expr $diskXMBytes - $disk1MBytes - $disk2MBytes`
                disk3MBytes=`expr $disk3MBytes - $swapXMBytes`
+               if [ $disk3MBytes -lt 100 ];then
+                       # /.../
+                       # Very small disk, we use only 50MB of swap and assume
+                       # that the rest disk space is big enough to create the
+                       # RW and swap partition. All this could fail if the disk
+                       # is not big enough compared to the system image already
+                       # installed
+                       # ----
+                       swapsize=50
+                       disk3MBytes=`expr $diskXMBytes - $disk1MBytes - $disk2MBytes`
+                       disk3MBytes=`expr $disk3MBytes - $swapXMBytes`
+               fi
                #======================================
                # 8.3 write new partition table
                #--------------------------------------


++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++



Remember to have fun...

---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx