Hello community, here is the log from the commit of package kiwi checked in at Thu Oct 11 21:29:15 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-10-10 17:58:22.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-10-11 17:49:24.798754000 +0200 @@ -1,0 +2,10 @@ +Thu Oct 11 11:32:29 CEST 2007 - ms@suse.de + +- v1.72 +- fixed udevStart function, added missing udev tools (#332678) +- removed devs package from all boot image descriptions +- added copyDevices function, bettern than moving it +- added optional kiwikernelmodule=<modulelist> parameter +- removed setupBootSplash function from initrd + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.Lw6356/_old 2007-10-11 21:28:35.000000000 +0200 +++ /var/tmp/diff_new_pack.Lw6356/_new 2007-10-11 21:28:35.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.71) +# spec file for package kiwi (Version 1.72) # # 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.71 +Version: 1.72 Release: 1 Group: System/Management License: GPL v2 or later @@ -329,6 +329,13 @@ %doc %{_datadir}/kiwi/image/oemboot/README %{_datadir}/kiwi/image/oemboot/suse* %changelog +* Thu Oct 11 2007 - ms@suse.de +- v1.72 +- fixed udevStart function, added missing udev tools (#332678) +- removed devs package from all boot image descriptions +- added copyDevices function, bettern than moving it +- added optional kiwikernelmodule=<modulelist> parameter +- removed setupBootSplash function from initrd * Wed Oct 10 2007 - ms@suse.de - v1.71 - move initrd device nodes to system image to allow system ++++++ 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-10-10 17:52:40.000000000 +0200 +++ new/kiwi/kiwi.pl 2007-10-11 15:33:26.000000000 +0200 @@ -32,7 +32,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.71"; +our $Version = "1.72"; our $openSUSE = "http://software.opensuse.org/download/"; 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-10-09 14:08:37.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2007-10-11 15:33:25.000000000 +0200 @@ -345,7 +345,8 @@ dmesg splash fbmngplay portmap start-statd sm-notify rpc.statd rpc.idmapd nbd-client mount.nfs mount.nfs4 eject blockdev posbios ping killall killall5 udevcontrol udevd - udevsettle udevtrigger mknod + udevsettle udevtrigger mknod stat path_id hwup scsi_id scsi_tur + usb_id ata_id vol_id edd_id " 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-10-10 16:42:32.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2007-10-11 15:39:09.000000000 +0200 @@ -138,6 +138,45 @@ esac } #====================================== +# copyDevices +#-------------------------------------- +function copyDevices { + local prefix=$1 + local search=$2 + local dtype + local major + local minor + local perms + if [ -z "$search" ];then + search=/dev + fi + pushd $search >/dev/null 2>&1 + for i in *;do + if [ -e $prefix/$i ];then + continue + fi + if [ -b $i ];then + dtype=b + elif [ -c $i ];then + dtype=c + elif [ -p $i ];then + dtype=p + else + continue + fi + info=`stat $i -c "0%a:0x%t:0x%T"` + major=`echo $info | cut -f2 -d:` + minor=`echo $info | cut -f3 -d:` + perms=`echo $info | cut -f1 -d:` + if [ $dtype = "p" ];then + mknod -m $perms $prefix/$i $dtype + else + mknod -m $perms $prefix/$i $dtype $major $minor + fi + done + popd >/dev/null 2>&1 +} +#====================================== # mountSystemFilesystems #-------------------------------------- function mountSystemFilesystems { @@ -190,9 +229,21 @@ #-------------------------------------- function udevStart { Echo "Creating device nodes with udev" - /sbin/udevd --daemon + # disable hotplug helper, udevd listens to netlink + echo "" > /proc/sys/kernel/hotplug + # create min devices + copyDevices /dev /lib/udev/devices + # start udevd + udevd --daemon + # cleanup some stuff + rm -f /var/run/sysconfig/network + # unlikely, but we may be faster than the first event + mkdir -p /dev/.udev + mkdir -p /dev/.udev/queue + # create devices /sbin/udevtrigger - /sbin/udevsettle --timeout=30 + # 10 min - just long enough + /sbin/udevsettle --timeout=600 } #====================================== # udevKill @@ -279,20 +330,6 @@ chroot . bash ./run_all.sh } #====================================== -# setupBootSplash -#-------------------------------------- -function setupBootSplash { - # /.../ - # create the /etc/sysconfig/bootsplash file and activate - # the splash while the distro mkinitrd tool runs - # ---- - local prefix=$1 - local splash=$prefix/etc/sysconfig/bootsplash - mkdir -p $prefix/etc/sysconfig - echo "THEME=\"SuSE\"" > $splash - echo "SPLASH=\"yes\"" >> $splash -} -#====================================== # installGrub #-------------------------------------- function setupBootLoaderGrub { @@ -622,34 +659,23 @@ IFS=$IFS_ORIG probeDeviceInfo probeDeviceAlias + if [ ! -z "$kiwikernelmodule" ];then + for module in $kiwikernelmodule;do + Echo "Probing module (cmdline): $module" + modprobe $module >/dev/null 2>&1 + done + fi IFS="%"; while read file info in;do grep -q $info $modalias >/dev/null 2>&1 if [ $? = 0 ];then module=`basename $file` module=`echo $module | sed -e s@.ko@@` INITRD_MODULES="$INITRD_MODULES $module" - if [ $module = "generic" ];then - DRIVER_GENERIC=1 - elif [ $module = "ata_piix" ] ; then - DRIVER_ATA_PIIX=1 - else - Echo "Probing module: $module" - modprobe $module >/dev/null 2>&1 - fi + Echo "Probing module: $module" + modprobe $module >/dev/null 2>&1 fi done < $modinfo IFS=$IFS_ORIG - #====================================== - # Handle special cases - #-------------------------------------- - if [ $DRIVER_ATA_PIIX -eq 1 ] ; then - Echo "Probing module: ata_piix" - modprobe ata_piix >/dev/null 2>&1 - fi - if [ $DRIVER_GENERIC -eq 1 ] ; then - Echo "Probing module: generic" - modprobe generic >/dev/null 2>&1 - fi } #====================================== # probeDevices @@ -658,11 +684,19 @@ Echo "Including required kernel modules..." IFS=$IFS_ORIG stdevs=`/usr/sbin/hwinfo --storage | grep "Activation Cmd"| cut -f2 -d:` - stdevs=`echo $stdevs | tr -d \" | sed -e s"@modprobe@@g"` + stdevs=`echo $stdevs | tr -d \" | sed -e s"@modprobe@@g"` + if [ ! -z "$kiwikernelmodule" ];then + for module in $kiwikernelmodule;do + Echo "Probing module (cmdline): $module" + modprobe $module >/dev/null 2>&1 + done + fi for module in $stdevs;do - Echo "Probing module: $module" - INITRD_MODULES="$INITRD_MODULES $module" - modprobe $module >/dev/null 2>&1 + if ! lsmod | grep -q $module;then + Echo "Probing module: $module" + INITRD_MODULES="$INITRD_MODULES $module" + modprobe $module >/dev/null 2>&1 + fi done } #====================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-10-10 17:57:18.000000000 +0200 +++ new/kiwi/.revision 2007-10-11 17:48:40.000000000 +0200 @@ -1 +1 @@ -698 \ No newline at end of file +706 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.1/config.xml new/kiwi/system/boot/isoboot/suse-10.1/config.xml --- old/kiwi/system/boot/isoboot/suse-10.1/config.xml 2007-10-09 13:27:28.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.1/config.xml 2007-10-11 15:33:12.000000000 +0200 @@ -78,7 +78,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.2/config.xml new/kiwi/system/boot/isoboot/suse-10.2/config.xml --- old/kiwi/system/boot/isoboot/suse-10.2/config.xml 2007-10-09 13:27:41.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.2/config.xml 2007-10-11 15:33:12.000000000 +0200 @@ -80,7 +80,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> 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-10-10 17:52:38.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-linuxrc 2007-10-11 17:43:50.000000000 +0200 @@ -108,8 +108,7 @@ "Not enough RAM available for this image" \ "reboot" fi - gzip -cd $gzippName | dd of=$imageDevice count=$blocks \ - bs=$blocksize >/dev/null 2>&1 + gzip -cd $gzippName | dd of=$imageDevice >/dev/null 2>&1 dd if=$imageDevice count=$blocks bs=$blocksize 2>/dev/null |\ md5sum - > /etc/ireal.md5 read sum2 dumy < /etc/ireal.md5 @@ -140,7 +139,26 @@ fi #====================================== -# 9) Check for swap space +# 9) Resize filesystem to full space +#-------------------------------------- +#if [ -z "$UNIONFS_CONFIG" ];then +# Echo "Resize filesystem to full partition space..." +# if test "$FSTYPE" = "reiserfs";then +# resize_reiserfs $imageDevice +# fi +# if test "$FSTYPE" = "ext2";then +# resize2fs -f -F -p $imageDevice +# e2fsck -y -f $imageDevice +# fi +# if test "$FSTYPE" = "ext3";then +# resize2fs -f -F -p $imageDevice +# e2fsck -y -f $imageDevice +# tune2fs -j $imageDevice +# fi +#fi + +#====================================== +# 10) Check for swap space #-------------------------------------- swapSpace=`searchSwapSpace` if [ ! -z "$swapSpace" ];then @@ -188,25 +206,6 @@ fi #====================================== -# 10) Resize filesystem to full space -#-------------------------------------- -if [ -z "$UNIONFS_CONFIG" ];then - Echo "Resize filesystem to full partition space..." - if test "$FSTYPE" = "reiserfs";then - resize_reiserfs $imageDevice - fi - if test "$FSTYPE" = "ext2";then - resize2fs -f -F -p $imageDevice - e2fsck -y -f $imageDevice - fi - if test "$FSTYPE" = "ext3";then - resize2fs -f -F -p $imageDevice - e2fsck -y -f $imageDevice - tune2fs -j $imageDevice - fi -fi - -#====================================== # 11) Mount OS image to /mnt #-------------------------------------- if [ -z "$UNIONFS_CONFIG" ];then @@ -256,7 +255,6 @@ #====================================== # 12) Create system dependant files #-------------------------------------- -setupBootSplash /config setupDefaultFstab /config updateRootDeviceFstab /config $imageDevice if [ ! -z "$swapSpace" ];then @@ -298,7 +296,7 @@ # 17) Activate new root #-------------------------------------- Echo "Activating Image: [$imageName]" -mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 +mkdir -p /mnt/dev && copyDevices /mnt/dev cd /mnt && exec < dev/console >dev/console 2>&1 Echo "Calling preinit phase..." reopenKernelConsole diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10/config.xml new/kiwi/system/boot/isoboot/suse-SLED10/config.xml --- old/kiwi/system/boot/isoboot/suse-SLED10/config.xml 2007-09-07 11:10:21.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10/config.xml 2007-10-11 15:33:15.000000000 +0200 @@ -79,7 +79,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-smp/config.xml new/kiwi/system/boot/isoboot/suse-SLED10-smp/config.xml --- old/kiwi/system/boot/isoboot/suse-SLED10-smp/config.xml 2007-09-07 11:10:16.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-smp/config.xml 2007-10-11 15:33:14.000000000 +0200 @@ -79,7 +79,6 @@ <package name="kernel-smp"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/isoboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/isoboot/suse-SLED10-SP1/config.xml 2007-09-07 11:10:23.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-SP1/config.xml 2007-10-11 15:33:16.000000000 +0200 @@ -81,7 +81,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config.xml new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config.xml --- old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config.xml 2007-09-07 11:10:19.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/config.xml 2007-10-11 15:33:15.000000000 +0200 @@ -81,7 +81,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10/config.xml new/kiwi/system/boot/isoboot/suse-SLES10/config.xml --- old/kiwi/system/boot/isoboot/suse-SLES10/config.xml 2007-09-07 11:10:12.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10/config.xml 2007-10-11 15:33:10.000000000 +0200 @@ -79,7 +79,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-smp/config.xml new/kiwi/system/boot/isoboot/suse-SLES10-smp/config.xml --- old/kiwi/system/boot/isoboot/suse-SLES10-smp/config.xml 2007-09-07 11:10:08.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-smp/config.xml 2007-10-11 15:33:10.000000000 +0200 @@ -79,7 +79,6 @@ <package name="kernel-smp"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-SP1/config.xml new/kiwi/system/boot/isoboot/suse-SLES10-SP1/config.xml --- old/kiwi/system/boot/isoboot/suse-SLES10-SP1/config.xml 2007-09-07 11:10:14.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-SP1/config.xml 2007-10-11 15:33:11.000000000 +0200 @@ -81,7 +81,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config.xml new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config.xml --- old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config.xml 2007-09-07 11:10:10.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/config.xml 2007-10-11 15:33:10.000000000 +0200 @@ -81,7 +81,6 @@ <package name="kernel-smp"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.1/config.xml new/kiwi/system/boot/netboot/suse-10.1/config.xml --- old/kiwi/system/boot/netboot/suse-10.1/config.xml 2007-09-28 12:39:23.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.1/config.xml 2007-10-11 15:32:56.000000000 +0200 @@ -79,7 +79,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.1-smp/config.xml new/kiwi/system/boot/netboot/suse-10.1-smp/config.xml --- old/kiwi/system/boot/netboot/suse-10.1-smp/config.xml 2007-09-28 12:40:03.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.1-smp/config.xml 2007-10-11 15:32:55.000000000 +0200 @@ -69,7 +69,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.2/config.xml new/kiwi/system/boot/netboot/suse-10.2/config.xml --- old/kiwi/system/boot/netboot/suse-10.2/config.xml 2007-10-08 17:29:57.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.2/config.xml 2007-10-11 15:32:57.000000000 +0200 @@ -83,7 +83,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="PolicyKit"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-10.2-smp/config.xml new/kiwi/system/boot/netboot/suse-10.2-smp/config.xml --- old/kiwi/system/boot/netboot/suse-10.2-smp/config.xml 2007-10-08 17:29:56.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.2-smp/config.xml 2007-10-11 15:32:55.000000000 +0200 @@ -73,7 +73,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="PolicyKit"/> 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-10-10 17:52:38.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-10-11 15:39:06.000000000 +0200 @@ -671,7 +671,6 @@ #-------------------------------------- if [ $LOCAL_BOOT = "no" ];then if test $systemIntegrity = "clean";then - setupBootSplash /config setupDefaultFstab /config updateRootDeviceFstab /config $imageRootDevice if test ! -z $DISK;then @@ -749,7 +748,7 @@ # 24) Activate new root #-------------------------------------- Echo "Activating Image: [$imageRootName]" -mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 +mkdir -p /mnt/dev && copyDevices /mnt/dev cd /mnt && exec < dev/console >dev/console 2>&1 Echo "Calling preinit phase..." reopenKernelConsole diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10/config.xml new/kiwi/system/boot/netboot/suse-SLED10/config.xml --- old/kiwi/system/boot/netboot/suse-SLED10/config.xml 2007-09-28 12:40:44.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLED10/config.xml 2007-10-11 15:33:01.000000000 +0200 @@ -80,7 +80,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10-smp/config.xml new/kiwi/system/boot/netboot/suse-SLED10-smp/config.xml --- old/kiwi/system/boot/netboot/suse-SLED10-smp/config.xml 2007-09-28 12:41:11.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLED10-smp/config.xml 2007-10-11 15:32:59.000000000 +0200 @@ -70,7 +70,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/netboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/netboot/suse-SLED10-SP1/config.xml 2007-09-28 12:40:55.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLED10-SP1/config.xml 2007-10-11 15:33:02.000000000 +0200 @@ -81,7 +81,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config.xml new/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config.xml --- old/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config.xml 2007-09-28 12:41:04.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLED10-SP1-smp/config.xml 2007-10-11 15:33:00.000000000 +0200 @@ -71,7 +71,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10/config.xml new/kiwi/system/boot/netboot/suse-SLES10/config.xml --- old/kiwi/system/boot/netboot/suse-SLES10/config.xml 2007-09-28 12:41:21.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLES10/config.xml 2007-10-11 15:32:52.000000000 +0200 @@ -81,7 +81,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10-smp/config.xml new/kiwi/system/boot/netboot/suse-SLES10-smp/config.xml --- old/kiwi/system/boot/netboot/suse-SLES10-smp/config.xml 2007-09-28 12:41:42.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLES10-smp/config.xml 2007-10-11 15:32:51.000000000 +0200 @@ -71,7 +71,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10-SP1/config.xml new/kiwi/system/boot/netboot/suse-SLES10-SP1/config.xml --- old/kiwi/system/boot/netboot/suse-SLES10-SP1/config.xml 2007-09-28 12:41:28.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLES10-SP1/config.xml 2007-10-11 15:32:53.000000000 +0200 @@ -82,7 +82,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config.xml new/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config.xml --- old/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config.xml 2007-09-28 12:41:35.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-SLES10-SP1-smp/config.xml 2007-10-11 15:32:52.000000000 +0200 @@ -72,7 +72,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-10.2/config.xml new/kiwi/system/boot/oemboot/suse-10.2/config.xml --- old/kiwi/system/boot/oemboot/suse-10.2/config.xml 2007-10-08 17:29:53.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-10.2/config.xml 2007-10-11 15:32:49.000000000 +0200 @@ -80,7 +80,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="diffutils"/> <package name="procps"/> </packages> 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-10-10 17:52:38.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-10-11 15:39:06.000000000 +0200 @@ -77,11 +77,12 @@ #====================================== # 4) Including required kernel modules #-------------------------------------- -udevStart; probeDevices +probeDevices for module in usb_storage sg sd_mod BusLogic;do modprobe $module >/dev/null 2>&1 done sleep 5 +udevStart #====================================== # 5) Search disks, prefer removable one @@ -530,7 +531,6 @@ # 12) Create system dependant files #-------------------------------------- if [ $LOCAL_BOOT = "no" ];then - setupBootSplash /config setupDefaultFstab /config updateSwapDeviceFstab /config $deviceSwap if [ -z "$UNIONFS_CONFIG" ]; then @@ -586,7 +586,7 @@ # 18) Activate new root #-------------------------------------- Echo "Activating Image: [$deviceDisk]" -mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 +mkdir -p /mnt/dev && copyDevices /mnt/dev cd /mnt && exec < dev/console >dev/console 2>&1 Echo "Calling preinit phase..." reopenKernelConsole diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml 2007-09-14 15:18:07.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-SLED10-SP1/config.xml 2007-10-11 15:32:49.000000000 +0200 @@ -80,7 +80,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml --- old/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml 2007-09-14 15:18:07.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-SLED10-SP1-smp/config.xml 2007-10-11 15:32:48.000000000 +0200 @@ -80,7 +80,6 @@ <packages type="boot"> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> </packages> <packages type="delete"> <package name="perl"/> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-10.2/config.xml new/kiwi/system/boot/usbboot/suse-10.2/config.xml --- old/kiwi/system/boot/usbboot/suse-10.2/config.xml 2007-10-08 17:30:00.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-10.2/config.xml 2007-10-11 15:33:08.000000000 +0200 @@ -67,7 +67,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> 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-10-10 17:52:38.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-linuxrc 2007-10-11 15:39:06.000000000 +0200 @@ -57,7 +57,7 @@ #====================================== # 3) Including required kernel modules #-------------------------------------- -probeDevices; udevStart +probeDevices #====================================== # 4) Load USB storage modules @@ -66,6 +66,7 @@ modprobe $module done sleep 5 +udevStart #====================================== # 5) Search USB stick device @@ -122,7 +123,6 @@ #-------------------------------------- if [ $LOCAL_BOOT = "no" ];then if test $systemIntegrity = "clean";then - setupBootSplash /config setupDefaultFstab /config updateRootDeviceFstab /config $stickDevice fi @@ -162,7 +162,7 @@ # 14) Activate new root #-------------------------------------- Echo "Activating Image: [$stickSerial on -> $stickDevice]" -mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 +mkdir -p /mnt/dev && copyDevices /mnt/dev cd /mnt && exec < dev/console >dev/console 2>&1 Echo "Calling preinit phase..." reopenKernelConsole diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-SLED10/config.xml new/kiwi/system/boot/usbboot/suse-SLED10/config.xml --- old/kiwi/system/boot/usbboot/suse-SLED10/config.xml 2007-09-07 11:09:48.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-SLED10/config.xml 2007-10-11 15:33:05.000000000 +0200 @@ -70,7 +70,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml 2007-09-07 11:10:00.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-SLED10-SP1/config.xml 2007-10-11 15:33:07.000000000 +0200 @@ -70,7 +70,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.1/config.xml new/kiwi/system/boot/vmxboot/suse-10.1/config.xml --- old/kiwi/system/boot/vmxboot/suse-10.1/config.xml 2007-09-04 15:07:05.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-10.1/config.xml 2007-10-11 15:33:19.000000000 +0200 @@ -63,7 +63,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="diffutils"/> <package name="procps"/> </packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-10.2/config.xml new/kiwi/system/boot/vmxboot/suse-10.2/config.xml --- old/kiwi/system/boot/vmxboot/suse-10.2/config.xml 2007-09-04 15:07:07.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-10.2/config.xml 2007-10-11 15:33:20.000000000 +0200 @@ -63,7 +63,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="diffutils"/> <package name="procps"/> </packages> 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-10-10 17:52:39.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-linuxrc 2007-10-11 15:39:08.000000000 +0200 @@ -162,7 +162,6 @@ #====================================== # 9) Create system dependant files #-------------------------------------- -setupBootSplash /config setupDefaultFstab /config updateRootDeviceFstab /config $imageRootDevice setupBootLoaderGrub /mnt /config 0 $imageRootDevice VMX @@ -201,7 +200,7 @@ # 14) Activate new root #-------------------------------------- Echo "Activating Image: [$imageRootDevice]" -mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 +mkdir -p /mnt/dev && copyDevices /mnt/dev cd /mnt && exec < dev/console >dev/console 2>&1 Echo "Calling preinit phase..." reopenKernelConsole diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLED10/config.xml new/kiwi/system/boot/vmxboot/suse-SLED10/config.xml --- old/kiwi/system/boot/vmxboot/suse-SLED10/config.xml 2007-09-04 15:06:57.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-SLED10/config.xml 2007-10-11 15:33:18.000000000 +0200 @@ -65,7 +65,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="diffutils"/> <package name="procps"/> </packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config.xml 2007-09-04 15:07:02.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-SLED10-SP1/config.xml 2007-10-11 15:33:19.000000000 +0200 @@ -65,7 +65,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="diffutils"/> <package name="procps"/> </packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLES10/config.xml new/kiwi/system/boot/vmxboot/suse-SLES10/config.xml --- old/kiwi/system/boot/vmxboot/suse-SLES10/config.xml 2007-09-04 15:06:55.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-SLES10/config.xml 2007-10-11 15:33:17.000000000 +0200 @@ -65,7 +65,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="diffutils"/> <package name="procps"/> </packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config.xml new/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config.xml --- old/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config.xml 2007-09-04 15:06:59.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-SLES10-SP1/config.xml 2007-10-11 15:33:18.000000000 +0200 @@ -65,7 +65,6 @@ <package name="kernel-default"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="diffutils"/> <package name="procps"/> </packages> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.1/config.xml new/kiwi/system/boot/xenboot/suse-10.1/config.xml --- old/kiwi/system/boot/xenboot/suse-10.1/config.xml 2007-09-04 15:07:20.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-10.1/config.xml 2007-10-11 15:33:23.000000000 +0200 @@ -60,7 +60,6 @@ <package name="kernel-xen"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-10.2/config.xml new/kiwi/system/boot/xenboot/suse-10.2/config.xml --- old/kiwi/system/boot/xenboot/suse-10.2/config.xml 2007-10-08 17:30:05.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-10.2/config.xml 2007-10-11 15:33:24.000000000 +0200 @@ -60,7 +60,6 @@ <package name="kernel-xen"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> 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-10-10 17:52:39.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-linuxrc 2007-10-11 15:39:08.000000000 +0200 @@ -84,7 +84,6 @@ #====================================== # 6) Create system dependant files #-------------------------------------- -setupBootSplash /config setupDefaultFstab /config updateRootDeviceFstab /config $imageRootDevice @@ -118,7 +117,7 @@ # 11) Activate new root #-------------------------------------- Echo "Activating Image: [$imageRootDevice]" -mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 +mkdir -p /mnt/dev && copyDevices /mnt/dev cd /mnt && exec < dev/console >dev/console 2>&1 Echo "Calling preinit phase..." reopenKernelConsole diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLED10/config.xml new/kiwi/system/boot/xenboot/suse-SLED10/config.xml --- old/kiwi/system/boot/xenboot/suse-SLED10/config.xml 2007-09-04 15:07:14.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-SLED10/config.xml 2007-10-11 15:33:21.000000000 +0200 @@ -62,7 +62,6 @@ <package name="kernel-xen"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLED10-SP1/config.xml new/kiwi/system/boot/xenboot/suse-SLED10-SP1/config.xml --- old/kiwi/system/boot/xenboot/suse-SLED10-SP1/config.xml 2007-09-04 15:07:18.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-SLED10-SP1/config.xml 2007-10-11 15:33:22.000000000 +0200 @@ -62,7 +62,6 @@ <package name="kernel-xen"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLES10/config.xml new/kiwi/system/boot/xenboot/suse-SLES10/config.xml --- old/kiwi/system/boot/xenboot/suse-SLES10/config.xml 2007-09-04 15:07:11.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-SLES10/config.xml 2007-10-11 15:33:21.000000000 +0200 @@ -62,7 +62,6 @@ <package name="kernel-xen"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-SLES10-SP1/config.xml new/kiwi/system/boot/xenboot/suse-SLES10-SP1/config.xml --- old/kiwi/system/boot/xenboot/suse-SLES10-SP1/config.xml 2007-09-04 15:07:16.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-SLES10-SP1/config.xml 2007-10-11 15:33:22.000000000 +0200 @@ -62,7 +62,6 @@ <package name="kernel-xen"/> <package name="filesystem"/> <package name="glibc-locale"/> - <package name="devs"/> <package name="procps"/> </packages> <packages type="delete"> ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org