Mailinglist Archive: opensuse-commit (1083 mails)
| < Previous | Next > |
commit kiwi
- From: root@xxxxxxxxxxxxxxx (h_root)
- Date: Thu, 20 Sep 2007 14:03:40 +0200
- Message-id: <20070920120340.6BB78678331@xxxxxxxxxxxxxxx>
Hello community,
here is the log from the commit of package kiwi
checked in at Thu Sep 20 14:03:40 CEST 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-09-19 18:51:19.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-09-20 12:02:17.006265000 +0200
@@ -1,0 +2,12 @@
+Wed Sep 19 19:31:24 CEST 2007 - ms@xxxxxxx
+
+- added check for isolinux-config in suse-isolinux
+- added checks for copy calls in KIWIImage.pm while creating
+ a live ISO image
+- don't install grub if initrd and/or menu.lst can't be
+ created in case of an oemboot system
+- fixed mount in oemboot if not unified system
+- better failed message if system image is too small to hold
+ the boot image data required for virtual disk boot
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.C32702/_old 2007-09-20 14:02:30.000000000 +0200
+++ /var/tmp/diff_new_pack.C32702/_new 2007-09-20 14:02:30.000000000 +0200
@@ -16,7 +16,7 @@
Requires: perl perl-XML-LibXML perl-libwww-perl screen
Summary: OpenSuSE - KIWI Image System
Version: 1.64
-Release: 13
+Release: 14
Group: System/Management
License: GPL v2 or later
Source: kiwi.tar.bz2
@@ -326,6 +326,15 @@
%doc %{_datadir}/kiwi/image/oemboot/README
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
+* Wed Sep 19 2007 - ms@xxxxxxx
+- added check for isolinux-config in suse-isolinux
+- added checks for copy calls in KIWIImage.pm while creating
+ a live ISO image
+- don't install grub if initrd and/or menu.lst can't be
+ created in case of an oemboot system
+- fixed mount in oemboot if not unified system
+- better failed message if system image is too small to hold
+ the boot image data required for virtual disk boot
* Tue Sep 18 2007 - ms@xxxxxxx
- reread partition table after oemboot installation
- fixed repartition code for squasfs/aufs based system images
++++++ kiwi.tar.bz2 ++++++
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 2007-09-19 18:46:00.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2007-09-20 11:57:56.000000000 +0200
@@ -1204,7 +1204,7 @@
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
- $kiwi -> error ("Couldn't install image: $status");
+ $kiwi -> error ("Couldn't copy boot data to system image: $status");
$kiwi -> failed ();
qx ( umount /mnt/ 2>&1 );
qx ( /sbin/kpartx -d $loop );
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 2007-09-17 10:51:13.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2007-09-20 11:57:56.000000000 +0200
@@ -862,24 +862,49 @@
$kiwi -> info ("Copying boot image and kernel [$isoarch]");
my $destination = "$main::RootTree/CD/boot/$isoarch/loader";
qx (mkdir -p $destination);
- qx (cp $imageDest/$iso*$arch*.gz $destination/initrd);
- qx (cp $imageDest/$iso*$arch*.kernel $destination/linux);
+ $data = qx (cp $imageDest/$iso*$arch*.gz $destination/initrd);
+ $code = $? >> 8;
+ if ($code == 0) {
+ $data = qx (cp $imageDest/$iso*$arch*.kernel $destination/linux);
+ $code = $? >> 8;
+ }
+ if ($code != 0) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Copy failed: $data");
+ $kiwi -> failed ();
+ return undef;
+ }
$kiwi -> done ();
-
#==========================================
# copy base CD files
#------------------------------------------
$kiwi -> info ("Setting up isolinux boot CD [$isoarch]");
- qx (cp -a $gfx/* $destination);
- qx (cp $CD/isolinux.cfg $destination);
- qx (cp $CD/isolinux.msg $destination);
+ $data = qx (cp -a $gfx/* $destination);
+ $code = $? >> 8;
+ if ($code == 0) {
+ $data = qx (cp $CD/isolinux.cfg $destination);
+ $code = $? >> 8;
+ if ($code == 0) {
+ $data = qx (cp $CD/isolinux.msg $destination);
+ $code = $? >> 8;
+ }
+ }
+ if ($code != 0) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Copy failed: $data");
+ $kiwi -> failed ();
+ return undef;
+ }
$kiwi -> done ();
-
#==========================================
# remove original kernel and initrd
#------------------------------------------
- qx (rm -f $imageDest/$iso*.*]);
-
+ $data = qx (rm $imageDest/$iso*.* 2>&1);
+ $code = $? >> 8;
+ if ($code != 0) {
+ $kiwi -> warning ("Couldn't cleanup boot files: $data");
+ $kiwi -> skipped ();
+ }
#==========================================
# Create boot configuration
#------------------------------------------
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2007-09-19 18:50:41.000000000 +0200
+++ new/kiwi/.revision 2007-09-20 12:01:29.000000000 +0200
@@ -1 +1 @@
-627
\ No newline at end of file
+632
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-isolinux new/kiwi/system/boot/isoboot/suse-isolinux
--- old/kiwi/system/boot/isoboot/suse-isolinux 2007-09-17 16:05:48.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-isolinux 2007-09-20 11:57:55.000000000 +0200
@@ -198,7 +198,12 @@
fi
fi
-/usr/bin/isolinux-config --base $BOOT_ISOLINUX $SOURCE/$BOOT_ISOLINUX/isolinux.bin
+if [ ! -x /usr/bin/isolinux-config ];then
+ echo "Can't find isolinux-config binary"
+ exit 1
+fi
+/usr/bin/isolinux-config \
+ --base $BOOT_ISOLINUX $SOURCE/$BOOT_ISOLINUX/isolinux.bin
mkisofs \
-p "$CD_PREPARER" \
-publisher "$CD_PUBLISHER" \
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-19 18:45:58.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-09-20 11:57:55.000000000 +0200
@@ -246,6 +246,7 @@
#======================================
# 6.7) find new root partition
#--------------------------------------
+ unset UNIONFS_CONFIG
deviceRoot="$deviceDisk"2
probeFileSystem $deviceRoot
if test "$FSTYPE" = "unknown";then
@@ -528,7 +529,7 @@
if test ! -z "$i";then
kernel=`echo $i | cut -f1 -d:`
initrd=`echo $i | cut -f2 -d:`
- echo "title SUSE Linux OEM ($kernel)" >> $menu
+ echo "title SLE/SUSE Linux OEM" >> $menu
echo -n " kernel $gdev/boot/$kernel" >> $menu
echo -n " root=${deviceDisk}2 $console" >> $menu
echo " vga=0x314" >> $menu
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-preinit new/kiwi/system/boot/oemboot/suse-preinit
--- old/kiwi/system/boot/oemboot/suse-preinit 2007-09-19 18:45:59.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-preinit 2007-09-20 11:57:55.000000000 +0200
@@ -29,6 +29,7 @@
#======================================
# 2) create initrd on diskful
#--------------------------------------
+grubOK=1
if [ -z "$UNIONFS_CONFIG" ]; then
if test -L /boot/boot;then
mount -t proc proc /proc
@@ -39,6 +40,7 @@
else
Echo "Image doesn't provide kernel system map"
Echo "Can't create initrd"
+ grubOK=0
fi
else
if mount $deviceBoot /kiwiboot;then
@@ -50,24 +52,27 @@
if [ -f /boot/message ];then
echo "gfxmenu $gdev/boot/message" >> $menu
fi
- echo "title KIWI VM boot" >> $menu
+ echo "title SLE/SUSE Linux OEM" >> $menu
echo -n " kernel $gdev/boot/linux.vmx" >> $menu
echo -n " root=${deviceDisk}1 $console" >> $menu
echo " $KIWI_INITRD_PARAMS vga=0x314" >> $menu
echo " initrd $gdev/boot/initrd.vmx" >> $menu
else
Echo "Failed to mount boot partition"
- Echo "Local grub installation will fail !"
+ Echo "Can't create grub configuration"
+ grubOK=0
fi
fi
#======================================
-# 3) Install boot loader on diskful
+# 3) Install boot loader if ok
#--------------------------------------
-if test -f "/usr/sbin/grub";then
- Echo "Installing boot loader..."
- /usr/sbin/grub --batch --no-floppy < /etc/grub.conf >/dev/null 2>&1
-else
- Echo "Image doesn't provide grub support"
- Echo "Can't install boot loader"
+if [ $grubOK = 1 ];then
+ if test -f "/usr/sbin/grub";then
+ Echo "Installing boot loader..."
+ /usr/sbin/grub --batch --no-floppy < /etc/grub.conf >/dev/null 2>&1
+ else
+ Echo "Image doesn't provide grub support"
+ Echo "Can't install boot loader"
+ fi
fi
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@xxxxxxxxxxxx
For additional commands, e-mail: opensuse-commit+help@xxxxxxxxxxxx
| < Previous | Next > |