Hello community,
here is the log from the commit of package kiwi
checked in at Tue Dec 11 00:04:23 CET 2007.
--------
--- arch/i386/kiwi/kiwi.changes 2007-12-06 11:13:43.000000000 +0100
+++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-12-10 17:41:54.844790000 +0100
@@ -1,0 +2,16 @@
+Fri Dec 7 10:44:21 CET 2007 - ms@suse.de
+
+- v2.02
+- fixed local grub setup and sysconfig/kernel (#346824)
+- fixed home partition handling in oemboot linuxrc (#346644)
+- added waitForStorageDevice function which was implemented as
+ inline code in the netboot linuxrc. The function is used in
+ the netboot and oemboot images to check for disk/partition
+ devices (#346644)
+- added netboot config.xml patch to reduce initrd size for
+ diskless systems. Patch by Jigish Gohil added
+ to suse-10.3 and suse-11.0 netboot descriptions (#347182)
+- remove /usr/share/locale* in KIWiConfig.sh::suseStripInitrd
+ instead of only /usr/share/locale
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.m23497/_old 2007-12-11 00:03:45.000000000 +0100
+++ /var/tmp/diff_new_pack.m23497/_new 2007-12-11 00:03:45.000000000 +0100
@@ -1,5 +1,5 @@
#
-# spec file for package kiwi (Version 2.01)
+# spec file for package kiwi (Version 2.02)
#
# 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: 2.01
+Version: 2.02
Release: 1
Group: System/Management
License: GPL v2 or later
@@ -359,6 +359,19 @@
%{_datadir}/kiwi/image/oemboot/suse*
%changelog
+* Fri Dec 07 2007 - ms@suse.de
+- v2.02
+- fixed local grub setup and sysconfig/kernel (#346824)
+- fixed home partition handling in oemboot linuxrc (#346644)
+- added waitForStorageDevice function which was implemented as
+ inline code in the netboot linuxrc. The function is used in
+ the netboot and oemboot images to check for disk/partition
+ devices (#346644)
+- added netboot config.xml patch to reduce initrd size for
+ diskless systems. Patch by Jigish Gohil added
+ to suse-10.3 and suse-11.0 netboot descriptions (#347182)
+- remove /usr/share/locale* in KIWiConfig.sh::suseStripInitrd
+ instead of only /usr/share/locale
* Wed Dec 05 2007 - ms@suse.de
- v2.01
- fixed size check and decompression for gz images (#345896)
++++++ 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-12-06 11:04:47.000000000 +0100
+++ new/kiwi/kiwi.pl 2007-12-10 17:31:41.000000000 +0100
@@ -41,7 +41,7 @@
#============================================
# Globals (Version)
#--------------------------------------------
-our $Version = "2.01";
+our $Version = "2.02";
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-12-06 11:04:45.000000000 +0100
+++ new/kiwi/modules/KIWIConfig.sh 2007-12-10 17:31:40.000000000 +0100
@@ -372,7 +372,7 @@
rm -rf `find -type d | grep .svn`
local files="
/usr/share/info /usr/share/man /usr/share/cracklib /usr/lib*/python*
- /usr/lib*/perl* /usr/share/locale /usr/share/doc/packages /var/lib/rpm
+ /usr/lib*/perl* /usr/share/locale* /usr/share/doc/packages /var/lib/rpm
/usr/lib*/rpm /var/lib/smart /boot/* /opt/* /usr/include /root/.gnupg
/etc/PolicyKit /etc/sysconfig /etc/init.d /etc/profile.d /etc/skel
/etc/ssl /etc/java /etc/default /etc/cron* /etc/dbus* /etc/modprobe*
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-12-04 17:52:37.000000000 +0100
+++ new/kiwi/modules/KIWIImage.pm 2007-12-10 17:31:40.000000000 +0100
@@ -1299,14 +1299,14 @@
my $rerooted = $path;
$rerooted =~ s#$imageTree#/read-only#;
- my $st = stat($path);
+ my $st = lstat($path);
- if (-d $path) {
+ if (S_ISDIR($st->mode)) {
mkdir $target;
chmod S_IMODE($st->mode), $target;
chown $st->uid, $st->gid, $target;
- } elsif (-c $path || -b $path || -l $path) {
+ } elsif (S_ISCHR($st->mode) || S_ISBLK($st->mode) || S_ISLNK($st->mode)) {
qx ( cp -a $path $target );
} else {
symlink ($rerooted, $target);
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-12-06 11:04:45.000000000 +0100
+++ new/kiwi/modules/KIWILinuxRC.sh 2007-12-10 17:31:40.000000000 +0100
@@ -805,6 +805,7 @@
probeDeviceAlias
if [ ! -z "$kiwikernelmodule" ];then
for module in $kiwikernelmodule;do
+ INITRD_MODULES="$INITRD_MODULES $module"
Echo "Probing module (cmdline): $module"
modprobe $module >/dev/null
done
@@ -840,22 +841,21 @@
if [ ! -z "$kiwikernelmodule" ];then
for module in $kiwikernelmodule;do
Echo "Probing module (cmdline): $module"
+ INITRD_MODULES="$INITRD_MODULES $module"
modprobe $module >/dev/null
done
fi
for module in $stdevs;do
- if ! lsmod | grep -q $module;then
- loadok=1
- for broken in $kiwibrokenmodule;do
- if [ $broken = $module ];then
- loadok=0; break
- fi
- done
- if [ $loadok = 1 ];then
- Echo "Probing module: $module"
- INITRD_MODULES="$INITRD_MODULES $module"
- modprobe $module >/dev/null
+ loadok=1
+ for broken in $kiwibrokenmodule;do
+ if [ $broken = $module ];then
+ loadok=0; break
fi
+ done
+ if [ $loadok = 1 ];then
+ Echo "Probing module: $module"
+ INITRD_MODULES="$INITRD_MODULES $module"
+ modprobe $module >/dev/null
fi
done
}
@@ -1931,3 +1931,26 @@
umount /proc
fi
}
+#======================================
+# waitForStorageDevice
+#--------------------------------------
+function waitForStorageDevice {
+ # /.../
+ # function to check access on a storage device
+ # which could be a whole disk or a partition.
+ # the function will wait until the size of the
+ # storage device could be obtained or the check
+ # counter equals 4
+ # ----
+ local device=$1
+ local check=0
+ while true;do
+ sfdisk -s $device &>/dev/null
+ if [ $? = 0 ] || [ $check -eq 4 ];then
+ break
+ fi
+ Echo "Waiting for device $device to settle..."
+ check=`expr $check + 1`
+ sleep 2
+ done
+}
diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2007-12-06 11:13:33.000000000 +0100
+++ new/kiwi/.revision 2007-12-10 17:41:31.000000000 +0100
@@ -1 +1 @@
-868
\ No newline at end of file
+872
\ No newline at end of file
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-11-16 16:08:20.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-12-10 17:31:39.000000000 +0100
@@ -15,8 +15,10 @@
<profiles>
<profile name="default" description="Boot with default kernel"/>
<profile name="xen" description="Boot with xen kernel/mboot.c32"/>
+ <profile name="diskless" description="Booting diskless thin clients"/>
</profiles>
- <drivers type="drivers">
+ <drivers type="drivers" profiles="default,xen">
+ <!-- DRIVERS START DEFAULT AND XEN -->
<file name="drivers/ide/*"/>
<file name="net/packet/*"/>
<file name="fs/ext3/*"/>
@@ -44,20 +46,89 @@
<file name="drivers/message/fusion/*"/>
<file name="drivers/net/*"/>
<file name="drivers/block/nbd.ko"/>
+ <!-- DRIVERS END DEFAULT AND XEN -->
+ </drivers>
+ <drivers type="drivers" profiles="diskless">
+ <!-- DRIVERS START DISKLESS -->
+ <file name="drivers/ide/*"/>
+ <file name="net/packet/*"/>
+ <file name="fs/ext3/*"/>
+ <file name="fs/ext2/*"/>
+ <file name="fs/mbcache.ko"/>
+ <file name="fs/exportfs/*"/>
+ <file name="fs/squashfs/*"/>
+ <file name="fs/aufs.ko"/>
+ <file name="fs/nfs/*"/>
+ <file name="fs/lockd/*"/>
+ <file name="net/sunrpc/*"/>
+ <file name="fs/nfs_common/*"/>
+ <file name="drivers/message/fusion/*"/>
+ <file name="drivers/block/nbd.ko"/>
+ <file name="drivers/net/3c59x.ko"/>
+ <file name="drivers/net/8139cp.ko"/>
+ <file name="drivers/net/8139too.ko"/>
+ <file name="drivers/net/8390.ko"/>
+ <file name="drivers/net/b44.ko"/>
+ <file name="drivers/net/bnx2.ko"/>
+ <file name="drivers/net/defxx.ko"/>
+ <file name="drivers/net/dl2k.ko"/>
+ <file name="drivers/net/e100.ko"/>
+ <file name="drivers/net/e1000/*"/>
+ <file name="drivers/net/epic100.ko"/>
+ <file name="drivers/net/eql.ko"/>
+ <file name="drivers/net/fealnx.ko"/>
+ <file name="drivers/net/forcedeth.ko"/>
+ <file name="drivers/net/hp100.ko"/>
+ <file name="drivers/net/mii.ko"/>
+ <file name="drivers/net/myri10ge"/>
+ <file name="drivers/net/natsemi.ko"/>
+ <file name="drivers/net/ne2k-pci.ko"/>
+ <file name="drivers/net/netconsole.ko"/>
+ <file name="drivers/net/ns83820.ko"/>
+ <file name="drivers/net/pcnet32.ko"/>
+ <file name="drivers/net/qla3xxx.ko"/>
+ <file name="drivers/net/r8169.ko"/>
+ <file name="drivers/net/s2io.ko"/>
+ <file name="drivers/net/sis900.ko"/>
+ <file name="drivers/net/skge.ko"/>
+ <file name="drivers/net/slhc.ko"/>
+ <file name="drivers/net/starfire.ko"/>
+ <file name="drivers/net/sundance.ko"/>
+ <file name="drivers/net/sungem.ko"/>
+ <file name="drivers/net/sungem_phy.ko"/>
+ <file name="drivers/net/sunhme.ko"/>
+ <file name="drivers/net/tg3.ko"/>
+ <file name="drivers/net/tlan.ko"/>
+ <file name="drivers/net/tulip/*"/>
+ <file name="drivers/net/via-rhine.ko"/>
+ <file name="drivers/net/via-velocity.ko"/>
+ <file name="drivers/net/yellowfin.ko"/>
+ <!-- DRIVERS END DISKLESS -->
</drivers>
<repository type="yast2" status="replaceable">
<source path="/image/CDs/full-10.3-i386"/>
</repository>
<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">
+ <packages type="image" profiles="default,xen">
+ <!-- PACKAGES START DEFAULT AND XEN -->
<package name="psmisc"/>
<package name="iputils"/>
<package name="atftp"/>
@@ -83,12 +154,31 @@
<package name="nfs-client"/>
<package name="bootsplash"/>
<package name="bootsplash-theme-SuSE"/>
+ <!-- PACKAGES END DEFAULT AND XEN -->
+ </packages>
+ <packages type="image" profiles="diskless">
+ <!-- PACKAGES START DISKLESS -->
+ <package name="iputils"/>
+ <package name="atftp"/>
+ <package name="dhcpcd"/>
+ <package name="file"/>
+ <package name="hwinfo"/>
+ <package name="module-init-tools"/>
+ <package name="net-tools"/>
+ <package name="netcfg"/>
+ <package name="util-linux"/>
+ <package name="diffutils"/>
+ <package name="procps"/>
+ <package name="fribidi"/>
+ <package name="nbd"/>
+ <package name="nfs-client"/>
+ <!-- PACKAGES STOP DISKLESS -->
</packages>
<packages type="boot">
<package name="filesystem"/>
- <package name="glibc-locale"/>
</packages>
- <packages type="delete">
+ <packages type="delete" profiles="default,xen,diskless">
+ <!-- DELETE PACKAGES START DEFAULT, XEN AND DISKLESS -->
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
@@ -139,5 +229,40 @@
<package name="fribidi"/>
<package name="make"/>
<package name="bootsplash-theme-SuSE"/>
+ <!-- DELETE PACKAGES END DEFAULT, XEN AND DISKLESS -->
+ </packages>
+ <packages type="delete" profiles="diskless">
+ <!-- DELETE PACKAGES START DISKLESS -->
+ <package name="e2fsprogs"/>
+ <package name="mkinitrd"/>
+ <package name="xorg-x11-libxcb"/>
+ <package name="xorg-x11-libX11"/>
+ <package name="xorg-x11-libXau"/>
+ <package name="openldap2-client"/>
+ <package name="pam-modules"/>
+ <package name="openslp"/>
+ <package name="perl-HTML-Tagset"/>
+ <package name="perl"/>
+ <package name="gfxboot"/>
+ <package name="perl-gettext"/>
+ <package name="setserial"/>
+ <package name="bundle-lang-common-zh"/>
+ <package name="file"/>
+ <package name="libjpeg"/>
+ <package name="libtiff3"/>
+ <package name="libmng"/>
+ <package name="liblcms"/>
+ <package name="parted"/>
+ <package name="e2fsprogs"/>
+ <package name="make"/>
+ <package name="pciutils"/>
+ <package name="gzip"/>
+ <package name="krb5"/>
+ <package name="openldap2-client"/>
+ <package name="cyrus-sasl"/>
+ <package name="pam-modules"/>
+ <package name="pam-config"/>
+ <package name="PolicyKit"/>
+ <!-- DELETE PACKAGES END DISKLESS -->
</packages>
</image>
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-16 16:08:16.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-10.3-smp/config.xml 2007-12-10 17:31:38.000000000 +0100
@@ -1,4 +1,4 @@
-<image name="initrd-netboot-suse-10.3-smp" schemeversion="1.4">
+<image name="initrd-netboot-suse-10.3" schemeversion="1.4">
<description type="boot">
<author>Marcus Schaefer</author>
<contact>ms@novell.com</contact>
@@ -13,10 +13,12 @@
<rpm-check-signatures>False</rpm-check-signatures>
</preferences>
<profiles>
- <profile name="default" description="Boot with default smp kernel"/>
+ <profile name="default" description="Boot with default kernel"/>
<profile name="xen" description="Boot with xen kernel/mboot.c32"/>
+ <profile name="diskless" description="Booting diskless thin clients"/>
</profiles>
- <drivers type="drivers">
+ <drivers type="drivers" profiles="default,xen">
+ <!-- DRIVERS START DEFAULT AND XEN -->
<file name="drivers/ide/*"/>
<file name="net/packet/*"/>
<file name="fs/ext3/*"/>
@@ -31,7 +33,7 @@
<file name="fs/vfat/*"/>
<file name="fs/hfs/*"/>
<file name="fs/exportfs/*"/>
- <file name="fs/squashfs.ko"/>
+ <file name="fs/squashfs/*"/>
<file name="fs/aufs.ko"/>
<file name="fs/reiserfs/*"/>
<file name="fs/nfs/*"/>
@@ -44,21 +46,89 @@
<file name="drivers/message/fusion/*"/>
<file name="drivers/net/*"/>
<file name="drivers/block/nbd.ko"/>
+ <!-- DRIVERS END DEFAULT AND XEN -->
+ </drivers>
+ <drivers type="drivers" profiles="diskless">
+ <!-- DRIVERS START DISKLESS -->
+ <file name="drivers/ide/*"/>
+ <file name="net/packet/*"/>
+ <file name="fs/ext3/*"/>
+ <file name="fs/ext2/*"/>
+ <file name="fs/mbcache.ko"/>
+ <file name="fs/exportfs/*"/>
+ <file name="fs/squashfs/*"/>
+ <file name="fs/aufs.ko"/>
+ <file name="fs/nfs/*"/>
+ <file name="fs/lockd/*"/>
+ <file name="net/sunrpc/*"/>
+ <file name="fs/nfs_common/*"/>
+ <file name="drivers/message/fusion/*"/>
+ <file name="drivers/block/nbd.ko"/>
+ <file name="drivers/net/3c59x.ko"/>
+ <file name="drivers/net/8139cp.ko"/>
+ <file name="drivers/net/8139too.ko"/>
+ <file name="drivers/net/8390.ko"/>
+ <file name="drivers/net/b44.ko"/>
+ <file name="drivers/net/bnx2.ko"/>
+ <file name="drivers/net/defxx.ko"/>
+ <file name="drivers/net/dl2k.ko"/>
+ <file name="drivers/net/e100.ko"/>
+ <file name="drivers/net/e1000/*"/>
+ <file name="drivers/net/epic100.ko"/>
+ <file name="drivers/net/eql.ko"/>
+ <file name="drivers/net/fealnx.ko"/>
+ <file name="drivers/net/forcedeth.ko"/>
+ <file name="drivers/net/hp100.ko"/>
+ <file name="drivers/net/mii.ko"/>
+ <file name="drivers/net/myri10ge"/>
+ <file name="drivers/net/natsemi.ko"/>
+ <file name="drivers/net/ne2k-pci.ko"/>
+ <file name="drivers/net/netconsole.ko"/>
+ <file name="drivers/net/ns83820.ko"/>
+ <file name="drivers/net/pcnet32.ko"/>
+ <file name="drivers/net/qla3xxx.ko"/>
+ <file name="drivers/net/r8169.ko"/>
+ <file name="drivers/net/s2io.ko"/>
+ <file name="drivers/net/sis900.ko"/>
+ <file name="drivers/net/skge.ko"/>
+ <file name="drivers/net/slhc.ko"/>
+ <file name="drivers/net/starfire.ko"/>
+ <file name="drivers/net/sundance.ko"/>
+ <file name="drivers/net/sungem.ko"/>
+ <file name="drivers/net/sungem_phy.ko"/>
+ <file name="drivers/net/sunhme.ko"/>
+ <file name="drivers/net/tg3.ko"/>
+ <file name="drivers/net/tlan.ko"/>
+ <file name="drivers/net/tulip/*"/>
+ <file name="drivers/net/via-rhine.ko"/>
+ <file name="drivers/net/via-velocity.ko"/>
+ <file name="drivers/net/yellowfin.ko"/>
+ <!-- DRIVERS END DISKLESS -->
</drivers>
<repository type="yast2" status="replaceable">
- <!--<source path="opensuse://10.3"/>-->
<source path="/image/CDs/full-10.3-i386"/>
</repository>
<packages type="image" profiles="default">
- <package name="kernel-bigsmp"/>
- <package name="aufs-kmp-bigsmp"/>
+ <!-- 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">
+ <packages type="image" profiles="default,xen">
+ <!-- PACKAGES START DEFAULT AND XEN -->
<package name="psmisc"/>
<package name="iputils"/>
<package name="atftp"/>
@@ -84,12 +154,31 @@
<package name="nfs-client"/>
<package name="bootsplash"/>
<package name="bootsplash-theme-SuSE"/>
+ <!-- PACKAGES END DEFAULT AND XEN -->
+ </packages>
+ <packages type="image" profiles="diskless">
+ <!-- PACKAGES START DISKLESS -->
+ <package name="iputils"/>
+ <package name="atftp"/>
+ <package name="dhcpcd"/>
+ <package name="file"/>
+ <package name="hwinfo"/>
+ <package name="module-init-tools"/>
+ <package name="net-tools"/>
+ <package name="netcfg"/>
+ <package name="util-linux"/>
+ <package name="diffutils"/>
+ <package name="procps"/>
+ <package name="fribidi"/>
+ <package name="nbd"/>
+ <package name="nfs-client"/>
+ <!-- PACKAGES STOP DISKLESS -->
</packages>
<packages type="boot">
<package name="filesystem"/>
- <package name="glibc-locale"/>
</packages>
- <packages type="delete">
+ <packages type="delete" profiles="default,xen,diskless">
+ <!-- DELETE PACKAGES START DEFAULT, XEN AND DISKLESS -->
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
@@ -116,7 +205,8 @@
<package name="limal-bootloader"/>
<package name="limal-perl"/>
<package name="logrotate"/>
- <package name="mdadm mingetty"/>
+ <package name="mdadm"/>
+ <package name="mingetty"/>
<package name="openSUSE-release"/>
<package name="openldap2-client"/>
<package name="openslp"/>
@@ -139,5 +229,40 @@
<package name="fribidi"/>
<package name="make"/>
<package name="bootsplash-theme-SuSE"/>
+ <!-- DELETE PACKAGES END DEFAULT, XEN AND DISKLESS -->
+ </packages>
+ <packages type="delete" profiles="diskless">
+ <!-- DELETE PACKAGES START DISKLESS -->
+ <package name="e2fsprogs"/>
+ <package name="mkinitrd"/>
+ <package name="xorg-x11-libxcb"/>
+ <package name="xorg-x11-libX11"/>
+ <package name="xorg-x11-libXau"/>
+ <package name="openldap2-client"/>
+ <package name="pam-modules"/>
+ <package name="openslp"/>
+ <package name="perl-HTML-Tagset"/>
+ <package name="perl"/>
+ <package name="gfxboot"/>
+ <package name="perl-gettext"/>
+ <package name="setserial"/>
+ <package name="bundle-lang-common-zh"/>
+ <package name="file"/>
+ <package name="libjpeg"/>
+ <package name="libtiff3"/>
+ <package name="libmng"/>
+ <package name="liblcms"/>
+ <package name="parted"/>
+ <package name="e2fsprogs"/>
+ <package name="make"/>
+ <package name="pciutils"/>
+ <package name="gzip"/>
+ <package name="krb5"/>
+ <package name="openldap2-client"/>
+ <package name="cyrus-sasl"/>
+ <package name="pam-modules"/>
+ <package name="pam-config"/>
+ <package name="PolicyKit"/>
+ <!-- DELETE PACKAGES END DISKLESS -->
</packages>
</image>
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-16 16:08:17.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-11.0/config.xml 2007-12-10 17:31:38.000000000 +0100
@@ -60,6 +60,7 @@
<file name="fs/aufs.ko"/>
<file name="fs/nfs/*"/>
<file name="fs/lockd/*"/>
+ <file name="net/sunrpc/*"/>
<file name="fs/nfs_common/*"/>
<file name="drivers/message/fusion/*"/>
<file name="drivers/block/nbd.ko"/>
@@ -157,7 +158,6 @@
</packages>
<packages type="image" profiles="diskless">
<!-- PACKAGES START DISKLESS -->
- <package name="psmisc"/>
<package name="iputils"/>
<package name="atftp"/>
<package name="dhcpcd"/>
@@ -169,18 +169,13 @@
<package name="util-linux"/>
<package name="diffutils"/>
<package name="procps"/>
- <package name="gfxboot"/>
<package name="fribidi"/>
- <package name="make"/>
<package name="nbd"/>
<package name="nfs-client"/>
- <package name="bootsplash"/>
- <package name="bootsplash-theme-SuSE"/>
<!-- PACKAGES STOP DISKLESS -->
</packages>
<packages type="boot">
<package name="filesystem"/>
- <package name="glibc-locale"/>
</packages>
<packages type="delete" profiles="default,xen,diskless">
<!-- DELETE PACKAGES START DEFAULT, XEN AND DISKLESS -->
@@ -240,6 +235,34 @@
<!-- DELETE PACKAGES START DISKLESS -->
<package name="e2fsprogs"/>
<package name="mkinitrd"/>
+ <package name="xorg-x11-libxcb"/>
+ <package name="xorg-x11-libX11"/>
+ <package name="xorg-x11-libXau"/>
+ <package name="openldap2-client"/>
+ <package name="pam-modules"/>
+ <package name="openslp"/>
+ <package name="perl-HTML-Tagset"/>
+ <package name="perl"/>
+ <package name="gfxboot"/>
+ <package name="perl-gettext"/>
+ <package name="setserial"/>
+ <package name="bundle-lang-common-zh"/>
+ <package name="file"/>
+ <package name="libjpeg"/>
+ <package name="libtiff3"/>
+ <package name="libmng"/>
+ <package name="liblcms"/>
+ <package name="parted"/>
+ <package name="e2fsprogs"/>
+ <package name="make"/>
+ <package name="pciutils"/>
+ <package name="gzip"/>
+ <package name="krb5"/>
+ <package name="openldap2-client"/>
+ <package name="cyrus-sasl"/>
+ <package name="pam-modules"/>
+ <package name="pam-config"/>
+ <package name="PolicyKit"/>
<!-- DELETE PACKAGES END DISKLESS -->
</packages>
</image>
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-16 16:08:14.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-11.0-smp/config.xml 2007-12-10 17:31:38.000000000 +0100
@@ -60,6 +60,7 @@
<file name="fs/aufs.ko"/>
<file name="fs/nfs/*"/>
<file name="fs/lockd/*"/>
+ <file name="net/sunrpc/*"/>
<file name="fs/nfs_common/*"/>
<file name="drivers/message/fusion/*"/>
<file name="drivers/block/nbd.ko"/>
@@ -157,7 +158,6 @@
</packages>
<packages type="image" profiles="diskless">
<!-- PACKAGES START DISKLESS -->
- <package name="psmisc"/>
<package name="iputils"/>
<package name="atftp"/>
<package name="dhcpcd"/>
@@ -169,18 +169,13 @@
<package name="util-linux"/>
<package name="diffutils"/>
<package name="procps"/>
- <package name="gfxboot"/>
<package name="fribidi"/>
- <package name="make"/>
<package name="nbd"/>
<package name="nfs-client"/>
- <package name="bootsplash"/>
- <package name="bootsplash-theme-SuSE"/>
<!-- PACKAGES STOP DISKLESS -->
</packages>
<packages type="boot">
<package name="filesystem"/>
- <package name="glibc-locale"/>
</packages>
<packages type="delete" profiles="default,xen,diskless">
<!-- DELETE PACKAGES START DEFAULT, XEN AND DISKLESS -->
@@ -240,6 +235,34 @@
<!-- DELETE PACKAGES START DISKLESS -->
<package name="e2fsprogs"/>
<package name="mkinitrd"/>
+ <package name="xorg-x11-libxcb"/>
+ <package name="xorg-x11-libX11"/>
+ <package name="xorg-x11-libXau"/>
+ <package name="openldap2-client"/>
+ <package name="pam-modules"/>
+ <package name="openslp"/>
+ <package name="perl-HTML-Tagset"/>
+ <package name="perl"/>
+ <package name="gfxboot"/>
+ <package name="perl-gettext"/>
+ <package name="setserial"/>
+ <package name="bundle-lang-common-zh"/>
+ <package name="file"/>
+ <package name="libjpeg"/>
+ <package name="libtiff3"/>
+ <package name="libmng"/>
+ <package name="liblcms"/>
+ <package name="parted"/>
+ <package name="e2fsprogs"/>
+ <package name="make"/>
+ <package name="pciutils"/>
+ <package name="gzip"/>
+ <package name="krb5"/>
+ <package name="openldap2-client"/>
+ <package name="cyrus-sasl"/>
+ <package name="pam-modules"/>
+ <package name="pam-config"/>
+ <package name="PolicyKit"/>
<!-- DELETE PACKAGES END DISKLESS -->
</packages>
</image>
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-12-06 11:04:42.000000000 +0100
+++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-12-10 17:31:39.000000000 +0100
@@ -276,16 +276,7 @@
esac
done
count=1
- check=0
- while true;do
- sfdisk -s $DISK &>/dev/null
- if [ $? = 0 ] || [ $check -eq 4 ];then
- break
- fi
- Echo "Waiting for disk $DISK to settle..."
- check=`expr $check + 1`
- sleep 2
- done
+ waitForStorageDevice $DISK
if ! sfdisk -s $DISK &>/dev/null;then
systemException \
"Disk $DISK doesn't appear... fatal !" \
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-29 15:20:19.000000000 +0100
+++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-12-10 17:31:37.000000000 +0100
@@ -257,6 +257,13 @@
# 8.6) reread partition table
#--------------------------------------
blockdev --rereadpt $deviceDisk
+ deviceTest="$deviceDisk"1
+ waitForStorageDevice $deviceTest
+ if ! sfdisk -s $deviceTest &>/dev/null;then
+ systemException \
+ "Partition $deviceTest doesn't appear... fatal !" \
+ "reboot"
+ fi
#======================================
# 8.7) find new root partition
#--------------------------------------
@@ -546,17 +553,18 @@
setupDefaultFstab /config
updateSwapDeviceFstab /config $deviceSwap
if [ -z "$UNIONFS_CONFIG" ]; then
- echo "$deviceRoot / $FSTYPE defaults 0 0" >> /config/etc/fstab
- if [ ! -d /mnt/home/* ];then
- echo "$deviceHome /home ext3 defaults 0 0" >> /config/etc/fstab
- else
+ echo "$deviceRoot / $FSTYPE defaults 0 0" >> /config/etc/fstab
+ if [ `ls /mnt/home/ | wc -l` != 0]; then
Echo "Found non empty home/ directory !"
- Echo "Will not activate home partition $deviceHome in fstab"
- echo "#$deviceHome /home ext3 defaults 0 0" >> /config/etc/fstab
+ Echo "Moving home/ data to newly created home partition $deviceHome"
+ mount $deviceHome /mnt/mnt && mv /mnt/home/* /mnt/mnt
+ umount /mnt/mnt
fi
+ Echo "Activate home partition $deviceHome in fstab"
+ echo "$deviceHome /home ext3 defaults 0 0" >> /config/etc/fstab
else
mkdir -p /config/kiwiboot
- echo "$deviceBoot /kiwiboot ext2 defaults 0 0" >> /config/etc/fstab
+ echo "$deviceBoot /kiwiboot ext2 defaults 0 0" >> /config/etc/fstab
fi
setupBootLoaderGrub /mnt /config 1 ${deviceDisk}2 OEM $deviceSwap
setupKernelModules /config
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Remember to have fun...
---------------------------------------------------------------------
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org