Hello community, here is the log from the commit of package kiwi checked in at Thu Oct 11 01:30:22 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-10-09 19:06:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-10-10 17:58:22.369103000 +0200 @@ -1,0 +2,17 @@ +Wed Oct 10 17:54:32 CEST 2007 - ms@suse.de + +- v1.71 +- move initrd device nodes to system image to allow system + images without static devs + +------------------------------------------------------------------- +Wed Oct 10 09:27:27 CEST 2007 - ms@suse.de + +- v1.70 +- fixed NBD support udev creates nbd not nb device nodes (#332493) +- fixed device probing bug, restore IFS before probing +- added option --log-port to specify the log server port +- use sparse files for image creation [speedup] +- copy system image directly for vmx types [speedup] + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.C15013/_old 2007-10-11 01:29:19.000000000 +0200 +++ /var/tmp/diff_new_pack.C15013/_new 2007-10-11 01:29:19.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.69) +# spec file for package kiwi (Version 1.71) # # 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.69 +Version: 1.71 Release: 1 Group: System/Management License: GPL v2 or later @@ -329,6 +329,17 @@ %doc %{_datadir}/kiwi/image/oemboot/README %{_datadir}/kiwi/image/oemboot/suse* %changelog +* Wed Oct 10 2007 - ms@suse.de +- v1.71 +- move initrd device nodes to system image to allow system + images without static devs +* Wed Oct 10 2007 - ms@suse.de +- v1.70 +- fixed NBD support udev creates nbd not nb device nodes (#332493) +- fixed device probing bug, restore IFS before probing +- added option --log-port to specify the log server port +- use sparse files for image creation [speedup] +- copy system image directly for vmx types [speedup] * Tue Oct 09 2007 - ms@suse.de - v1.69 - create device nodes in shared memory segment which fixes ++++++ 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-09 10:06:08.000000000 +0200 +++ new/kiwi/kiwi.pl 2007-10-10 17:52:40.000000000 +0200 @@ -32,7 +32,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.69"; +our $Version = "1.71"; our $openSUSE = "http://software.opensuse.org/download/"; our $ConfigFile = "$ENV{'HOME'}/.kiwirc"; our $ConfigStatus = 0; @@ -120,6 +120,7 @@ our $ForceNewRoot; # force creation of new root directory our $BaseRoot; # use given path as base system our $NoColor; # do not used colored output (done/failed messages) +our $LogPort; # specify alternative log server port #============================================ # Globals @@ -141,17 +142,16 @@ # OS image types. # --- #========================================== + # Initialize and check options + #------------------------------------------ + init(); + #========================================== # Create logger object #------------------------------------------ if (! defined $kiwi) { $kiwi = new KIWILog(); } #========================================== - # Initialize and check options - #------------------------------------------ - init(); - - #========================================== # Check for nocolor option #------------------------------------------ if (defined $NoColor) { @@ -768,7 +768,7 @@ $SIG{"HUP"} = \&quit; $SIG{"TERM"} = \&quit; $SIG{"INT"} = \&quit; - + my $kiwi = new KIWILog("tiny"); my $result = GetOptions( "version" => \&version, "logfile=s" => \$LogFile, @@ -806,8 +806,9 @@ "list-profiles|i=s" => \$ListProfiles, "force-new-root" => \$ForceNewRoot, "base-root=s" => \$BaseRoot, - "help|h" => \&usage, "nocolor" => \$NoColor, + "log-port=i" => \$LogPort, + "help|h" => \&usage, "<>" => \&usage ); my $user = qx (whoami); @@ -845,6 +846,11 @@ $kiwi -> failed (); my $code = kiwiExit (1); return $code; } + if (defined $LogPort) { + $kiwi -> info ("Setting log server port to: $LogPort"); + $LogServerPort = $LogPort; + $kiwi -> done (); + } #========================================== # remove pre-defined smart channels #------------------------------------------ @@ -859,6 +865,7 @@ # Explain the available options for this # image creation system # --- + my $kiwi = new KIWILog("tiny"); print "Linux KIWI setup (image builder) (2006-06-05)\n"; print "Copyright (c) 2006 - SUSE LINUX Products GmbH\n"; print "\n"; @@ -944,6 +951,11 @@ print " [ --force-new-root ]\n"; print " Force creation of new root directory. If the directory\n"; print " already exists, it is deleted.\n"; + print "\n"; + print " [ --log-port <port-number> ]\n"; + print " Set the log server port. By default port 9000 is used\n"; + print " If multiple kiwi processes runs on one system it's\n"; + print " recommended to set the logging port per process\n"; print "--\n"; version(); } @@ -955,6 +967,7 @@ # ... # list known image descriptions and exit # --- + my $kiwi = new KIWILog("tiny"); opendir (FD,$System); my @images = readdir (FD); closedir (FD); foreach my $image (@images) { @@ -1047,6 +1060,7 @@ # ... # signal received, exit safely # --- + my $kiwi = new KIWILog("tiny"); $kiwi -> note ("\n*** Received signal $_[0] ***\n"); if (defined $root) { $root -> cleanMount (); @@ -1072,7 +1086,8 @@ # ... # Version information # --- - my $rev = "unknown"; + my $kiwi = new KIWILog("tiny"); + my $rev = "unknown"; if (open FD,$Revision) { $rev = <FD>; close FD; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIBoot.pm new/kiwi/modules/KIWIBoot.pm --- old/kiwi/modules/KIWIBoot.pm 2007-10-04 16:21:22.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2007-10-10 16:42:32.000000000 +0200 @@ -66,11 +66,7 @@ return undef; } if (defined $system) { - if (! -f $system) { - $kiwi -> error ("Couldn't find system image file: $system"); - $kiwi -> failed (); - return undef; - } else { + if (-f $system) { my $status = qx ( file $system | grep -qi squashfs 2>&1 ); my $result = $? >> 8; if ($result == 0) { @@ -79,6 +75,10 @@ } else { $syszip = 0; } + } elsif (! -d $system) { + $kiwi -> error ("Couldn't find image file/directory: $system"); + $kiwi -> failed (); + return undef; } } $kernel = $initrd; @@ -105,7 +105,13 @@ if (! defined $vmsize) { my $kernelSize = -s $kernel; # the kernel my $initrdSize = -s $initrd; # the boot image - my $systemSize = -s $system; # the system image + my $systemSize; # the system image + if (-d $system) { + $systemSize = qx (du -bs $system | cut -f1 2>&1); + chomp $systemSize; + } else { + $systemSize = -s $system; + } if ($syszip) { $vmsize = $kernelSize + $initrdSize + $syszip; } else { @@ -958,6 +964,7 @@ sub setupBootDisk { my $this = shift; my $kiwi = $this->{kiwi}; + my $arch = $this->{arch}; my $system = $this->{system}; my $vmsize = $this->{vmsize}; my $format = $this->{format}; @@ -965,12 +972,50 @@ my $tmpdir = $this->{tmpdir}; my $initrd = $this->{initrd}; my $diskname = $system.".raw"; + my $label = $this -> getImageName(); my $loop = "/dev/loop0"; my $loopfound = 0; + my $haveTree = 0; + my $version; + my $fstype; my $sysname; my $sysird; my $result; my $status; + my $destdir; + #========================================== + # check if system is tree or image file + #------------------------------------------ + if ( -d $system ) { + my $xml = new KIWIXML ( $kiwi,$system."/image",undef,"vmx" ); + if (! defined $xml) { + return undef; + } + #========================================== + # build disk name and label from xml data + #------------------------------------------ + $destdir = dirname ($initrd); + $label = $xml -> getImageName(); + $version = $xml -> getImageVersion(); + $diskname = $label; + $diskname = $destdir."/".$diskname.".".$arch."-".$version.".raw"; + $haveTree = 1; + #========================================== + # obtain filesystem type from xml data + #------------------------------------------ + my %type = %{$xml->getImageTypeAndAttributes()}; + $fstype = $type{filesystem}; + if (! $fstype) { + $kiwi -> error ("Can't find filesystem type in image tree"); + $kiwi -> failed (); + return undef; + } + if ($fstype eq "squashfs") { + $kiwi -> error ("Can't copy data into requested RO filesystem"); + $kiwi -> failed (); + return undef; + } + } #========================================== # search free loop device #------------------------------------------ @@ -1027,7 +1072,6 @@ $kiwi -> failed (); return undef; } - my $label = $this -> getImageName(); print FD "color cyan/blue white/blue\n"; print FD "default 0\n"; print FD "timeout 10\n"; @@ -1161,18 +1205,88 @@ # Dump system image on virtual disk #------------------------------------------ $kiwi -> done(); - $kiwi -> info ("Dumping system image on virtual disk"); - $status = qx (dd if=$system of=$root bs=8k 2>&1); - $result = $? >> 8; - if ($result != 0) { - $kiwi -> failed (); - $kiwi -> error ("Couldn't dump image to virtual disk: $status"); - $kiwi -> failed (); - qx ( /sbin/kpartx -d $loop ); - qx ( /sbin/losetup -d $loop ); - return undef; + if (! $haveTree) { + $kiwi -> info ("Dumping system image on virtual disk"); + $status = qx (dd if=$system of=$root bs=8k 2>&1); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't dump image to virtual disk: $status"); + $kiwi -> failed (); + qx ( /sbin/kpartx -d $loop ); + qx ( /sbin/losetup -d $loop ); + return undef; + } + $kiwi -> done(); + } else { + #========================================== + # Create filesystem on system image part. + #------------------------------------------ + SWITCH: for ($fstype) { + /^ext2/ && do { + $kiwi -> info ("Creating ext2 root filesystem"); + my $fsopts = "-q -F"; + $status = qx (/sbin/mke2fs $fsopts $root 2>&1); + $result = $? >> 8; + last SWITCH; + }; + /^ext3/ && do { + $kiwi -> info ("Creating ext3 root filesystem"); + my $fsopts = "-O dir_index -b 4096 -j -J size=4 -q -F"; + $status = qx (/sbin/mke2fs $fsopts $root 2>&1); + $result = $? >> 8; + last SWITCH; + }; + /^reiserfs/ && do { + $kiwi -> info ("Creating reiserfs root filesystem"); + $status = qx (/sbin/mkreiserfs -q -f -b 4096 $root 2>&1); + $result = $? >> 8; + last SWITCH; + }; + $kiwi -> error ("Unsupported filesystem type: $fstype"); + $kiwi -> failed (); + return undef; + }; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't create $fstype filesystem: $status"); + $kiwi -> failed (); + return undef; + } + $kiwi -> done(); + #========================================== + # Mount system image partition + #------------------------------------------ + $status = qx (mount $root /mnt/ 2>&1); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Couldn't mount partition: $status"); + $kiwi -> failed (); + qx ( /sbin/kpartx -d $loop ); + qx ( /sbin/losetup -d $loop ); + return undef; + } + #========================================== + # Copy root tree to virtual disk + #------------------------------------------ + $kiwi -> info ("Copying system image tree on virtual disk"); + $status = qx (cp -a $system/* /mnt 2>&1); + $result = $? >> 8; + if ($result != 0) { + $kiwi -> failed (); + $kiwi -> error ("Can't copy image tree to virtual disk: $status"); + $kiwi -> failed (); + qx ( /sbin/kpartx -d $loop ); + qx ( /sbin/losetup -d $loop ); + return undef; + } + $kiwi -> done(); + #========================================== + # Umount system image partition + #------------------------------------------ + qx ( umount /mnt/ 2>&1 ); } - $kiwi -> done(); #========================================== # Dump boot image on virtual disk #------------------------------------------ @@ -1272,14 +1386,14 @@ #------------------------------------------ if (defined $format) { if ($format eq "iso") { - $this -> {system} = $system.".raw"; + $this -> {system} = $diskname; $kiwi -> info ("Creating install ISO image\n"); qx ( /sbin/losetup -d $loop ); if (! $this -> setupInstallCD()) { return undef; } } elsif ($format eq "usb") { - $this -> {system} = $system.".raw"; + $this -> {system} = $diskname; $kiwi -> info ("Creating install USB Stick image\n"); qx ( /sbin/losetup -d $loop ); if (! $this -> setupInstallStick()) { @@ -1287,7 +1401,8 @@ } } else { $kiwi -> info ("Creating $format image"); - my $fname = $system.".".$format; + my $fname = $diskname; + $fname =~ s/\.raw$/\.$format/; $status = qx ( qemu-img convert -f raw $loop -O $format $fname ); $result = $? >> 8; if ($result != 0) { @@ -1454,7 +1569,9 @@ my $newspl = "$spldir/splash"; my $irddir = "$spldir/initrd"; my $newird = $initrd; $newird =~ s/\.gz/\.splash.gz/; + $kiwi -> info ("Setting up splash screen..."); if (! mkdir $spldir) { + $kiwi -> skipped (); $kiwi -> warning ("Failed to create splash directory"); $kiwi -> skipped (); return $initrd; @@ -1467,6 +1584,7 @@ my $status = qx (gzip -cd $initrd|(cd $irddir && cpio -d -i 2>&1)); my $result = $? >> 8; if ($result != 0) { + $kiwi -> skipped (); $kiwi -> warning ("Failed to extract data: $!"); $kiwi -> skipped (); qx (rm -rf $spldir); @@ -1478,6 +1596,7 @@ $status = qx (mv $irddir/image/loader/*.spl $newspl 2>&1); $result = $? >> 8; if ($result != 0) { + $kiwi -> skipped (); $kiwi -> warning ("No splash files found in initrd"); $kiwi -> skipped (); qx (rm -rf $spldir); @@ -1506,6 +1625,7 @@ #------------------------------------------ qx (cat $spldir/all.spl >> $newird); qx (rm -rf $spldir); + $kiwi -> done(); return $newird; } 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-10-09 10:02:29.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2007-10-10 16:42:32.000000000 +0200 @@ -355,15 +355,27 @@ } SWITCH: for ($type) { /^ext2/ && do { - $ok = $this -> createImageEXT2 (); + $ok = 1; + if ($text ne "VMX") { + $ok = $this -> createImageEXT2 (); + } + $result{imageTree} = $imageTree; last SWITCH; }; /^ext3/ && do { - $ok = $this -> createImageEXT3 (); + $ok = 1; + if ($text ne "VMX") { + $ok = $this -> createImageEXT3 (); + } + $result{imageTree} = $imageTree; last SWITCH; }; /^reiserfs/ && do { - $ok = $this -> createImageReiserFS (); + $ok = 1; + if ($text ne "VMX") { + $ok = $this -> createImageReiserFS (); + } + $result{imageTree} = $imageTree; last SWITCH; }; /^squashfs/ && do { @@ -428,12 +440,20 @@ qx (rm -rf $main::RootTree); qx (rm -rf $tmpdir); } + #========================================== + # Include splash screen to initrd + #------------------------------------------ my $initrd = $main::Destination."/".$main::ImageName.".gz"; my $boot = new KIWIBoot ($kiwi,$initrd); if (! defined $boot) { return undef; } - $boot -> setupSplashForGrub(); + if ($text ne "VMX") { + $boot -> setupSplashForGrub(); + } + #========================================== + # Store meta data for subsequent calls + #------------------------------------------ $result{bootImage} = $main::ImageName; if ($text eq "VMX") { $result{format} = $type{format}; @@ -509,6 +529,9 @@ $main::BootVMDisk = $main::Destination."/".$name->{bootImage}.".gz"; $main::BootVMSystem = $main::Destination."/".$name->{systemImage}; $main::BootVMFormat = $name->{format}; + if (defined $name->{imageTree}) { + $main::BootVMSystem = $name->{imageTree}; + } if (! defined main::main()) { $main::Survive = "default"; return undef; @@ -1260,7 +1283,7 @@ # ... # calculate the block size and number of blocks used # to create a <size> bytes long image. Return list - # (bs,count) + # (bs,count,seek) # --- my $size = $_[0]; my $bigimage = 1048576; # 1M @@ -1298,12 +1321,12 @@ # big image... $count = $number / $bigimage; $count = Math::BigFloat->new($count)->ffround(0); - return (($bigimage,$count)); + return (($bigimage,$count,$count*$bigimage)); } else { # small image... $count = $number / $smallimage; $count = Math::BigFloat->new($count)->ffround(0); - return (($smallimage,$count)); + return (($smallimage,$count,$count*$smallimage)); } } @@ -1413,16 +1436,16 @@ } print FD "\n"; } - #========================================== # IMAGE information #------------------------------------------ if ($xml->getCompressed("quiet")) { - print FD "IMAGE=${device}${targetPartition};$namecd;$server;$blocks;compressed\n"; + print FD "IMAGE=${device}${targetPartition};"; + print FD "$namecd;$server;$blocks;compressed\n"; } else { - print FD "IMAGE=${device}${targetPartition};$namecd;$server;$blocks\n"; + print FD "IMAGE=${device}${targetPartition};"; + print FD "$namecd;$server;$blocks\n"; } - #========================================== # CONF information #------------------------------------------ @@ -1628,6 +1651,7 @@ my $kiwi = $this->{kiwi}; my $xml = $this->{xml}; my $imageDest = $this->{imageDest}; + my $out = $imageDest."/".$name; #========================================== # Calculate block size and number of blocks #------------------------------------------ @@ -1635,13 +1659,12 @@ return undef; } my @bsc = getBlocks ( $size ); - my $bs = $bsc[0]; - my $cnt = $bsc[1]; + my $seek = $bsc[2]; #========================================== # Create logical extend storage and FS #------------------------------------------ - unlink ("$imageDest/$name"); - my $data = qx (dd if=/dev/zero of=$imageDest/$name bs=$bs count=$cnt 2>&1); + unlink ($out); + my $data = qx (dd if=/dev/zero of=$out bs=1 seek=$seek count=1 2>&1); my $code = $? >> 8; if ($code != 0) { $kiwi -> error ("Couldn't create logical extend"); 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-09 13:34:53.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2007-10-10 16:42:32.000000000 +0200 @@ -145,14 +145,17 @@ mount -t sysfs sysfs /sys &>/dev/null mount -t tmpfs -o mode=0755 udev /dev &>/dev/null mount -t devpts devpts /dev/pts &>/dev/null - mknod -m 0666 /dev/tty c 5 0 - mknod -m 0600 /dev/console c 5 1 - mknod -m 0666 /dev/ptmx c 5 2 - mknod -m 0666 /dev/null c 1 3 - mknod -m 0600 /dev/kmsg c 1 11 + mknod -m 0640 /dev/loop0 b 7 0 + mknod -m 0640 /dev/loop1 b 7 1 + mknod -m 0640 /dev/loop2 b 7 2 + mknod -m 0666 /dev/tty c 5 0 + mknod -m 0600 /dev/console c 5 1 + mknod -m 0666 /dev/ptmx c 5 2 + mknod -m 0666 /dev/null c 1 3 + mknod -m 0600 /dev/kmsg c 1 11 mknod -m 0660 /dev/snapshot c 10 231 - mknod -m 0666 /dev/random c 1 8 - mknod -m 0644 /dev/urandom c 1 9 + mknod -m 0666 /dev/random c 1 8 + mknod -m 0644 /dev/urandom c 1 9 mkdir -m 0755 /dev/pts mkdir -m 1777 /dev/shm ln -s /proc/self/fd /dev/fd @@ -653,6 +656,7 @@ #-------------------------------------- function probeDevices { 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"` for module in $stdevs;do diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWIXML.pm new/kiwi/modules/KIWIXML.pm --- old/kiwi/modules/KIWIXML.pm 2007-10-09 10:27:04.000000000 +0200 +++ new/kiwi/modules/KIWIXML.pm 2007-10-10 16:42:32.000000000 +0200 @@ -337,6 +337,7 @@ my %result = (); my $count = 0; my $first = ""; + my $ptype = ""; my @node = $this->{optionsNodeList} -> get_node(1) -> getElementsByTagName ("type"); foreach my $node (@node) { @@ -345,7 +346,8 @@ if ((! defined $prim) || ($prim eq "false") || ($prim eq "0")) { $prim = $node -> string_value(); } else { - $prim = "primary"; + $prim = "primary"; + $ptype = $node -> string_value(); } if ($count == 0) { $first = $prim; @@ -367,7 +369,11 @@ return $result{$first}; } } - return $result{$this->{imageWhat}}; + if ($ptype eq $this->{imageWhat}) { + return $result{primary}; + } else { + return $result{$this->{imageWhat}}; + } } #========================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-10-09 19:04:14.000000000 +0200 +++ new/kiwi/.revision 2007-10-10 17:57:18.000000000 +0200 @@ -1 +1 @@ -693 \ No newline at end of file +698 \ No newline at end of file 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-09 18:59:04.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-linuxrc 2007-10-10 17:52:38.000000000 +0200 @@ -298,6 +298,7 @@ # 17) Activate new root #-------------------------------------- Echo "Activating Image: [$imageName]" +mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 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-10.3/config.xml new/kiwi/system/boot/netboot/suse-10.3/config.xml --- old/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-10-09 13:29:35.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-10.3/config.xml 2007-10-10 16:42:31.000000000 +0200 @@ -114,7 +114,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"/> 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-09 18:59:03.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-10-10 17:52:38.000000000 +0200 @@ -505,10 +505,10 @@ done done if [ -z "$nbdDevice" ];then - nbdDevice="/dev/nb0" + nbdDevice="/dev/nbd0" fi if [ -z "$nbdswapDevice" ];then - nbdDevice="/dev/nb1" + nbdDevice="/dev/nbd1" fi if [ -z "$nbdswapPort" ];then nbdswapPort="9210" @@ -749,6 +749,7 @@ # 24) Activate new root #-------------------------------------- Echo "Activating Image: [$imageRootName]" +mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 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-linuxrc new/kiwi/system/boot/oemboot/suse-linuxrc --- old/kiwi/system/boot/oemboot/suse-linuxrc 2007-10-09 18:59:02.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-10-10 17:52:38.000000000 +0200 @@ -586,6 +586,7 @@ # 18) Activate new root #-------------------------------------- Echo "Activating Image: [$deviceDisk]" +mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 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-linuxrc new/kiwi/system/boot/usbboot/suse-linuxrc --- old/kiwi/system/boot/usbboot/suse-linuxrc 2007-10-09 18:59:03.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-linuxrc 2007-10-10 17:52:38.000000000 +0200 @@ -162,6 +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 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-linuxrc new/kiwi/system/boot/vmxboot/suse-linuxrc --- old/kiwi/system/boot/vmxboot/suse-linuxrc 2007-10-09 18:59:04.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-linuxrc 2007-10-10 17:52:39.000000000 +0200 @@ -201,6 +201,7 @@ # 14) Activate new root #-------------------------------------- Echo "Activating Image: [$imageRootDevice]" +mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 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-linuxrc new/kiwi/system/boot/xenboot/suse-linuxrc --- old/kiwi/system/boot/xenboot/suse-linuxrc 2007-10-09 18:59:05.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-linuxrc 2007-10-10 17:52:39.000000000 +0200 @@ -118,6 +118,7 @@ # 11) Activate new root #-------------------------------------- Echo "Activating Image: [$imageRootDevice]" +mkdir -p /mnt/dev && mv -f /dev/* /mnt/dev >/dev/null 2>&1 cd /mnt && exec < dev/console >dev/console 2>&1 Echo "Calling preinit phase..." reopenKernelConsole ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org