Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory
checked in at Fri Jun 4 15:06:10 CEST 2010.
--------
--- kiwi/kiwi.changes 2010-05-31 11:39:45.000000000 +0200
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2010-06-04 11:53:32.000000000 +0200
@@ -1,0 +2,10 @@
+Mon May 31 15:49:53 CEST 2010 - ms@suse.de
+
+- v4.39
+- fixed CDMountOption() to use blkid type check (bnc #610649)
+- don't touch modules in updates and weak-updates (bnc #609879)
+- use vmxboot linuxrc for usbboot too, make sure --bootstick
+ deployment does a cleanup of the write partition if used
+- removed dbsulock from kiwi, hal is deprecated
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.1y3Jvh/_old 2010-06-04 15:05:58.000000000 +0200
+++ /var/tmp/diff_new_pack.1y3Jvh/_new 2010-06-04 15:05:58.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 4.38)
+# spec file for package kiwi (Version 4.39)
#
# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -22,7 +22,7 @@
Name: kiwi
BuildRequires: perl-Config-IniFiles perl-XML-LibXML perl-libwww-perl
-BuildRequires: hal-devel module-init-tools screen zlib-devel
+BuildRequires: module-init-tools screen zlib-devel
BuildRequires: gcc-c++ libxslt swig trang
%if %{suse_version} > 1020
BuildRequires: fdupes
@@ -60,7 +60,7 @@
Requires: clicfs
%endif
Summary: OpenSuSE - KIWI Image System
-Version: 4.38
+Version: 4.39
Release: 1
Group: System/Management
License: GPLv2
++++++ 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-05-31 11:31:18.000000000 +0200
+++ new/kiwi/.revision 2010-06-04 11:51:06.000000000 +0200
@@ -1 +1 @@
-92984c5bf85bf2c71fd69a3784d3dd85693fceba
+0327ef34d768e8bf28d10b164b825b5821515d69
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2010-05-31 11:31:18.000000000 +0200
+++ new/kiwi/kiwi.pl 2010-06-04 11:51:06.000000000 +0200
@@ -45,7 +45,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "4.38";
+our $Version = "4.39";
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-05-31 11:31:18.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2010-06-04 10:37:36.000000000 +0200
@@ -26,7 +26,6 @@
#------------------------------------------
use strict;
use Carp qw (cluck);
-use KIWI::dbusdevice;
use KIWILog;
use KIWIIsoLinux;
use FileHandle;
@@ -832,27 +831,6 @@
#------------------------------------------
sleep (1);
#==========================================
- # Establish HAL lock for $stick
- #------------------------------------------
- $kiwi -> info ("Establish HAL lock for: $stick");
- $hald = new KIWI::dbusdevice::HalConnection;
- if (! $hald -> open()) {
- $kiwi -> failed ();
- $kiwi -> warning ($hald->state());
- $kiwi -> skipped ();
- } else {
- $this -> {hald} = $hald;
- if ($hald -> lock($stick)) {
- $kiwi -> failed ();
- $kiwi -> warning ($hald->state());
- $kiwi -> skipped ();
- } else {
- $this -> {stick} = $stick;
- $kiwi -> loginfo ("HAL:".$hald->state());
- $kiwi -> done();
- }
- }
- #==========================================
# Check if system fits on storage device
#------------------------------------------
my $hardSize = $this -> getStorageSize ($stick);
@@ -865,7 +843,6 @@
if ($hardSize < $softSize) {
$kiwi -> error ("Stick too small: got $hardSize kB need $softSize kB");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanTmp ();
return undef;
}
@@ -1020,7 +997,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't create partition table");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanTmp ();
return undef;
}
@@ -1044,7 +1020,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't reread partition table: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanTmp ();
return undef;
}
@@ -1064,7 +1039,6 @@
\%deviceMap,$stick,$syszip,$haveSplit,\%lvmparts
);
if (! %deviceMap) {
- $this -> cleanDbus();
$this -> cleanTmp ();
return undef;
}
@@ -1116,7 +1090,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't dump system image to stick: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanTmp ();
return undef;
}
@@ -1129,7 +1102,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't dump split file: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanTmp ();
return undef;
}
@@ -1140,7 +1112,6 @@
# Create fs on system image partition
#------------------------------------------
if (! $this -> setupFilesystem ($FSTypeRO,$deviceMap{1},"root")) {
- $this -> cleanDbus();
$this -> cleanTmp ();
return undef;
}
@@ -1151,7 +1122,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't mount partition: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1167,17 +1137,14 @@
$result = $? >> 8;
if ($result != 0) {
$kiwi -> error ("Can't create mount point $loopdir/$pname");
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
if (! $this -> setupFilesystem ($FSTypeRO,$device,$pname)) {
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
if (! main::mount ($device, "$loopdir/$pname")) {
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1193,7 +1160,6 @@
$kiwi -> failed ();
$kiwi -> error ("Can't copy image tree on stick: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1237,7 +1203,6 @@
$kiwi -> error ("Couldn't resize $fsattr{type} filesystem: $status");
$kiwi -> failed ();
$this -> luksClose();
- $this -> cleanDbus();
$this -> cleanLoop ();
$this -> cleanTmp ();
return undef;
@@ -1278,7 +1243,6 @@
$kiwi -> error("Couldn't resize $fsattr{type} filesystem: $status");
$kiwi -> failed ();
$this -> luksClose();
- $this -> cleanDbus();
$this -> cleanLoop ();
$this -> cleanTmp ();
return undef;
@@ -1303,7 +1267,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't setup luks format: $root");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1313,7 +1276,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't open luks device: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1332,12 +1294,29 @@
$kiwi -> error ("Couldn't create filesystem: $status");
$kiwi -> failed ();
$this -> luksClose();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
$this -> luksClose();
$kiwi -> done();
+ } elsif ($dmapper) {
+ # /.../
+ # for USB sticks we need to make sure the write partition
+ # has been cleaned before re-use with filesystem like clicfs
+ # and friends
+ # ----
+ $root = $deviceMap{2};
+ $kiwi -> info ("Clean sweep read-write filesystem");
+ $status = qxx ("dd if=/dev/zero of=$root bs=32k count=32 2>&1");
+ $result = $? >> 8;
+ if ($result != 0) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Couldn't cleanup partition $root: $status");
+ $kiwi -> failed ();
+ $this -> cleanLoop ();
+ return undef;
+ }
+ $kiwi -> done();
}
#==========================================
# create bootloader filesystem if needed
@@ -1351,7 +1330,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't create DOS filesystem: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1383,7 +1361,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't create filesystem: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1419,7 +1396,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't mount stick image: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1433,7 +1409,6 @@
$kiwi -> failed ();
$kiwi -> error ("Couldn't copy boot data to stick: $status");
$kiwi -> failed ();
- $this -> cleanDbus();
$this -> cleanLoop ();
return undef;
}
@@ -1449,19 +1424,12 @@
# Install boot loader on USB stick
#------------------------------------------
if (! $this -> installBootLoader ($bootloader, $stick, \%deviceMap)) {
- $this -> cleanDbus();
$this -> cleanTmp ();
}
#==========================================
# cleanup temp directory
#------------------------------------------
qxx ("rm -rf $tmpdir");
- #==========================================
- # Remove dbus lock on stick
- #------------------------------------------
- $kiwi -> info ("Removing HAL lock");
- $this -> cleanDbus();
- $kiwi -> done ();
return $this;
}
@@ -3511,23 +3479,6 @@
}
#==========================================
-# cleanDbus
-#------------------------------------------
-sub cleanDbus {
- my $this = shift;
- my $stick= $this->{stick};
- my $hald = $this->{hald};
- if (! defined $hald) {
- return $this;
- }
- if (defined $stick) {
- $hald -> unlock ($stick);
- }
- $hald -> close();
- return $this;
-}
-
-#==========================================
# cleanTmp
#------------------------------------------
sub cleanTmp {
@@ -5078,23 +5029,6 @@
return undef;
}
#==========================================
- # lock device for hal
- #------------------------------------------
- if ($source !~ /loop/) {
- $hald = new KIWI::dbusdevice::HalConnection;
- if (! $hald -> open()) {
- $kiwi -> loginfo ($hald->state());
- } else {
- $this -> {lhald} = $hald;
- if ($hald -> lock ("/dev/mapper/".$name)) {
- $kiwi -> loginfo ($hald->state());
- } else {
- $this -> {lhalddevice} = "/dev/mapper/".$name;
- $kiwi -> loginfo ("HAL:".$hald->state());
- }
- }
- }
- #==========================================
# resize luks header
#------------------------------------------
$this->{luks} = $name;
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-05-31 11:31:19.000000000 +0200
+++ new/kiwi/modules/KIWIConfig.sh 2010-06-04 10:37:36.000000000 +0200
@@ -1349,6 +1349,15 @@
mv $kversion/modules.order /tmp
fi
#==========================================
+ # check for weak-/updates and backup them
+ #------------------------------------------
+ if [ -d $kversion/updates ];then
+ mv $kversion/updates /tmp
+ fi
+ if [ -d $kversion/weak-updates ];then
+ mv $kversion/weak-updates /tmp
+ fi
+ #==========================================
# strip the modules but take care for deps
#------------------------------------------
stripdir=/tmp/stripped_modules
@@ -1359,7 +1368,7 @@
do
local path=`/usr/bin/dirname $mod`
local base=`/usr/bin/basename $mod`
- for d in kernel updates weak-updates;do
+ for d in kernel;do
if [ "$base" = "*" ];then
if test -d $kversion/$d/$path ; then
mkdir -pv $stripdir$kversion/$d/$path
@@ -1407,9 +1416,18 @@
rm -rf $kversion
mv -v $stripdir/$kversion $kversion
rm -rf $stripdir
+ #==========================================
+ # restore backed up files and directories
+ #------------------------------------------
if [ -f /tmp/modules.order ];then
mv /tmp/modules.order $kversion
fi
+ if [ -d /tmp/updates ];then
+ mv /tmp/updates $kversion
+ fi
+ if [ -d /tmp/weak-updates ];then
+ mv /tmp/weak-updates $kversion
+ fi
#==========================================
# run depmod
#------------------------------------------
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-05-31 11:31:19.000000000 +0200
+++ new/kiwi/modules/KIWIImage.pm 2010-06-04 10:37:36.000000000 +0200
@@ -1230,7 +1230,7 @@
}
my $output = basename $ovffile;
$status= qxx (
- "$ovftool -oq $vmxfile $ovffile/$output 2>&1"
+ "$ovftool -o -q $vmxfile $ovffile/$output 2>&1"
);
$result = $? >> 8;
# --- beg ----
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-05-31 11:31:19.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2010-06-04 10:37:36.000000000 +0200
@@ -1272,7 +1272,7 @@
#--------------------------------------
if [ ! -z "$OEM_RECOVERY" ];then
echo "label Recovery" >> $conf
- echo "COM32 chain.c32" >> $conf
+ echo "kernel chain" >> $conf
echo "append hd0 $gdevreco" >> $conf
fi
#======================================
@@ -2428,9 +2428,8 @@
# mount option required to mount the device in full
# speed mode
# ----
- local dev=$1
- local iso="ISO 9660"
- if dd if=$dev bs=42k count=1 2>&1 | file - | grep -q $iso;then
+ local id=$(blkid -o value -s TYPE $1)
+ if [ "$id" = "iso9660" ];then
echo "-t iso9660"
fi
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/usbboot/suse-11.1/config.xml new/kiwi/system/boot/ix86/usbboot/suse-11.1/config.xml
--- old/kiwi/system/boot/ix86/usbboot/suse-11.1/config.xml 2010-05-21 15:52:47.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-11.1/config.xml 2010-06-04 10:37:37.000000000 +0200
@@ -113,6 +113,8 @@
<package name="dialog"/>
<package name="kiwi-tools"/>
<package name="parted"/>
+ <package name="syslinux"/>
+ <package name="gettext-runtime"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -121,6 +123,7 @@
<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/usbboot/suse-11.2/config.xml new/kiwi/system/boot/ix86/usbboot/suse-11.2/config.xml
--- old/kiwi/system/boot/ix86/usbboot/suse-11.2/config.xml 2010-05-31 11:31:24.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-11.2/config.xml 2010-06-04 10:37:37.000000000 +0200
@@ -108,6 +108,7 @@
<package name="kiwi-tools"/>
<package name="parted"/>
<package name="syslinux"/>
+ <package name="gettext-runtime"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/usbboot/suse-11.3/config.xml new/kiwi/system/boot/ix86/usbboot/suse-11.3/config.xml
--- old/kiwi/system/boot/ix86/usbboot/suse-11.3/config.xml 2010-05-21 15:52:47.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-11.3/config.xml 2010-06-04 10:37:37.000000000 +0200
@@ -107,6 +107,8 @@
<package name="dialog"/>
<package name="kiwi-tools"/>
<package name="parted"/>
+ <package name="syslinux"/>
+ <package name="gettext-runtime"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -115,6 +117,7 @@
<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/usbboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/usbboot/suse-SLED10/config.xml
--- old/kiwi/system/boot/ix86/usbboot/suse-SLED10/config.xml 2010-05-21 15:52:47.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-SLED10/config.xml 2010-06-04 10:37:38.000000000 +0200
@@ -89,6 +89,8 @@
<package name="tar"/>
<package name="lvm2"/>
<package name="parted"/>
+ <package name="syslinux"/>
+ <package name="gettext-runtime"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -98,6 +100,7 @@
<package name="openssl"/>
</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/usbboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/usbboot/suse-SLED11/config.xml
--- old/kiwi/system/boot/ix86/usbboot/suse-SLED11/config.xml 2010-05-21 15:52:48.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-SLED11/config.xml 2010-06-04 10:37:38.000000000 +0200
@@ -105,6 +105,8 @@
<package name="dialog"/>
<package name="kiwi-tools"/>
<package name="parted"/>
+ <package name="syslinux"/>
+ <package name="gettext-runtime"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -114,6 +116,7 @@
<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/usbboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/usbboot/suse-SLES10/config.xml
--- old/kiwi/system/boot/ix86/usbboot/suse-SLES10/config.xml 2010-05-21 15:52:48.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-SLES10/config.xml 2010-06-04 10:37:38.000000000 +0200
@@ -89,6 +89,8 @@
<package name="tar"/>
<package name="lvm2"/>
<package name="parted"/>
+ <package name="syslinux"/>
+ <package name="gettext-runtime"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -98,6 +100,7 @@
<package name="openssl"/>
</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/usbboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/usbboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ix86/usbboot/suse-SLES11/config.xml 2010-05-21 15:52:48.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-SLES11/config.xml 2010-06-04 10:37:38.000000000 +0200
@@ -105,6 +105,8 @@
<package name="dialog"/>
<package name="kiwi-tools"/>
<package name="parted"/>
+ <package name="syslinux"/>
+ <package name="gettext-runtime"/>
</packages>
<packages type="bootstrap">
<package name="filesystem"/>
@@ -114,6 +116,7 @@
<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/usbboot/suse-linuxrc new/kiwi/system/boot/ix86/usbboot/suse-linuxrc
--- old/kiwi/system/boot/ix86/usbboot/suse-linuxrc 2010-05-31 11:31:24.000000000 +0200
+++ new/kiwi/system/boot/ix86/usbboot/suse-linuxrc 2010-06-04 10:37:38.000000000 +0200
@@ -17,20 +17,48 @@
# STATUS : BETA
#----------------
#======================================
-# Exports (General)...
+# Exports (General)
#--------------------------------------
export PATH="/sbin:/bin:/usr/sbin:/usr/bin"
export IFS_ORIG=$IFS
+export ARCH=`arch`
export DEBUG=0
#======================================
# Exports (Booting)
#--------------------------------------
-export LOCAL_BOOT=no
+export DOMURD_MODULES="xennet xenblk"
+export INITRD_MODULES="reiserfs"
+export LOCAL_BOOT="no"
export systemIntegrity="clean"
+export KERNEL_LIST
#======================================
-# Functions...
+# Exports (Alias)
+#--------------------------------------
+export SYSALIAS="undefined"
+export NAME=0
+
+#======================================
+# Exports (Partitioning)
+#--------------------------------------
+export PART_FILE="/etc/partition.table"
+export PART_MOUNT
+export PART_DEV
+export PART_COUNT=0
+export PART_NUMBER=0
+export PART_NEED_EXTENDED=0
+export PART_NEED_FILL=0
+export NO_FILE_SYSTEM=0
+
+#======================================
+# Exports (Status)
+#--------------------------------------
+export SYSTEM_INTEGRITY
+export SYSTEM_MD5STATUS
+
+#======================================
+# Functions
#--------------------------------------
. /include
initialize
@@ -38,8 +66,8 @@
#======================================
# Beautify Startup
#--------------------------------------
-echo "Loading KIWI USB-Stick Boot-System..."
-echo "-------------------------------------"
+echo "Loading KIWI USB Boot-System..."
+echo "-------------------------------"
#======================================
# Update library path
@@ -62,10 +90,22 @@
# 3) run udevd
#--------------------------------------
udevStart
+
+#======================================
+# 4) Include proc/cmdline information
+#--------------------------------------
includeKernelParameters
+if [ ! -z $UNIONFS_CONFIG ] || [ "$COMBINED_IMAGE" = "local" ];then
+ # /.../
+ # if the unionfs/combined information is already in place at this
+ # stage it comes from the cmdline data which means we are not
+ # booting the first time
+ # ----
+ export LOCAL_BOOT="yes"
+fi
#======================================
-# 4) start boot shell
+# 5) start boot shell
#--------------------------------------
startBlogD
startShell
@@ -73,81 +113,134 @@
openKernelConsole
#======================================
-# 5) Including required kernel modules
+# 6) Including required kernel modules
#--------------------------------------
probeDevices
#======================================
-# 6) Setup device names...
+# 7) Select language if not in cmdline
+#--------------------------------------
+selectLanguage
+
+#======================================
+# 8) Search boot device...
+#--------------------------------------
+Echo "Searching for boot device..."
+if [ "$LOCAL_BOOT" = "no" ];then
+ if ! searchBIOSBootDevice;then
+ systemException "$biosBootDevice" "reboot"
+ fi
+ export imageDiskDevice=$biosBootDevice
+else
+ export imageDiskDevice=$(dn $disk)
+fi
+Echo "Found boot device: $imageDiskDevice"
+
+#======================================
+# 9) Setup device names...
#--------------------------------------
-if ! searchBIOSBootDevice;then
- systemException "$biosBootDevice" "reboot"
+export imageRootDevice=$(ddn $imageDiskDevice 1)
+export imageRWDevice=$(ddn $imageDiskDevice 2)
+export imageRODevice=$(ddn $imageDiskDevice 1)
+if [ -z "$imageDiskDevice" ];then
+ systemException \
+ "Couldn't find any boot device... abort" \
+ "reboot"
fi
-export stickRoot=$biosBootDevice
-export stickDevice=$(ddn $stickRoot 1)
-export stickRWDevice=$(ddn $stickRoot 2)
-export stickRODevice=$(ddn $stickRoot 1)
-export imageDiskDevice=$stickRoot
Echo "Searching for $VGROUP volume group..."
if searchVolumeGroup; then
export haveLVM=yes
if [ -e /dev/$VGROUP/LVComp ];then
- export stickDevice=/dev/$VGROUP/LVComp
+ export imageRootDevice=/dev/$VGROUP/LVComp
else
- export stickDevice=/dev/$VGROUP/LVRoot
+ export imageRootDevice=/dev/$VGROUP/LVRoot
fi
- export stickRWDevice=/dev/$VGROUP/LVRoot
- export stickRODevice=/dev/$VGROUP/LVComp
- export stickBootDevice=$(ddn $stickRoot 2)
+ export imageRWDevice=/dev/$VGROUP/LVRoot
+ export imageRODevice=/dev/$VGROUP/LVComp
+ export imageBootDevice=$(ddn $imageDiskDevice 2)
fi
#======================================
-# 7) Probe filesystem of stick system
+# 10) Get filesystem type
#--------------------------------------
-probeFileSystem $stickDevice
+probeFileSystem $imageRootDevice
if [ "$FSTYPE" = "luks" ];then
- stickDevice=$(luksOpen $stickDevice)
- stickRODevice=$stickDevice
- probeFileSystem $stickDevice
+ imageRootDevice=$(luksOpen $imageRootDevice)
+ imageRODevice=$imageRootDevice
+ probeFileSystem $imageRootDevice
export haveLuks=yes
fi
-if [ $FSTYPE = "unknown" ];then
+if [ "$FSTYPE" = "unknown" ];then
systemException \
"Couldn't determine filesystem type... abort" \
"reboot"
fi
#======================================
-# 8) Setup union on compressed root
+# 11) Check filesystem
#--------------------------------------
-Echo "Filesystem of stick system is: $FSTYPE -> $stickDevice"
+Echo "Filesystem of USB system is: $FSTYPE -> $imageRootDevice"
if isFSTypeReadOnly;then
- setupUnionFS $stickRWDevice $stickRODevice $unionFST
+ setupUnionFS $imageRWDevice $imageRODevice $unionFST
fi
#======================================
-# 9) Mount USB stick (system)
+# 12) Mount VM (boot)
#--------------------------------------
-if ! mountSystem $stickDevice;then
+if ! mountSystem $imageRootDevice;then
systemException "Failed to mount root filesystem" "reboot"
fi
validateRootTree
#======================================
-# 10) check for local boot
+# 13) Get kernel list for local boot
#--------------------------------------
-if [ -e /mnt/etc/ImagePackages ];then
- export LOCAL_BOOT=yes
+if [ "$LOCAL_BOOT" = "no" ];then
+ kernelList /mnt
fi
#======================================
-# 11) Create system dependant files
+# 14) setup ird/kernel links for union
+#--------------------------------------
+if [ "$LOCAL_BOOT" = "no" ];then
+ if isFSTypeReadOnly;then
+ # /.../
+ # we are using a special root setup with aufs. In this case
+ # we can't use the SuSE Linux initrd but must stick to the
+ # kiwi boot system.
+ # ----
+ mountCalled=no
+ if [ -e "$imageRWDevice" ];then
+ kiwiMount $imageRWDevice "/mnt"
+ mountCalled=yes
+ fi
+ pushd /mnt/boot >/dev/null
+ IFS="," ; for i in $KERNEL_LIST;do
+ if test -z "$i";then
+ continue
+ fi
+ kernel=`echo $i | cut -f1 -d:`
+ initrd=`echo $i | cut -f2 -d:`
+ rm -f $initrd && ln -s initrd.vmx $initrd
+ rm -f $kernel && ln -s linux.vmx $kernel
+ break
+ done
+ IFS=$IFS_ORIG
+ popd >/dev/null
+ if [ "$mountCalled" = "yes" ];then
+ umount /mnt
+ fi
+ fi
+fi
+
+#======================================
+# 15) Create system dependant files
#--------------------------------------
if [ "$LOCAL_BOOT" = "no" ];then
setupDefaultFstab /config
- updateRootDeviceFstab /config $stickDevice
+ updateRootDeviceFstab /config $imageRootDevice
if [ "$haveLVM" = "yes" ];then
- updateLVMBootDeviceFstab /config $stickBootDevice
+ updateLVMBootDeviceFstab /config $imageBootDevice
elif [ "$haveClicFS" = "yes" ];then
updateClicBootDeviceFstab /config $imageBootDevice
elif [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
@@ -155,54 +248,71 @@
elif [ "$haveLuks" = "yes" ];then
updateLuksBootDeviceFstab /config $imageBootDevice
fi
+ if [ ! -z "$UNIONFS_CONFIG" ]; then
+ export KIWI_INITRD_PARAMS="UNIONFS_CONFIG=yes"
+ fi
+ if [ ! -z "$COMBINED_IMAGE" ]; then
+ export KIWI_INITRD_PARAMS="COMBINED_IMAGE=local"
+ fi
+ bootid=0
+ if [ ! -z "$UNIONFS_CONFIG" ] || [ ! -z "$COMBINED_IMAGE" ]; then
+ bootid=1
+ fi
+ if \
+ [ "$loader" = "syslinux" ] ||\
+ [ "$loader" = "extlinux" ] ||\
+ [ "$haveClicFS" = "yes" ] ||\
+ [ "$haveLuks" = "yes" ]
+ then
+ bootid=$(($bootid + 1))
+ fi
+ setupBootLoader /mnt /config $bootid $imageRootDevice USB
+ setupKernelModules /config
fi
#======================================
-# 12) copy system dependant files
+# 16) copy system dependant files
#--------------------------------------
if [ "$LOCAL_BOOT" = "no" ];then
setupConfigFiles
fi
#======================================
-# 13) update system dependant files
+# 17) update system dependant files
#--------------------------------------
-if [ "$LOCAL_BOOT" = "no" ];then
- setupInittab /mnt
-fi
+setupInittab /mnt
#======================================
-# 14) setup real root device
+# 18) setup real root device
#--------------------------------------
echo 256 > /proc/sys/kernel/real-root-dev
#======================================
-# 15) umount system filesystems
+# 19) umount system filesystems
#--------------------------------------
umountSystemFilesystems
#======================================
-# 16) copy initrd files to image
+# 20) copy initrd files to image
#--------------------------------------
-if [ ! -f /mnt/boot/deployed ];then
- touch /mnt/boot/deployed
+if [ "$LOCAL_BOOT" = "no" ];then
importBranding
fi
cp /preinit /mnt
cp /include /mnt
#======================================
-# 17) kill boot shell
+# 21) kill boot shell
#--------------------------------------
killShell
killBlogD
#======================================
-# 18) Activate new root
+# 22) Activate new root
#--------------------------------------
activateImage
#======================================
-# 19) Unmount initrd / system init
+# 23) Unmount initrd / system init
#--------------------------------------
bootImage $@
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 2009-11-16 11:09:12.000000000 +0100
+++ new/kiwi/system/boot/ix86/usbboot/suse-preinit 2010-06-04 10:37:38.000000000 +0200
@@ -33,19 +33,65 @@
fi
#======================================
-# 3) update mount table
+# 3) start udev
+#--------------------------------------
+mountSystemFilesystems
+udevSystemStart
+
+#======================================
+# 4) update mount table
#--------------------------------------
updateMTAB
#======================================
-# 4) create framebuffer devices
+# 5) create framebuffer devices
#--------------------------------------
createFramebufferDevices
#======================================
-# 5) create /etc/ImagePackages
+# 6) create /etc/ImagePackages
#--------------------------------------
if [ -x /bin/rpm ];then
Echo "Creating initial image package info file"
rpm -qa --last > /etc/ImagePackages
fi
+
+#======================================
+# 7) create initrd on diskful
+#--------------------------------------
+if [ -z "$UNIONFS_CONFIG" ] && [ -z "$COMBINED_IMAGE" ]; then
+ setupSUSEInitrd
+fi
+
+#======================================
+# 8) Check FAT requires on syslinux
+#--------------------------------------
+if [ "$loader" = "syslinux" ] || [ "$loader" = "extlinux" ];then
+ # /.../
+ # if syslinux is used we need to make sure that the
+ # filename on the boot partition is correct 8+3
+ # ----
+ count=1
+ IFS="," ; for i in $KERNEL_LIST;do
+ if test -z "$i";then
+ continue
+ fi
+ kernel=`echo $i | cut -f1 -d:`
+ initrd=`echo $i | cut -f2 -d:`
+ mv /boot/$kernel /boot/linux.$count
+ mv /boot/$initrd /boot/initrd.$count
+ running=$(uname -r)
+ rlinux=vmlinuz-$running
+ rinitrd=initrd-$running
+ ln -s /boot/linux.$count /boot/$rlinux
+ ln -s /boot/initrd.$count /boot/$rinitrd
+ count=`expr $count + 1`
+ done
+ IFS=$IFS_ORIG
+fi
+
+#======================================
+# 9) kill udev
+#--------------------------------------
+udevSystemStop
+umountSystemFilesystems
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tools/Makefile new/kiwi/tools/Makefile
--- old/kiwi/tools/Makefile 2010-02-24 12:14:38.000000000 +0100
+++ new/kiwi/tools/Makefile 2010-06-04 10:37:38.000000000 +0200
@@ -3,8 +3,6 @@
${MAKE} -C dcounter all
${MAKE} -C driveready all
${MAKE} -C utimer all
- ${MAKE} -C dbuslock -f Makefile.swig all
- ${MAKE} -C dbuslock BINDLIB=${bindlib} all
( \
if test -d /usr/include/satsolver;then \
cd ./satplugin && make -f Makefile.swig && make BINDLIB=${bindlib};\
@@ -20,7 +18,6 @@
install -m 755 startshell/startshell ${TOOLSVZ}
install -m 755 driveready/driveready ${TOOLSVZ}
install -m 755 utimer/utimer ${TOOLSVZ}
- ${MAKE} -C dbuslock DESTDIR=${buildroot} install_vendor
( \
if test -d /usr/include/satsolver;then \
cd ./satplugin && make DESTDIR=${buildroot} install_vendor;\
@@ -35,4 +32,3 @@
${MAKE} -C driveready clean
${MAKE} -C utimer clean
${MAKE} -C satplugin -f Makefile.swig clean
- ${MAKE} -C dbuslock -f Makefile.swig clean
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tools/dbuslock/Makefile.PL new/kiwi/tools/dbuslock/Makefile.PL
--- old/kiwi/tools/dbuslock/Makefile.PL 2009-03-10 10:30:22.000000000 +0100
+++ new/kiwi/tools/dbuslock/Makefile.PL 1970-01-01 01:00:00.000000000 +0100
@@ -1,19 +0,0 @@
-use ExtUtils::MakeMaker;
-use Env;
-
-$QTLIBS = `pkg-config --libs QtCore`;
-$QTINC = `pkg-config --cflags QtCore`;
-chomp $QTINC;
-$QTINC = $QTINC.'-I/usr/include/Qt';
-$CFLAGS = $ENV{RPM_OPT_FLAGS} ." $QTINC";
-$CFLAGS =~ s/-Wall//;
-
-WriteMakefile(
- 'NAME' => 'KIWI::dbusdevice',
- 'LIBS' => ["$QTLIBS -lhal -ldbus-1"],
- 'OBJECT' => 'dbusdevice_wrap.o dbusdevice.o',
- 'INC' => "-I/usr/include/dbus-1.0 -I/usr/lib/dbus-1.0/include -I/usr/lib64/dbus-1.0/include -I/usr/include/g++ $QTINC",
- 'OPTIMIZE' => "-O2 $CFLAGS",
- 'CC' => 'g++'
-);
-
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tools/dbuslock/Makefile.swig new/kiwi/tools/dbuslock/Makefile.swig
--- old/kiwi/tools/dbuslock/Makefile.swig 2009-03-10 10:30:22.000000000 +0100
+++ new/kiwi/tools/dbuslock/Makefile.swig 1970-01-01 01:00:00.000000000 +0100
@@ -1,11 +0,0 @@
-all:
- swig -Wall -c++ -perl5 dbusdevice.i
- perl Makefile.PL
-
-clean:
- rm -rf blib
- rm -f Makefile
- rm -f dbusdevice_wrap.cxx
- rm -f Makefile.old pm_to_blib
- rm -f dbusdevice.bs dbusdevice.pm
- rm -f dbusdevice_wrap.o dbusdevice.o
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/tools/dbuslock/dbusdevice.cpp new/kiwi/tools/dbuslock/dbusdevice.cpp
--- old/kiwi/tools/dbuslock/dbusdevice.cpp 2009-03-10 10:30:22.000000000 +0100
+++ new/kiwi/tools/dbuslock/dbusdevice.cpp 1970-01-01 01:00:00.000000000 +0100
@@ -1,268 +0,0 @@
-/**************
-FILE : dbusdevice.cpp
-***************
-PROJECT : KIWI
- :
-AUTHOR : Marcus Schäfer
participants (1)
-
root@hilbert.suse.de