Hello community,
here is the log from the commit of package kiwi
checked in at Thu Nov 8 23:08:26 CET 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-11-06 17:46:16.000000000 +0100
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-11-08 14:01:16.762442000 +0100
@@ -1,0 +2,20 @@
+Wed Nov 7 10:59:10 CET 2007 - ms@suse.de
+
+- v1.85
+- dont add /dev/shm as tmpfs to fstab. This fixes the network
+ setup done by /etc/init.d/network
+- added kiwi-tools package to SUSE 11.0 boot descriptions
+- fixed opensuse:// URL type. Fixed by Jan
+- fixed splitPathHTTP which fails if the base URL doesn't return a
+ dir listing but something different. Fixed by Jan too
+- check result of copying root/ data to image (#339814)
+- added read-only check for mounting the repositories. If a
+ repository path has no write permissions it doesn't make sense to
+ use aufs/unionfs to implement a read-only mount. Use bind mount
+ directly in that situation (#339503)
+- use setctsid to call a systemException shell. Fix call of
+ boot shell on /dev/tty2
+- aufs back again in SUSE 11.0 :-)
+- allow use of perl debugger
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.E30008/_old 2007-11-08 23:07:28.000000000 +0100
+++ /var/tmp/diff_new_pack.E30008/_new 2007-11-08 23:07:28.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 1.84)
+# spec file for package kiwi (Version 1.85)
#
# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -18,7 +18,7 @@
%endif
Requires: perl perl-XML-LibXML perl-libwww-perl screen coreutils
Summary: OpenSuSE - KIWI Image System
-Version: 1.84
+Version: 1.85
Release: 1
Group: System/Management
License: GPL v2 or later
@@ -353,6 +353,23 @@
%doc %{_datadir}/kiwi/image/oemboot/README
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
+* Wed Nov 07 2007 - ms@suse.de
+- v1.85
+- dont add /dev/shm as tmpfs to fstab. This fixes the network
+ setup done by /etc/init.d/network
+- added kiwi-tools package to SUSE 11.0 boot descriptions
+- fixed opensuse:// URL type. Fixed by Jan
+- fixed splitPathHTTP which fails if the base URL doesn't return a
+ dir listing but something different. Fixed by Jan too
+- check result of copying root/ data to image (#339814)
+- added read-only check for mounting the repositories. If a
+ repository path has no write permissions it doesn't make sense to
+ use aufs/unionfs to implement a read-only mount. Use bind mount
+ directly in that situation (#339503)
+- use setctsid to call a systemException shell. Fix call of
+ boot shell on /dev/tty2
+- aufs back again in SUSE 11.0 :-)
+- allow use of perl debugger
* Tue Nov 06 2007 - ms@suse.de
- v1.84
- fixed killing dhcpcd if no system update is required (#339460)
++++++ kiwi.tar.bz2 ++++++
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/kiwi.pl new/kiwi/kiwi.pl
--- old/kiwi/kiwi.pl 2007-11-06 17:36:55.000000000 +0100
+++ new/kiwi/kiwi.pl 2007-11-07 11:03:00.000000000 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/perl -w
+#!/usr/bin/perl
#================
# FILE : kiwi.pl
#----------------
@@ -30,10 +30,17 @@
use KIWIOverlay;
#============================================
+# perl debugger setup
+#--------------------------------------------
+$DB::inhibit_exit = 0;
+
+use warnings;
+
+#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "1.84";
-our $openSUSE = "http://software.opensuse.org/download/";
+our $Version = "1.85";
+our $openSUSE = "http://download.opensuse.org/repositories/";
our $ConfigFile = "$ENV{'HOME'}/.kiwirc";
our $ConfigStatus = 0;
#============================================
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 2007-11-06 17:36:53.000000000 +0100
+++ new/kiwi/modules/KIWIConfig.sh 2007-11-08 13:53:59.000000000 +0100
@@ -419,7 +419,7 @@
rpc.statd rpc.idmapd nbd-client mount.nfs mount.nfs4 eject
blockdev posbios ping killall killall5 udevcontrol udevd
udevsettle udevtrigger mknod stat path_id hwup scsi_id scsi_tur
- usb_id ata_id vol_id edd_id
+ usb_id ata_id vol_id edd_id setctsid
"
tools="$tools $1"
for path in /sbin /usr/sbin /usr/bin /bin;do
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 2007-11-05 16:00:57.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2007-11-08 13:53:59.000000000 +0100
@@ -130,7 +130,7 @@
;;
"shell")
Echo "shellException: providing shell..."
- /bin/sh
+ setctsid /dev/tty1 /bin/bash
;;
*)
Echo "unknownException..."
@@ -532,7 +532,6 @@
echo "devpts /dev/pts devpts mode=0620,gid=5 0 0" >> $nfstab
echo "proc /proc proc defaults 0 0" >> $nfstab
echo "sysfs /sys sysfs noauto 0 0" >> $nfstab
- echo "tmpfs /dev/shm tmpfs defaults 0 0" >> $nfstab
}
#======================================
# updateRootDeviceFstab
@@ -1858,12 +1857,13 @@
#--------------------------------------
function startShell {
# /.../
- # start a debugging shell on tty2. This requires the
- # package kiwi-tools to be part of the boot image.
+ # start a debugging shell on tty2
# ----
- if [ -x /usr/share/kiwi/tools/startshell ];then
- Echo "Starting boot shell on tty2"
- SHELL_PID=`/usr/lib/YaST2/bin/startshell /dev/tty2`
+ Echo "Starting boot shell on tty2"
+ setctsid -f /dev/tty2 /bin/bash
+ SHELL_PID=`pidof bash | cut -f1 -d " "`
+ if [ ! -z "$SHELL_PID" ];then
+ Echo "Boot shell started on tty2 with PID: $SHELL_PID"
fi
}
#======================================
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIRoot.pm new/kiwi/modules/KIWIRoot.pm
--- old/kiwi/modules/KIWIRoot.pm 2007-10-29 10:29:16.000000000 +0100
+++ new/kiwi/modules/KIWIRoot.pm 2007-11-08 13:53:59.000000000 +0100
@@ -450,10 +450,23 @@
#----------------------------------------
if (-d "$imageDesc/root") {
$kiwi -> info ("Copying user defined files to image tree");
- qx ( mkdir $root/tmproot );
- qx ( cp -LR --remove-destination $imageDesc/root/* $root/tmproot 2>&1 );
+ mkdir $root."/tmproot";
+ my $copy = "cp -LR --remove-destination";
+ my $data = qx ( $copy $imageDesc/root/* $root/tmproot 2>&1 );
+ my $code = $? >> 8;
+ if ($code != 0) {
+ $kiwi -> failed ();
+ $kiwi -> info ($data);
+ return undef;
+ }
qx ( find $root/tmproot -type d | grep .svn\$ | xargs rm -rf 2>&1 );
- qx ( cp -LR --remove-destination $root/tmproot/* $root );
+ $data = qx ( $copy $root/tmproot/* $root );
+ $code = $? >> 8;
+ if ($code != 0) {
+ $kiwi -> failed ();
+ $kiwi -> info ($data);
+ return undef;
+ }
qx ( rm -rf $root/tmproot );
$kiwi -> done();
}
@@ -642,15 +655,27 @@
qx ( mkdir -p $cache );
}
qx (mkdir -p $mount);
- my $data = qx (mount -t aufs -o $auopt aufs $mount 2>&1);
+ my $data = qx ( touch $path/bob 2>&1 );
my $code = $? >> 8;
- if ($code != 0) {
- $data = qx (mount -t unionfs -o $roopt unionfs $mount 2>&1);
+ if ($code == 0) {
+ #==========================================
+ # $path is writable try overlay ro mount
+ #------------------------------------------
+ $kiwi -> skipped ();
+ $kiwi -> warning ("Path $path is writable, trying read-only mount");
+ qx ( rm -f $path/bob 2>&1 );
+ $data = qx (mount -t aufs -o $auopt aufs $mount 2>&1);
$code = $? >> 8;
+ if ($code != 0) {
+ $data = qx (mount -t unionfs -o $roopt unionfs $mount 2>&1);
+ $code = $? >> 8;
+ }
+ if ($code != 0) {
+ $kiwi -> skipped ();
+ $kiwi -> warning ("Couldn't mount read-only, using bind mount");
+ }
}
if ($code != 0) {
- $kiwi -> skipped ();
- $kiwi -> warning ("Couldn't mount read-only, using bind mount");
my $data = qx ( mount -o bind $path $mount 2>&1 );
my $code = $? >> 8;
if ($code != 0) {
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 2007-11-06 17:36:53.000000000 +0100
+++ new/kiwi/modules/KIWIXML.pm 2007-11-07 10:59:22.000000000 +0100
@@ -1829,6 +1829,17 @@
my $request = HTTP::Request->new( GET => $basepath );
my $response = $browser->request( $request );
my $content = $response->content();
+
+ # descend if the root page doesn't do dir listing:
+ if($response->title !~ m/index of/i)
+ {
+ # this means that no dir listing is done here, try one descend.
+ $this->{kiwi}->note("Directory $basepath has no listings, descencding");
+ return $this->splitPathHTTP(
+ $targets, $browser, $basepath."/".$prefix, $rest, $leafonly
+ );
+ }
+
my @links = ();
if ($content =~ /Error 404/) {
pop @{$targets};
@@ -1842,12 +1853,13 @@
# get the current dir list, parse for links and match them to prefix
# for each match call splitPath with the correct parameters recursively
# ----
- my @lines = split (/\n/,$content);
+ my @lines = split(/\n/,$content);
my $atleastonce = 0;
foreach my $line (@lines) {
- next if ($line !~ //);
# skip "parent dir" to avoid cycles
- next if ($line =~ /[pP]arent.+[dD]irectory/);
+ next if($line =~ /[pP]arent.+[dD]irectory/);
+
+ next if($line !~ //);
$atleastonce++; # at least ONE match means the dir contains subdirs!
my $link = $1;
$link =~ s#^[./]+##g;
@@ -1856,15 +1868,19 @@
# This is fatal for descending...
$link =~ s#.*/##g;
if ($link =~ m/$prefix/) {
- if( defined( $rest ) ) {
- if( $leafonly == 1 ) {
+ if(defined($rest))
+ {
+ if($leafonly == 1)
+ {
# list directory even if the path is not finished
push @{$targets}, $basepath."/".$link;
}
$this->splitPathHTTP(
$targets, $browser, $basepath."/".$link, $rest, $leafonly
);
- } else {
+ }
+ else
+ {
# if the path is finished the leaves are stored
push @{$targets}, $basepath."/".$link;
return $this;
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2007-11-06 17:43:41.000000000 +0100
+++ new/kiwi/.revision 2007-11-08 14:00:57.000000000 +0100
@@ -1 +1 @@
-791
\ No newline at end of file
+797
\ No newline at end of file
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.3/config.xml new/kiwi/system/boot/isoboot/suse-10.3/config.xml
--- old/kiwi/system/boot/isoboot/suse-10.3/config.xml 2007-10-17 16:12:58.000000000 +0200
+++ new/kiwi/system/boot/isoboot/suse-10.3/config.xml 2007-11-08 13:53:56.000000000 +0100
@@ -47,7 +47,7 @@
<file name="drivers/ata/*"/>
</drivers>
<repository type="yast2" status="replaceable">
- <source path="/image/CDs/full-i386"/>
+ <source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image">
<package name="bind-libs"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-11.0/config.xml new/kiwi/system/boot/isoboot/suse-11.0/config.xml
--- old/kiwi/system/boot/isoboot/suse-11.0/config.xml 2007-11-05 16:00:29.000000000 +0100
+++ new/kiwi/system/boot/isoboot/suse-11.0/config.xml 2007-11-08 13:53:55.000000000 +0100
@@ -66,6 +66,8 @@
<package name="make"/>
<package name="memtest86+"/>
<package name="squashfs"/>
+ <package name="aufs"/>
+ <package name="aufs-kmp-default"/>
<package name="fribidi"/>
<package name="hdparm"/>
<package name="grub"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-linuxrc new/kiwi/system/boot/isoboot/suse-linuxrc
--- old/kiwi/system/boot/isoboot/suse-linuxrc 2007-11-05 16:00:32.000000000 +0100
+++ new/kiwi/system/boot/isoboot/suse-linuxrc 2007-11-08 13:53:56.000000000 +0100
@@ -51,29 +51,29 @@
closeKernelConsole
#======================================
-# 2) start boot shell
-#--------------------------------------
-startShell
-
-#======================================
-# 3) probe for livecd_config in cmdline
+# 2) probe for livecd_config in cmdline
#--------------------------------------
if grep -i -q "livecd_config=[a-zA-Z0-9/]" /proc/cmdline; then
export LIVECD_CONFIG=`sed 's/.*livecd_config=\([^ ]*\).*/\1/' /proc/cmdline`
fi
#======================================
-# 4) Prepare module load support
+# 3) Prepare module load support
#--------------------------------------
touch /etc/modules.conf
touch /lib/modules/*/modules.dep
#======================================
-# 5) run udevd
+# 4) run udevd
#--------------------------------------
udevStart
#======================================
+# 5) start boot shell
+#--------------------------------------
+startShell
+
+#======================================
# 6) Including required kernel modules
#--------------------------------------
probeDevices
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.3/config.xml new/kiwi/system/boot/netboot/suse-10.3/config.xml
--- old/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-10-10 16:42:31.000000000 +0200
+++ new/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-11-08 13:53:54.000000000 +0100
@@ -46,7 +46,7 @@
<file name="drivers/block/nbd.ko"/>
</drivers>
<repository type="yast2" status="replaceable">
- <source path="/image/CDs/full-i386"/>
+ <source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image" profiles="default">
<package name="kernel-default"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.3-smp/config.xml new/kiwi/system/boot/netboot/suse-10.3-smp/config.xml
--- old/kiwi/system/boot/netboot/suse-10.3-smp/config.xml 2007-11-05 15:59:52.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-10.3-smp/config.xml 2007-11-08 13:53:53.000000000 +0100
@@ -47,7 +47,7 @@
</drivers>
<repository type="yast2" status="replaceable">
<!--<source path="opensuse://10.3"/>-->
- <source path="/image/CDs/full-i386"/>
+ <source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image" profiles="default">
<package name="kernel-bigsmp"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-11.0/config.xml new/kiwi/system/boot/netboot/suse-11.0/config.xml
--- old/kiwi/system/boot/netboot/suse-11.0/config.xml 2007-11-05 15:59:57.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-11.0/config.xml 2007-11-08 13:53:53.000000000 +0100
@@ -110,17 +110,20 @@
<packages type="image" profiles="default">
<!-- KERNEL AND MODULE PACKAGES START DEFAULT -->
<package name="kernel-default"/>
+ <package name="aufs-kmp-default"/>
<!-- KERNEL AND MODULE PACKAGES END DEFAULT -->
</packages>
<packages type="image" profiles="xen">
<!-- KERNEL AND MODULE PACKAGES START XEN -->
<package name="kernel-xen"/>
+ <package name="aufs-kmp-xen"/>
<package name="xen"/>
<!-- KERNEL AND MODULE PACKAGES END XEN -->
</packages>
<packages type="image" profiles="diskless">
<!-- KERNEL AND MODULE PACKAGES START DISKLESS -->
<package name="kernel-default"/>
+ <package name="aufs-kmp-default"/>
<!-- KERNEL AND MODULE PACKAGES END DISKLESS -->
</packages>
<packages type="image" profiles="default,xen">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-11.0-smp/config.xml new/kiwi/system/boot/netboot/suse-11.0-smp/config.xml
--- old/kiwi/system/boot/netboot/suse-11.0-smp/config.xml 2007-11-05 15:59:51.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-11.0-smp/config.xml 2007-11-08 13:53:53.000000000 +0100
@@ -110,17 +110,20 @@
<packages type="image" profiles="default">
<!-- KERNEL AND MODULE PACKAGES START DEFAULT -->
<package name="kernel-bigsmp"/>
+ <package name="aufs-kmp-bigsmp"/>
<!-- KERNEL AND MODULE PACKAGES END DEFAULT -->
</packages>
<packages type="image" profiles="xen">
<!-- KERNEL AND MODULE PACKAGES START XEN -->
<package name="kernel-xen"/>
+ <package name="aufs-kmp-xen"/>
<package name="xen"/>
<!-- KERNEL AND MODULE PACKAGES END XEN -->
</packages>
<packages type="image" profiles="diskless">
<!-- KERNEL AND MODULE PACKAGES START DISKLESS -->
- <package name="kernel-default"/>
+ <package name="kernel-bigsmp"/>
+ <package name="aufs-kmp-bigsmp"/>
<!-- KERNEL AND MODULE PACKAGES END DISKLESS -->
</packages>
<packages type="image" profiles="default,xen">
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-linuxrc new/kiwi/system/boot/netboot/suse-linuxrc
--- old/kiwi/system/boot/netboot/suse-linuxrc 2007-11-06 17:36:50.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-11-08 13:53:54.000000000 +0100
@@ -75,23 +75,23 @@
closeKernelConsole
#======================================
-# 2) start boot shell
-#--------------------------------------
-startShell
-
-#======================================
-# 3) Prepare module load support
+# 2) Prepare module load support
#--------------------------------------
touch /etc/modules.conf
touch /lib/modules/*/modules.dep
runHook init
#======================================
-# 4) run udevd
+# 3) run udevd
#--------------------------------------
udevStart
#======================================
+# 4) start boot shell
+#--------------------------------------
+startShell
+
+#======================================
# 5) Include proc/cmdline information
#--------------------------------------
includeKernelParameters
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-10.3/config.xml new/kiwi/system/boot/oemboot/suse-10.3/config.xml
--- old/kiwi/system/boot/oemboot/suse-10.3/config.xml 2007-10-09 13:30:02.000000000 +0200
+++ new/kiwi/system/boot/oemboot/suse-10.3/config.xml 2007-11-08 13:53:52.000000000 +0100
@@ -47,7 +47,7 @@
<file name="drivers/cdrom/*"/>
</drivers>
<repository type="yast2" status="replaceable">
- <source path="/image/CDs/full-i386"/>
+ <source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image">
<package name="bind-libs"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-11.0/config.xml new/kiwi/system/boot/oemboot/suse-11.0/config.xml
--- old/kiwi/system/boot/oemboot/suse-11.0/config.xml 2007-11-05 15:59:43.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-11.0/config.xml 2007-11-08 13:53:52.000000000 +0100
@@ -67,6 +67,8 @@
<package name="util-linux"/>
<package name="grub"/>
<package name="squashfs"/>
+ <package name="aufs"/>
+ <package name="aufs-kmp-default"/>
<package name="gfxboot"/>
<package name="fribidi"/>
<package name="make"/>
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-11-06 17:36:49.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-11-08 13:53:52.000000000 +0100
@@ -56,22 +56,22 @@
closeKernelConsole
#======================================
-# 2) start boot shell
-#--------------------------------------
-startShell
-
-#======================================
-# 3) Prepare module load support
+# 2) Prepare module load support
#--------------------------------------
touch /etc/modules.conf
touch /lib/modules/*/modules.dep
#======================================
-# 4) run udevd
+# 3) run udevd
#--------------------------------------
udevStart
#======================================
+# 4) start boot shell
+#--------------------------------------
+startShell
+
+#======================================
# 5) Include proc/cmdline information
#--------------------------------------
includeKernelParameters
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-10.3/config.xml new/kiwi/system/boot/usbboot/suse-10.3/config.xml
--- old/kiwi/system/boot/usbboot/suse-10.3/config.xml 2007-11-06 17:36:52.000000000 +0100
+++ new/kiwi/system/boot/usbboot/suse-10.3/config.xml 2007-11-08 13:53:55.000000000 +0100
@@ -47,7 +47,7 @@
<file name="drivers/net/*"/>
</drivers>
<repository type="yast2" status="replaceable">
- <source path="/image/CDs/full-i386"/>
+ <source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image">
<package name="e2fsprogs"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-11.0/config.xml new/kiwi/system/boot/usbboot/suse-11.0/config.xml
--- old/kiwi/system/boot/usbboot/suse-11.0/config.xml 2007-11-06 17:36:51.000000000 +0100
+++ new/kiwi/system/boot/usbboot/suse-11.0/config.xml 2007-11-08 13:53:54.000000000 +0100
@@ -60,6 +60,8 @@
<package name="sysfsutils"/>
<package name="util-linux"/>
<package name="squashfs"/>
+ <package name="aufs"/>
+ <package name="aufs-kmp-default"/>
<package name="gfxboot"/>
<package name="fribidi"/>
<package name="make"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-linuxrc new/kiwi/system/boot/usbboot/suse-linuxrc
--- old/kiwi/system/boot/usbboot/suse-linuxrc 2007-11-05 16:00:07.000000000 +0100
+++ new/kiwi/system/boot/usbboot/suse-linuxrc 2007-11-08 13:53:55.000000000 +0100
@@ -49,22 +49,22 @@
closeKernelConsole
#======================================
-# 2) start boot shell
-#--------------------------------------
-startShell
-
-#======================================
-# 3) Prepare module load support
+# 2) Prepare module load support
#--------------------------------------
touch /etc/modules.conf
touch /lib/modules/*/modules.dep
#======================================
-# 4) run udevd
+# 3) run udevd
#--------------------------------------
udevStart
#======================================
+# 4) start boot shell
+#--------------------------------------
+startShell
+
+#======================================
# 5) Including required kernel modules
#--------------------------------------
probeDevices
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.3/config.xml new/kiwi/system/boot/vmxboot/suse-10.3/config.xml
--- old/kiwi/system/boot/vmxboot/suse-10.3/config.xml 2007-10-09 13:30:24.000000000 +0200
+++ new/kiwi/system/boot/vmxboot/suse-10.3/config.xml 2007-11-08 13:53:57.000000000 +0100
@@ -38,7 +38,7 @@
<file name="drivers/net/*"/>
</drivers>
<repository type="yast2" status="replaceable">
- <source path="/image/CDs/full-i386"/>
+ <source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image">
<package name="bind-libs"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-11.0/config.xml new/kiwi/system/boot/vmxboot/suse-11.0/config.xml
--- old/kiwi/system/boot/vmxboot/suse-11.0/config.xml 2007-11-05 16:00:44.000000000 +0100
+++ new/kiwi/system/boot/vmxboot/suse-11.0/config.xml 2007-11-08 13:53:57.000000000 +0100
@@ -58,6 +58,8 @@
<package name="util-linux"/>
<package name="grub"/>
<package name="squashfs"/>
+ <package name="aufs"/>
+ <package name="aufs-kmp-default"/>
<package name="gfxboot"/>
<package name="fribidi"/>
<package name="make"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-linuxrc new/kiwi/system/boot/vmxboot/suse-linuxrc
--- old/kiwi/system/boot/vmxboot/suse-linuxrc 2007-11-05 16:00:46.000000000 +0100
+++ new/kiwi/system/boot/vmxboot/suse-linuxrc 2007-11-08 13:53:57.000000000 +0100
@@ -96,22 +96,22 @@
closeKernelConsole
#======================================
-# 2) start boot shell
-#--------------------------------------
-startShell
-
-#======================================
-# 3) Prepare module load support
+# 2) Prepare module load support
#--------------------------------------
touch /etc/modules.conf
touch /lib/modules/*/modules.dep
#======================================
-# 4) run udevd
+# 3) run udevd
#--------------------------------------
udevStart
#======================================
+# 4) start boot shell
+#--------------------------------------
+startShell
+
+#======================================
# 5) Including required kernel modules
#--------------------------------------
probeDevices
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.3/config.xml new/kiwi/system/boot/xenboot/suse-10.3/config.xml
--- old/kiwi/system/boot/xenboot/suse-10.3/config.xml 2007-10-09 13:30:47.000000000 +0200
+++ new/kiwi/system/boot/xenboot/suse-10.3/config.xml 2007-11-08 13:53:58.000000000 +0100
@@ -37,7 +37,7 @@
<file name="drivers/net/*"/>
</drivers>
<repository type="yast2" status="replaceable">
- <source path="/image/CDs/full-i386"/>
+ <source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image">
<package name="e2fsprogs"/>
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-linuxrc new/kiwi/system/boot/xenboot/suse-linuxrc
--- old/kiwi/system/boot/xenboot/suse-linuxrc 2007-11-05 16:00:55.000000000 +0100
+++ new/kiwi/system/boot/xenboot/suse-linuxrc 2007-11-08 13:53:58.000000000 +0100
@@ -57,22 +57,22 @@
closeKernelConsole
#======================================
-# 2) start boot shell
-#--------------------------------------
-startShell
-
-#======================================
-# 3) Prepare module load support
+# 2) Prepare module load support
#--------------------------------------
touch /etc/modules.conf
touch /lib/modules/*/modules.dep
#======================================
-# 4) run udevd
+# 3) run udevd
#--------------------------------------
udevStart
#======================================
+# 4) start boot shell
+#--------------------------------------
+startShell
+
+#======================================
# 5) Including required kernel modules
#--------------------------------------
Echo "Including required kernel modules..."
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org