Hello community, here is the log from the commit of package kiwi checked in at Tue Oct 9 18:27:08 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-10-05 16:33:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-10-08 17:37:03.613332000 +0200 @@ -1,0 +2,13 @@ +Mon Oct 8 09:04:18 CEST 2007 - ms@suse.de + +- v1.68 +- use hwinfo to load storage drivers in correct order (#299663) +- added framebuffer devices in initrd suse-preinit +- added udev start/stop to initrd linuxrc's, don't delete udev + for suse 10.2 / 10.3 boot descriptions +- added creation of /boot/grub/device.map used by mkinitrd +- use smart --data-dir instead of force-channels. This will setup + a clean data dir channel repo for smart used by kiwi only. The + standard channel list in /var/lib/smart remains untouched + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.H14988/_old 2007-10-09 18:08:28.000000000 +0200 +++ /var/tmp/diff_new_pack.H14988/_new 2007-10-09 18:08:28.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.67) +# spec file for package kiwi (Version 1.68) # # 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.67 +Version: 1.68 Release: 1 Group: System/Management License: GPL v2 or later @@ -329,6 +329,16 @@ %doc %{_datadir}/kiwi/image/oemboot/README %{_datadir}/kiwi/image/oemboot/suse* %changelog +* Mon Oct 08 2007 - ms@suse.de +- v1.68 +- use hwinfo to load storage drivers in correct order (#299663) +- added framebuffer devices in initrd suse-preinit +- added udev start/stop to initrd linuxrc's, don't delete udev + for suse 10.2 / 10.3 boot descriptions +- added creation of /boot/grub/device.map used by mkinitrd +- use smart --data-dir instead of force-channels. This will setup + a clean data dir channel repo for smart used by kiwi only. The + standard channel list in /var/lib/smart remains untouched * Fri Oct 05 2007 - ms@suse.de - v1.67 - fixed jabber setup ++++++ 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-05 16:26:44.000000000 +0200 +++ new/kiwi/kiwi.pl 2007-10-08 17:30:09.000000000 +0200 @@ -32,7 +32,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.67"; +our $Version = "1.68"; 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-04 16:21:22.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2007-10-08 17:30:07.000000000 +0200 @@ -344,7 +344,8 @@ usleep parted mke2fs pvcreate vgcreate lvm resize2fs ln hdparm dmesg splash fbmngplay portmap start-statd sm-notify rpc.statd rpc.idmapd nbd-client mount.nfs mount.nfs4 eject - blockdev posbios ping killall5 + blockdev posbios ping killall killall5 udevcontrol udevd + udevsettle udevtrigger " 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-05 15:06:08.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2007-10-08 17:30:07.000000000 +0200 @@ -138,6 +138,50 @@ esac } #====================================== +# mountSystemFilesystems +#-------------------------------------- +function mountSystemFilesystems { + mount -t proc proc /proc &>/dev/null + mount -t sysfs sysfs /sys &>/dev/null + mount -t devpts devpts /dev/pts &>/dev/null +} +#====================================== +# umountSystemFilesystems +#-------------------------------------- +function umountSystemFilesystems { + umount /dev/pts &>/dev/null + umount /sys &>/dev/null + umount /proc &>/dev/null +} +#====================================== +# createFramebufferDevices +#-------------------------------------- +function createFramebufferDevices { + if [ -f /proc/fb ]; then + Echo "Creating framebuffer devices" + while read fbnum fbtype; do + if [ $(($fbnum < 32)) ] ; then + [ -c /dev/fb$fbnum ] || mknod -m 0660 /dev/fb$fbnum c 29 $fbnum + fi + done < /proc/fb + fi +} +#====================================== +# udevStart +#-------------------------------------- +function udevStart { + Echo "Creating device nodes with udev" + /sbin/udevd --daemon + /sbin/udevtrigger + /sbin/udevsettle --timeout=30 +} +#====================================== +# udevKill +#-------------------------------------- +function udevKill { + kill $(/sbin/pidof udevd) +} +#====================================== # installGrub #-------------------------------------- function installBootLoaderGrub { @@ -244,6 +288,7 @@ local gfix=$5 # grub title postfix local menu=$destsPrefix/boot/grub/menu.lst local conf=$destsPrefix/etc/grub.conf + local dmap=$destsPrefix/boot/grub/device.map local console="" #====================================== # check for system image .profile @@ -280,7 +325,7 @@ #====================================== # create directory structure #-------------------------------------- - for dir in $menu $conf;do + for dir in $menu $conf $dmap;do dir=`dirname $dir`; mkdir -p $dir done #====================================== @@ -333,6 +378,11 @@ echo -n " /boot/grub/stage2 0x8000" >> $conf echo " $gdev/boot/grub/menu.lst" >> $conf echo "quit" >> $conf + #====================================== + # create grub device map + #-------------------------------------- + rdisk=`echo $rdev | sed -e s"@[0-9]@@g"` + echo "(hd0) $rdisk" > $dmap } #====================================== # setupDefaultFstab @@ -540,9 +590,9 @@ mv $modinfo.new $modinfo } #====================================== -# probeDevices +# probeDevicesForAlias #-------------------------------------- -function probeDevices { +function probeDevicesForAlias { # /.../ # check the modalias with the modinfo file and load # all matching kernel modules into the kernel @@ -561,7 +611,7 @@ INITRD_MODULES="$INITRD_MODULES $module" if [ $module = "generic" ];then DRIVER_GENERIC=1 - elif [ $module = "ata_piix" ] ; then + elif [ $module = "ata_piix" ] ; then DRIVER_ATA_PIIX=1 else Echo "Probing module: $module" @@ -583,6 +633,19 @@ fi } #====================================== +# probeDevices +#-------------------------------------- +function probeDevices { + Echo "Including required kernel modules..." + stdevs=`/usr/sbin/hwinfo --storage | grep "Activation Cmd"| cut -f2 -d:` + stdevs=`echo $stdevs | tr -d \" | sed -e s"@modprobe@@g"` + for module in $stdevs;do + Echo "Probing module: $module" + INITRD_MODULES="$INITRD_MODULES $module" + modprobe $module >/dev/null 2>&1 + done +} +#====================================== # CDDevice #-------------------------------------- function CDDevice { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIManager.pm new/kiwi/modules/KIWIManager.pm --- old/kiwi/modules/KIWIManager.pm 2007-10-04 16:21:22.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2007-10-08 17:30:07.000000000 +0200 @@ -84,6 +84,10 @@ if (! defined $manager) { $manager = "smart"; } + my $dataDir = "/var/cache/kiwi/smart"; + if ($manager eq "smart") { + qx (mkdir -p $dataDir); + } my @channelList = (); #========================================== # Store object data @@ -99,6 +103,10 @@ $this->{screenCall} = $root."/screenrc.smart"; $this->{screenCtrl} = $root."/screenrc.ctrls"; $this->{screenLogs} = $kiwi -> getRootLog(); + $this->{dataDir} = $dataDir; + $this->{smart} = [ + "smart","--data-dir=$dataDir" + ]; $this->{zypper} = [ "zypper","--non-interactive","--no-gpg-checks" ]; @@ -226,6 +234,7 @@ my $this = shift; my $kiwi = $this->{kiwi}; my $xml = $this->{xml}; + my @smart = @{$this->{smart}}; my $manager = $this->{manager}; my $chroot = $this->{chroot}; my $root = $this->{root}; @@ -244,11 +253,14 @@ #------------------------------------------ if ($manager eq "smart") { my $optionName = "rpm-check-signatures"; - my $curCheckSig = qx (smart config --show $optionName|tr -d '\n'); + my $curCheckSig = qx (@smart config --show $optionName|tr -d '\n'); + my $cmdstr = "smart config --set"; + if (! $chroot) { + $cmdstr = "@smart config --set"; + } $this->{curCheckSig} = $curCheckSig; if (defined $imgCheckSig) { my $option = "$optionName=$imgCheckSig"; - my $cmdstr = "smart config --set"; if (! $chroot) { $this -> checkExclusiveLock(); $kiwi -> info ("Setting RPM signature check to: $imgCheckSig"); @@ -291,6 +303,7 @@ my $manager= $this->{manager}; my $root = $this->{root}; my $lock = $this->{lock}; + my @smart = @{$this->{smart}}; my $curCheckSig = $this->{curCheckSig}; my $data; my $code; @@ -303,6 +316,9 @@ my $option = "$optionName=$curCheckSig"; my $cmdstr = "smart config --set"; if (! $chroot) { + $cmdstr = "@smart config --set"; + } + if (! $chroot) { $this -> checkExclusiveLock(); $kiwi -> info ("Reset RPM signature check to: $curCheckSig"); $this -> setLock(); @@ -345,6 +361,7 @@ my $root = $this->{root}; my $manager= $this->{manager}; my @zypper = @{$this->{zypper}}; + my @smart = @{$this->{smart}}; my $lock = $this->{lock}; my $data; my $code; @@ -358,12 +375,13 @@ #------------------------------------------ if ($manager eq "smart") { my $stype = "private"; + my $cmds = "smart channel --add"; if (! $chroot) { $stype = "public"; + $cmds = "@smart channel --add"; } foreach my $chl (keys %{$source{$stype}}) { my @opts = @{$source{$stype}{$chl}}; - my $cmds = "smart channel --add"; if (! $chroot) { $this -> checkExclusiveLock(); $this -> setLock(); @@ -463,6 +481,7 @@ my $manager= $this->{manager}; my $root = $this->{root}; my @zypper = @{$this->{zypper}}; + my @smart = @{$this->{smart}}; my $lock = $this->{lock}; my @channelList = @{$this->{channelList}}; my $data; @@ -474,6 +493,9 @@ my @list = @channelList; my $cmds = "smart channel --remove"; if (! $chroot) { + $cmds = "@smart channel --remove"; + } + if (! $chroot) { $this -> checkExclusiveLock(); $kiwi -> info ("Removing smart channel(s): @channelList"); $this -> setLock(); @@ -532,6 +554,7 @@ my $kiwi = $this->{kiwi}; my $manager= $this->{manager}; my $root = $this->{root}; + my @smart = @{$this->{smart}}; my @channelList = @{$this->{channelList}}; my $screenCall = $this->{screenCall}; my @pacs = @_; @@ -547,16 +570,14 @@ #------------------------------------------ if ($manager eq "smart") { $kiwi -> info ("Downloading packages..."); - my $forceChannels = join (",",@channelList); my @loadOpts = ( - "-o force-channels=$forceChannels", "--target=$root" ); #========================================== # Create screen call file #------------------------------------------ - print $fd "smart update @channelList\n"; - print $fd "test \$? = 0 && smart download @pacs @loadOpts\n"; + print $fd "@smart update @channelList\n"; + print $fd "test \$? = 0 && @smart download @pacs @loadOpts\n"; print $fd "echo \$? > $screenCall.exit\n"; print $fd "rm -f $root/etc/smart/channels/*\n"; $fd -> close(); @@ -652,6 +673,7 @@ my $xml = $this->{xml}; my $manager= $this->{manager}; my @zypper = @{$this->{zypper}}; + my @smart = @{$this->{smart}}; my $lock = $this->{lock}; my @channelList = @{$this->{channelList}}; my $screenCall = $this->{screenCall}; @@ -669,11 +691,9 @@ if (! $chroot) { $this -> checkExclusiveLock(); $kiwi -> info ("Initializing image system on: $root..."); - my $forceChannels = join (",",@channelList); my @installOpts = ( "-o rpm-root=$root", "-o deb-root=$root", - "-o force-channels=$forceChannels", "--explain", "--log-level=error", "-y" @@ -686,8 +706,8 @@ # Create screen call file #------------------------------------------ print $fd "touch $lock\n"; - print $fd "smart update @channelList\n"; - print $fd "test \$? = 0 && smart install @packs @installOpts\n"; + print $fd "@smart update @channelList\n"; + print $fd "test \$? = 0 && @smart install @packs @installOpts\n"; print $fd "echo \$? > $screenCall.exit\n"; print $fd "rm -f $root/etc/smart/channels/*\n"; print $fd "rm -f $lock\n"; @@ -787,6 +807,7 @@ my $kiwi = $this->{kiwi}; my %source = %{$this->{source}}; my $manager = $this->{manager}; + my @smart = @{$this->{smart}}; my @zypper = @{$this->{zypper}}; my $lock = $this->{lock}; #========================================== @@ -800,7 +821,7 @@ if ($manager eq "smart") { foreach my $channel (keys %{$source{public}}) { $kiwi -> info ("Removing smart channel: $channel\n"); - qx ( smart channel --remove $channel -y 2>&1 ); + qx ( @smart channel --remove $channel -y 2>&1 ); } } #========================================== @@ -831,6 +852,7 @@ my $root = $this->{root}; my $manager= $this->{manager}; my @zypper = @{$this->{zypper}}; + my @smart = @{$this->{smart}}; my $lock = $this->{lock}; my $data; my $code; @@ -843,7 +865,7 @@ $this -> checkExclusiveLock(); $kiwi -> info ("Checking for package: $pack"); $this -> setLock(); - $data = qx ( smart query --installed $pack | grep -qi $pack 2>&1 ); + $data = qx ( @smart query --installed $pack | grep -qi $pack 2>&1 ); $code = $? >> 8; $this -> freeLock(); } else { @@ -932,4 +954,13 @@ qx ( rm -f $lock ); } +#========================================== +# Destructor +#------------------------------------------ +sub DESTROY { + my $this = shift; + my $dataDir = $this->{dataDir}; + qx (rm -rf $dataDir); +} + 1; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-10-05 16:31:54.000000000 +0200 +++ new/kiwi/.revision 2007-10-08 17:35:55.000000000 +0200 @@ -1 +1 @@ -685 \ No newline at end of file +687 \ No newline at end of file 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-05 15:05:58.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.2/config.xml 2007-10-08 17:30:01.000000000 +0200 @@ -129,7 +129,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="syslinux"/> <package name="gfxboot"/> <package name="make"/> 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-05 15:05:59.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.3/config.xml 2007-10-08 17:30:02.000000000 +0200 @@ -125,7 +125,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="syslinux"/> <package name="gfxboot"/> <package name="make"/> 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-05 15:06:02.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-linuxrc 2007-10-08 17:30:02.000000000 +0200 @@ -47,9 +47,7 @@ #====================================== # 1) Mounting local file systems #-------------------------------------- -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t devpts devpts /dev/pts +mountSystemFilesystems closeKernelConsole #====================================== @@ -68,7 +66,7 @@ #====================================== # 4) Including required kernel modules #-------------------------------------- -probeDevices +probeDevices; udevStart #====================================== # 5) Mount the CD device @@ -287,9 +285,8 @@ #====================================== # 15) umount system filesystems #-------------------------------------- -umount /dev/pts -umount /sys -umount /proc +udevKill +umountSystemFilesystems #====================================== # 16) copy initrd files to image diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-preinit new/kiwi/system/boot/isoboot/suse-preinit --- old/kiwi/system/boot/isoboot/suse-preinit 2007-09-21 14:31:26.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-preinit 2007-10-08 17:30:02.000000000 +0200 @@ -23,3 +23,8 @@ # 1) update mount table #-------------------------------------- updateMTAB + +#====================================== +# 2) create framebuffer devices +#-------------------------------------- +createFramebufferDevices 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-09-28 12:39:34.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.2/config.xml 2007-10-08 17:29:57.000000000 +0200 @@ -131,7 +131,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="gfxboot"/> <package name="fribidi"/> <package name="make"/> 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-09-28 12:40:15.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.2-smp/config.xml 2007-10-08 17:29:56.000000000 +0200 @@ -121,7 +121,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="gfxboot"/> <package name="fribidi"/> <package name="make"/> 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-09-28 12:39:51.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-10-08 17:29:58.000000000 +0200 @@ -134,7 +134,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="gfxboot"/> <package name="fribidi"/> <package name="make"/> 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-09-28 12:40:24.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.3-smp/config.xml 2007-10-08 17:29:57.000000000 +0200 @@ -125,7 +125,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="gfxboot"/> <package name="fribidi"/> <package name="make"/> 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-05 15:05:54.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-10-08 17:29:59.000000000 +0200 @@ -71,9 +71,7 @@ #====================================== # 1) Mounting local file systems #-------------------------------------- -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t devpts devpts /dev/pts +mountSystemFilesystems closeKernelConsole #====================================== @@ -238,7 +236,7 @@ #====================================== # (8) Load Device modules #-------------------------------------- -probeDevices +probeDevices; udevStart export systemIntegrity="unknown" #====================================== @@ -730,9 +728,8 @@ #====================================== # 21) umount system filesystems #-------------------------------------- -umount /dev/pts -umount /sys -umount /proc +udevKill +umountSystemFilesystems #====================================== # 22) copy initrd files to image diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/netboot/suse-preinit new/kiwi/system/boot/netboot/suse-preinit --- old/kiwi/system/boot/netboot/suse-preinit 2007-10-04 16:21:13.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-preinit 2007-10-08 17:29:59.000000000 +0200 @@ -32,7 +32,12 @@ updateMTAB #====================================== -# 3) create initrd on diskful +# 3) create framebuffer devices +#-------------------------------------- +createFramebufferDevices + +#====================================== +# 4) create initrd on diskful #-------------------------------------- if test -z $KIWI_INITRD;then if test ! -z $DISK;then @@ -43,7 +48,7 @@ fi #====================================== -# 4) Install boot loader on diskful +# 5) Install boot loader on diskful #-------------------------------------- if test ! -z $DISK;then if test $systemIntegrity = "clean";then @@ -53,7 +58,7 @@ fi #====================================== -# 5) Reset systemIntegrity +# 6) Reset systemIntegrity #-------------------------------------- if test ! -z $DISK;then if test ! -z $RELOAD_CONFIG;then @@ -62,7 +67,7 @@ fi #====================================== -# 6) check for valid mount points +# 7) check for valid mount points #-------------------------------------- if test ! -z $DISK;then IFS=":" ; for i in $PART_MOUNT;do @@ -75,7 +80,7 @@ fi #====================================== -# 7) Update /etc/ImageVersion files +# 8) Update /etc/ImageVersion files #-------------------------------------- if test ! -z $DISK;then count=0 @@ -101,7 +106,7 @@ fi #====================================== -# 8) setup network for nfs boot +# 9) setup network for nfs boot #-------------------------------------- if test ! -z $NFSROOT;then mount -o nolock -t proc proc /proc 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-09-14 15:18:07.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-10.2/config.xml 2007-10-08 17:29:53.000000000 +0200 @@ -130,7 +130,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <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-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-09-14 15:18:08.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-10.3/config.xml 2007-10-08 17:29:54.000000000 +0200 @@ -130,7 +130,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <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-10-05 15:05:52.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-10-08 17:29:54.000000000 +0200 @@ -52,9 +52,7 @@ #====================================== # 1) Mounting local file systems #-------------------------------------- -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t devpts devpts /dev/pts +mountSystemFilesystems closeKernelConsole #====================================== @@ -79,7 +77,7 @@ #====================================== # 4) Including required kernel modules #-------------------------------------- -probeDevices +udevStart; probeDevices for module in usb_storage sg sd_mod BusLogic;do modprobe $module >/dev/null 2>&1 done @@ -565,9 +563,8 @@ #====================================== # 15) umount system filesystems #-------------------------------------- -umount /dev/pts -umount /sys -umount /proc +udevKill +umountSystemFilesystems #====================================== # 16) copy initrd files to image diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/oemboot/suse-preinit new/kiwi/system/boot/oemboot/suse-preinit --- old/kiwi/system/boot/oemboot/suse-preinit 2007-10-04 16:21:12.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-preinit 2007-10-08 17:29:55.000000000 +0200 @@ -32,7 +32,12 @@ updateMTAB #====================================== -# 2) create initrd on diskful +# 3) create framebuffer devices +#-------------------------------------- +createFramebufferDevices + +#====================================== +# 4) create initrd on diskful #-------------------------------------- if [ -z "$UNIONFS_CONFIG" ]; then #====================================== @@ -58,7 +63,7 @@ fi #====================================== -# 3) Install boot loader if ok +# 5) Install boot loader if ok #-------------------------------------- if [ $grubOK = 1 ];then installBootLoaderGrub 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-09-07 11:10:04.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-10.2/config.xml 2007-10-08 17:30:00.000000000 +0200 @@ -124,7 +124,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="gzip"/> <package name="gfxboot"/> <package name="fribidi"/> 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-09-07 11:10:06.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-10.3/config.xml 2007-10-08 17:30:00.000000000 +0200 @@ -128,7 +128,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="gzip"/> <package name="gfxboot"/> <package name="fribidi"/> 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-05 15:05:56.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-linuxrc 2007-10-08 17:30:00.000000000 +0200 @@ -45,9 +45,7 @@ #====================================== # 1) Mounting local file systems #-------------------------------------- -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t devpts devpts /dev/pts +mountSystemFilesystems closeKernelConsole #====================================== @@ -59,7 +57,7 @@ #====================================== # 3) Including required kernel modules #-------------------------------------- -probeDevices +probeDevices; udevStart #====================================== # 4) Load USB storage modules @@ -151,9 +149,8 @@ #====================================== # 12) umount system filesystems #-------------------------------------- -umount /dev/pts -umount /sys -umount /proc +udevKill +umountSystemFilesystems #====================================== # 13) copy initrd files to image diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/usbboot/suse-preinit new/kiwi/system/boot/usbboot/suse-preinit --- old/kiwi/system/boot/usbboot/suse-preinit 2007-09-21 14:31:25.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-preinit 2007-10-08 17:30:01.000000000 +0200 @@ -23,3 +23,8 @@ # 1) update mount table #-------------------------------------- updateMTAB + +#====================================== +# 2) create framebuffer devices +#-------------------------------------- +createFramebufferDevices 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-09-06 15:25:38.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-10.3/config.xml 2007-10-08 17:30:03.000000000 +0200 @@ -120,7 +120,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <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-10-05 15:06:03.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-linuxrc 2007-10-08 17:30:03.000000000 +0200 @@ -92,9 +92,7 @@ #====================================== # 1) Mounting local file systems #-------------------------------------- -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t devpts devpts /dev/pts +mountSystemFilesystems closeKernelConsole #====================================== @@ -106,7 +104,7 @@ #====================================== # 3) Including required kernel modules #-------------------------------------- -probeDevices +probeDevices; udevStart #====================================== # 4) Mount VM (boot) @@ -187,9 +185,8 @@ #====================================== # 12) umount system filesystems #-------------------------------------- -umount /dev/pts -umount /sys -umount /proc +udevKill +umountSystemFilesystems #====================================== # 13) copy initrd files to image diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/vmxboot/suse-preinit new/kiwi/system/boot/vmxboot/suse-preinit --- old/kiwi/system/boot/vmxboot/suse-preinit 2007-10-04 16:21:15.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-preinit 2007-10-08 17:30:04.000000000 +0200 @@ -25,24 +25,30 @@ updateMTAB #====================================== -# 2) check for union filesystem +# 2) create framebuffer devices +#-------------------------------------- +createFramebufferDevices + +#====================================== +# 3) check for union filesystem #-------------------------------------- if [ ! -z "$UNIONFS_CONFIG" ]; then # /.../ # we are using a special root setup with aufs. In this case # we can't use the SuSE Linux initrd but must stick to the # kiwi boot system. - # ---- + # ---- + updateMTAB exit 0 fi #====================================== -# 3) create initrd on diskful +# 4) create initrd on diskful #-------------------------------------- setupSUSEInitrd #====================================== -# 4) Install boot loader on diskful +# 5) Install boot loader on diskful #-------------------------------------- if [ $grubOK = 1 ];then installBootLoaderGrub 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-09-04 15:07:23.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-10.2/config.xml 2007-10-08 17:30:05.000000000 +0200 @@ -110,7 +110,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="mkinitrd"/> <package name="net-tools"/> <package name="gfxboot"/> 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-09-04 15:07:25.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-10.3/config.xml 2007-10-08 17:30:05.000000000 +0200 @@ -109,7 +109,6 @@ <package name="rpm-python"/> <package name="smart"/> <package name="suse-build-key"/> - <package name="udev"/> <package name="mkinitrd"/> <package name="net-tools"/> <package name="gfxboot"/> 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-05 15:06:05.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-linuxrc 2007-10-08 17:30:05.000000000 +0200 @@ -53,9 +53,7 @@ #====================================== # 1) Mounting local file systems #-------------------------------------- -mount -t proc proc /proc -mount -t sysfs sysfs /sys -mount -t devpts devpts /dev/pts +mountSystemFilesystems closeKernelConsole #====================================== @@ -71,6 +69,7 @@ for module in xennet xenblk reiserfs ext2 ext3 loop ipv6;do modprobe $module >/dev/null 2>&1 done +udevStart #====================================== # 4) Mount VM (boot) @@ -106,9 +105,8 @@ #====================================== # 9) umount system filesystems #-------------------------------------- -umount /dev/pts -umount /sys -umount /proc +udevKill +umountSystemFilesystems #====================================== # 10) copy initrd files to image diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/xenboot/suse-preinit new/kiwi/system/boot/xenboot/suse-preinit --- old/kiwi/system/boot/xenboot/suse-preinit 2007-09-21 14:31:26.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-preinit 2007-10-08 17:30:06.000000000 +0200 @@ -23,3 +23,8 @@ # 1) update mount table #-------------------------------------- updateMTAB + +#====================================== +# 2) create framebuffer devices +#-------------------------------------- +createFramebufferDevices ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org