Hello community, here is the log from the commit of package kiwi checked in at Thu Oct 25 02:03:59 CEST 2007. -------- --- arch/i386/kiwi/kiwi.changes 2007-10-17 16:23:18.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2007-10-24 18:16:35.817645000 +0200 @@ -1,0 +2,16 @@ +Wed Oct 24 09:34:19 CEST 2007 - ms@suse.de + +- v1.75 +- kill udev before preinit starts (#332678) +- added failsafe entry to grub configuration (#334712) +- added failsafe entry to isolinux configuration (#334712) +- added resume=/dev/<swap-part> to grub configuration (#335522) +- remove unneeded /image directory after deployment (#335517) +- fixed resetInstallationSource for zypper manager (#335134) +- remove config-cdroot.tgz and config-cdroot.sh from image (#334645) +- fixed interrupt signal handling for log process (#335588) +- added "ZYPP_MODALIAS_SYSFS=/tmp" for zypper install/update (#335116) +- use --auto-agree-with-licenses option for zypper in and outside + of the chroot environment (#335147) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.A22367/_old 2007-10-25 02:03:01.000000000 +0200 +++ /var/tmp/diff_new_pack.A22367/_new 2007-10-25 02:03:01.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package kiwi (Version 1.74) +# spec file for package kiwi (Version 1.75) # # 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.74 +Version: 1.75 Release: 1 Group: System/Management License: GPL v2 or later @@ -329,6 +329,19 @@ %doc %{_datadir}/kiwi/image/oemboot/README %{_datadir}/kiwi/image/oemboot/suse* %changelog +* Wed Oct 24 2007 - ms@suse.de +- v1.75 +- kill udev before preinit starts (#332678) +- added failsafe entry to grub configuration (#334712) +- added failsafe entry to isolinux configuration (#334712) +- added resume=/dev/<swap-part> to grub configuration (#335522) +- remove unneeded /image directory after deployment (#335517) +- fixed resetInstallationSource for zypper manager (#335134) +- remove config-cdroot.tgz and config-cdroot.sh from image (#334645) +- fixed interrupt signal handling for log process (#335588) +- added "ZYPP_MODALIAS_SYSFS=/tmp" for zypper install/update (#335116) +- use --auto-agree-with-licenses option for zypper in and outside + of the chroot environment (#335147) * Tue Oct 16 2007 - ms@suse.de - v1.74 - fixed cdrom detection, wait for usb devices to settle (#333498) ++++++ 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-17 16:13:14.000000000 +0200 +++ new/kiwi/kiwi.pl 2007-10-24 17:57:06.000000000 +0200 @@ -32,7 +32,7 @@ #============================================ # Globals (Version) #-------------------------------------------- -our $Version = "1.74"; +our $Version = "1.75"; our $openSUSE = "http://software.opensuse.org/download/"; our $ConfigFile = "$ENV{'HOME'}/.kiwirc"; our $ConfigStatus = 0; @@ -1062,7 +1062,7 @@ # signal received, exit safely # --- my $kiwi = new KIWILog("tiny"); - $kiwi -> note ("\n*** Received signal $_[0] ***\n"); + $kiwi -> note ("\n*** $$: Received signal $_[0] ***\n"); if (defined $root) { $root -> cleanMount (); $root -> cleanSource (); 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-10 16:42:32.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2007-10-24 17:57:05.000000000 +0200 @@ -345,7 +345,13 @@ print FD "title $label [ USB ]\n"; print FD " root (hd0,0)\n"; print FD " kernel /boot/linux vga=0x314 splash=silent showopts\n"; - print FD " initrd /boot/initrd\n"; + print FD " initrd /boot/initrd\n"; + print FD "title Failsafe -- $label [ USB ]\n"; + print FD " root (hd0,0)\n"; + print FD " kernel /boot/linux vga=0x314 splash=silent showopts"; + print FD " ide=nodma apm=off acpi=off noresume selinux=0 nosmp"; + print FD " noapic maxcpus=0 edd=off\n"; + print FD " initrd /boot/initrd\n"; close FD; $kiwi -> done(); #========================================== @@ -622,6 +628,12 @@ print FD " kernel (cd)/boot/linux vga=0x314 splash=silent"; print FD " ramdisk_size=512000 showopts\n"; print FD " initrd (cd)/boot/initrd\n"; + print FD "title Failsafe -- KIWI CD Installation\n"; + print FD " kernel (cd)/boot/linux vga=0x314 splash=silent"; + print FD " ramdisk_size=512000 showopts"; + print FD " ide=nodma apm=off acpi=off noresume selinux=0 nosmp"; + print FD " noapic maxcpus=0 edd=off\n"; + print FD " initrd (cd)/boot/initrd\n"; close FD; $kiwi -> done(); @@ -767,6 +779,12 @@ print FD " root (hd0,0)\n"; print FD " kernel /boot/linux.vmx vga=0x314 splash=silent showopts\n"; print FD " initrd /boot/initrd.vmx\n"; + print FD "title Failsafe -- KIWI USB-Stick Installation\n"; + print FD " root (hd0,0)\n"; + print FD " kernel /boot/linux.vmx vga=0x314 splash=silent showopts"; + print FD " ide=nodma apm=off acpi=off noresume selinux=0 nosmp"; + print FD " noapic maxcpus=0 edd=off\n"; + print FD " initrd /boot/initrd.vmx\n"; close FD; $this->{initrd} = $oldird; $kiwi -> done(); @@ -1081,6 +1099,12 @@ print FD " root (hd0,0)\n"; print FD " kernel /boot/linux.vmx vga=0x314 splash=silent showopts\n"; print FD " initrd /boot/initrd.vmx\n"; + print FD "title Failsafe -- $label [ VMX ]\n"; + print FD " root (hd0,0)\n"; + print FD " kernel /boot/linux.vmx vga=0x314 splash=silent showopts"; + print FD " ide=nodma apm=off acpi=off noresume selinux=0 nosmp"; + print FD " noapic maxcpus=0 edd=off\n"; + print FD " initrd /boot/initrd.vmx\n"; close FD; $kiwi -> done(); #========================================== 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-10 16:42:32.000000000 +0200 +++ new/kiwi/modules/KIWIImage.pm 2007-10-24 17:57:05.000000000 +0200 @@ -866,6 +866,21 @@ return undef; } $kiwi -> done(); + $kiwi -> info ("Removing CD root tarball from system image"); + $data = qx (rm $cdrootData); + $code = $? >> 8; + if ($code != 0) { + $kiwi -> failed (); + $kiwi -> error ($data); + $kiwi -> failed (); + if (! -d $main::RootTree.$baseSystem) { + qx (rm -rf $main::RootTree); + qx (rm -rf $tmpdir); + qx (rm -rf $imageTreeReadOnly); + } + return undef; + } + $kiwi -> done(); } #========================================== # Check for optional config-cdroot.sh @@ -897,6 +912,21 @@ return undef; } $kiwi -> done(); + $kiwi -> info ("Removing CD root setup script from system image"); + $data = qx (rm $cdrootData); + $code = $? >> 8; + if ($code != 0) { + $kiwi -> failed (); + $kiwi -> error ($data); + $kiwi -> failed (); + if (! -d $main::RootTree.$baseSystem) { + qx (rm -rf $main::RootTree); + qx (rm -rf $tmpdir); + qx (rm -rf $imageTreeReadOnly); + } + return undef; + } + $kiwi -> done(); } #========================================== # Installing second stage images @@ -987,7 +1017,9 @@ # setup isolinux boot label name #------------------------------------------ my $label = "$systemName [ ISO ]"; + my $lsafe = "Failsafe-$label"; qx (sed -i -e "s:Live-System:$label:" $destination/isolinux.cfg); + qx (sed -i -e "s:Live-Failsafe:$lsafe:" $destination/isolinux.cfg); #========================================== # remove original kernel and initrd #------------------------------------------ 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-17 16:13:13.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2007-10-24 17:57:05.000000000 +0200 @@ -373,6 +373,7 @@ local gnum=$3 # grub boot partition ID local rdev=$4 # grub root partition local gfix=$5 # grub title postfix + local swap=$6 # optional swap partition local menu=$destsPrefix/boot/grub/menu.lst local conf=$destsPrefix/etc/grub.conf local dmap=$destsPrefix/boot/grub/device.map @@ -428,6 +429,9 @@ fi IFS="," ; for i in $KERNEL_LIST;do if test ! -z "$i";then + #====================================== + # create standard entry + #-------------------------------------- kernel=`echo $i | cut -f1 -d:` initrd=`echo $i | cut -f2 -d:` if [ -z "$name" ];then @@ -441,6 +445,9 @@ echo -n " module /boot/$kernel" >> $menu echo -n " root=$rdev $console" >> $menu echo -n " vga=0x314 splash=silent" >> $menu + if [ ! -z "$swap" ];then + echo -n " resume=/dev/$swap" >> $menu + fi echo -n " $KIWI_INITRD_PARAMS" >> $menu echo " $KIWI_KERNEL_OPTIONS showopts" >> $menu echo " module /boot/$initrd" >> $menu @@ -448,10 +455,50 @@ echo -n " kernel $gdev/boot/$kernel" >> $menu echo -n " root=$rdev $console" >> $menu echo -n " vga=0x314 splash=silent" >> $menu + if [ ! -z "$swap" ];then + echo -n " resume=/dev/$swap" >> $menu + fi echo -n " $KIWI_INITRD_PARAMS" >> $menu echo " $KIWI_KERNEL_OPTIONS showopts" >> $menu echo " initrd $gdev/boot/$initrd" >> $menu fi + #====================================== + # create failsafe entry + #-------------------------------------- + if [ -z "$name" ];then + echo "title Failsafe -- $kernel [ $gfix ]" >> $menu + else + echo "title Failsafe -- $name [ $gfix ]" >> $menu + fi + if [ $kernel = "vmlinuz-xen" ];then + echo " root $gdev" >> $menu + echo " kernel /boot/xen.gz" >> $menu + echo -n " module /boot/$kernel" >> $menu + echo -n " root=$rdev $console" >> $menu + echo -n " vga=0x314 splash=silent" >> $menu + if [ ! -z "$swap" ];then + echo -n " resume=/dev/$swap" >> $menu + fi + echo -n " $KIWI_INITRD_PARAMS" >> $menu + echo -n " $KIWI_KERNEL_OPTIONS showopts" >> $menu + echo -n " ide=nodma apm=off acpi=off" >> $menu + echo -n " noresume selinux=0 nosmp" >> $menu + echo " noapic maxcpus=0 edd=off" >> $menu + echo " module /boot/$initrd" >> $menu + else + echo -n " kernel $gdev/boot/$kernel" >> $menu + echo -n " root=$rdev $console" >> $menu + echo -n " vga=0x314 splash=silent" >> $menu + if [ ! -z "$swap" ];then + echo -n " resume=/dev/$swap" >> $menu + fi + echo -n " $KIWI_INITRD_PARAMS" >> $menu + echo -n " $KIWI_KERNEL_OPTIONS showopts" >> $menu + echo -n " ide=nodma apm=off acpi=off" >> $menu + echo -n " noresume selinux=0 nosmp" >> $menu + echo " noapic maxcpus=0 edd=off" >> $menu + echo " initrd $gdev/boot/$initrd" >> $menu + fi fi done #====================================== diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/modules/KIWILog.pm new/kiwi/modules/KIWILog.pm --- old/kiwi/modules/KIWILog.pm 2007-10-14 09:13:12.000000000 +0200 +++ new/kiwi/modules/KIWILog.pm 2007-10-24 17:57:05.000000000 +0200 @@ -867,6 +867,8 @@ undef $logServer; exit 0; }; + $SIG{INT} = "IGNORE"; + $SIG{HUP} = "IGNORE"; while (1) { $logServer -> acceptConnection(); my $child = fork(); 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-14 09:13:12.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2007-10-24 17:57:06.000000000 +0200 @@ -521,18 +521,31 @@ #------------------------------------------ if ($manager eq "zypper") { my @list = @channelList; - my $sdel = "service-delete @list"; + my $cmds = "@zypper service-delete"; + if (! $chroot) { + $cmds = "@zypper --root $root service-delete"; + } if (! $chroot) { $this -> checkExclusiveLock(); $kiwi -> info ("Removing zypper service(s): @channelList"); $this -> setLock(); - $data = qx ( bash -c "@zypper --root $root $sdel 2>&1" ); - $code = $? >> 8; + foreach my $chl (@list) { + $data = qx ( bash -c "$cmds $chl 2>&1" ); + $code = $? >> 8; + if ($code != 0) { + last; + } + } $this -> freeLock(); } else { $kiwi -> info ("Removing zypper service(s): @channelList"); - $data = qx ( chroot $root bash -c "@zypper $sdel 2>&1" ); - $code = $? >> 8; + foreach my $chl (@list) { + $data = qx ( chroot $root bash -c "$cmds $chl 2>&1" ); + $code = $? >> 8; + if ($code != 0) { + last; + } + } } if ($code != 0) { $kiwi -> failed (); @@ -646,6 +659,7 @@ # Create screen call file #------------------------------------------ $kiwi -> info ("Upgrading image..."); + print $fd "ZYPP_MODALIAS_SYSFS=/tmp"; if (defined $addPacks) { my @addonPackages = @{$addPacks}; print $fd "chroot $root @zypper update && "; @@ -790,12 +804,16 @@ push @install,$need; } } + my @installOpts = ( + "--auto-agree-with-licenses" + ); $kiwi -> done(); #========================================== # Create screen call file #------------------------------------------ $kiwi -> info ("Installing image packages..."); - print $fd "chroot $root @zypper install @install\n"; + print $fd "ZYPP_MODALIAS_SYSFS=/tmp"; + print $fd "chroot $root @zypper install @installOpts @install\n"; print $fd "echo \$? > $screenCall.exit\n"; } $fd -> close(); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2007-10-17 16:19:11.000000000 +0200 +++ new/kiwi/.revision 2007-10-24 18:02:49.000000000 +0200 @@ -1 +1 @@ -718 \ No newline at end of file +725 \ No newline at end of file diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.1/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-10.1/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-10.1/cdboot/isolinux.cfg 2007-09-28 13:50:09.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.1/cdboot/isolinux.cfg 2007-10-24 17:56:59.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.2/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-10.2/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-10.2/cdboot/isolinux.cfg 2007-09-28 13:50:28.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.2/cdboot/isolinux.cfg 2007-10-24 17:57:00.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-10.3/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-10.3/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-10.3/cdboot/isolinux.cfg 2007-09-28 13:50:36.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-10.3/cdboot/isolinux.cfg 2007-10-24 17:57:00.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 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-17 16:13:00.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-linuxrc 2007-10-24 17:57:03.000000000 +0200 @@ -287,6 +287,7 @@ Echo "Activating Image: [$imageName]" /sbin/udevsettle --timeout=30 mount --move /dev /mnt/dev +udevKill Echo "Calling preinit phase..." cd /mnt && exec < dev/console >dev/console 2>&1 reopenKernelConsole @@ -294,13 +295,15 @@ if test $? != 0;then PIVOT=false cleanInitrd && mount --move . / && chroot . ./preinit - chroot . rm ./preinit - chroot . rm ./include + chroot . rm -f ./preinit + chroot . rm -f ./include + chroot . rm -rf ./image else PIVOT=true ./preinit - rm ./preinit - rm ./include + rm -f ./preinit + rm -f ./include + rm -rf ./image fi #====================================== # 18) Unmount initrd / system init @@ -310,7 +313,6 @@ echo "------------------------------" export IFS=$IFS_ORIG mount -n -o remount,rw / &>/dev/null -udevKill if [ $PIVOT = "true" ];then exec umount -n -l /mnt else diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLED10/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLED10/cdboot/isolinux.cfg 2007-09-28 13:50:48.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10/cdboot/isolinux.cfg 2007-10-24 17:57:02.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-smp/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLED10-smp/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLED10-smp/cdboot/isolinux.cfg 2007-09-28 13:51:12.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-smp/cdboot/isolinux.cfg 2007-10-24 17:57:01.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-SP1/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLED10-SP1/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLED10-SP1/cdboot/isolinux.cfg 2007-09-28 13:50:58.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-SP1/cdboot/isolinux.cfg 2007-10-24 17:57:02.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/cdboot/isolinux.cfg 2007-09-28 13:51:05.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLED10-SP1-smp/cdboot/isolinux.cfg 2007-10-24 17:57:01.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLES10/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLES10/cdboot/isolinux.cfg 2007-09-28 13:51:21.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10/cdboot/isolinux.cfg 2007-10-24 17:56:58.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-smp/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLES10-smp/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLES10-smp/cdboot/isolinux.cfg 2007-09-28 13:51:47.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-smp/cdboot/isolinux.cfg 2007-10-24 17:56:57.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-SP1/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLES10-SP1/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLES10-SP1/cdboot/isolinux.cfg 2007-09-28 13:51:30.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-SP1/cdboot/isolinux.cfg 2007-10-24 17:56:59.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/cdboot/isolinux.cfg new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/cdboot/isolinux.cfg --- old/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/cdboot/isolinux.cfg 2007-09-28 13:51:38.000000000 +0200 +++ new/kiwi/system/boot/isoboot/suse-SLES10-SP1-smp/cdboot/isolinux.cfg 2007-10-24 17:56:58.000000000 +0200 @@ -5,6 +5,11 @@ kernel linux append initrd=initrd ramdisk_size=512000 splash=silent showopts +# Live-System +label Live-Failsafe + kernel linux + append initrd=initrd ramdisk_size=512000 splash=silent showopts ide=nodma apm=off acpi=off noresume selinux=0 nosmp noapic maxcpus=0 edd=off + # hard disk label Hard-Disk localboot 0x80 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-17 16:12:05.000000000 +0200 +++ new/kiwi/system/boot/netboot/suse-linuxrc 2007-10-24 17:56:56.000000000 +0200 @@ -681,7 +681,7 @@ if test ! -z $DISK;then updateSwapDeviceFstab /config ${DISK}1 updateOtherDeviceFstab /config - setupBootLoaderGrub /mnt /config 1 ${DISK}2 NET + setupBootLoaderGrub /mnt /config 1 ${DISK}2 NET ${DISK}1 setupKernelModules /config fi fi @@ -754,6 +754,7 @@ Echo "Activating Image: [$imageRootName]" /sbin/udevsettle --timeout=30 mount --move /dev /mnt/dev +udevKill Echo "Calling preinit phase..." cd /mnt && exec < dev/console >dev/console 2>&1 reopenKernelConsole @@ -761,13 +762,15 @@ if test $? != 0;then PIVOT=false cleanInitrd && mount --move . / && chroot . ./preinit - chroot . rm ./preinit - chroot . rm ./include + chroot . rm -f ./preinit + chroot . rm -f ./include + chroot . rm -rf ./image else PIVOT=true ./preinit - rm ./preinit - rm ./include + rm -f ./preinit + rm -f ./include + rm -rf ./image fi #====================================== # 26) reboot system if specified @@ -786,7 +789,6 @@ echo "----------------------------" export IFS=$IFS_ORIG mount -n -o remount,rw / 2>/dev/null -udevKill if [ $PIVOT = "true" ];then exec umount -n -l /mnt else 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-17 16:12:02.000000000 +0200 +++ new/kiwi/system/boot/oemboot/suse-linuxrc 2007-10-24 17:56:56.000000000 +0200 @@ -544,7 +544,7 @@ mkdir -p /config/kiwiboot echo "$deviceBoot /kiwiboot ext2 defaults 0 0" >> /config/etc/fstab fi - setupBootLoaderGrub /mnt /config 1 ${deviceDisk}2 OEM + setupBootLoaderGrub /mnt /config 1 ${deviceDisk}2 OEM $deviceSwap setupKernelModules /config fi @@ -584,6 +584,7 @@ Echo "Activating Image: [$deviceDisk]" /sbin/udevsettle --timeout=30 mount --move /dev /mnt/dev +udevKill Echo "Calling preinit phase..." cd /mnt && exec < dev/console >dev/console 2>&1 reopenKernelConsole @@ -591,13 +592,15 @@ if test $? != 0;then PIVOT=false cleanInitrd && mount --move . / && chroot . ./preinit - chroot . rm ./preinit - chroot . rm ./include + chroot . rm -f ./preinit + chroot . rm -f ./include + chroot . rm -rf ./image else PIVOT=true ./preinit - rm ./preinit - rm ./include + rm -f ./preinit + rm -f ./include + rm -rf ./image fi #====================================== @@ -608,7 +611,6 @@ echo "----------------------------" export IFS=$IFS_ORIG mount -n -o remount,rw / 2>/dev/null -udevKill if [ $PIVOT = "true" ];then exec umount -n -l /mnt else 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-17 16:12:05.000000000 +0200 +++ new/kiwi/system/boot/usbboot/suse-linuxrc 2007-10-24 17:56:57.000000000 +0200 @@ -167,6 +167,7 @@ Echo "Activating Image: [$stickSerial on -> $stickDevice]" /sbin/udevsettle --timeout=30 mount --move /dev /mnt/dev +udevKill Echo "Calling preinit phase..." cd /mnt && exec < dev/console >dev/console 2>&1 reopenKernelConsole @@ -174,13 +175,15 @@ if test $? != 0;then PIVOT=false cleanInitrd && mount --move . / && chroot . ./preinit - chroot . rm ./preinit - chroot . rm ./include + chroot . rm -f ./preinit + chroot . rm -f ./include + chroot . rm -rf ./image else PIVOT=true ./preinit - rm ./preinit - rm ./include + rm -f ./preinit + rm -f ./include + rm -rf ./image fi #====================================== # 16) Unmount initrd / system init @@ -190,7 +193,6 @@ echo "--------------------------------" export IFS=$IFS_ORIG mount -n -o remount,rw / &>/dev/null -udevKill if [ $PIVOT = "true" ];then exec umount -n -l /mnt else 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-17 16:12:57.000000000 +0200 +++ new/kiwi/system/boot/vmxboot/suse-linuxrc 2007-10-24 17:57:03.000000000 +0200 @@ -206,6 +206,7 @@ Echo "Activating Image: [$imageRootDevice]" /sbin/udevsettle --timeout=30 mount --move /dev /mnt/dev +udevKill Echo "Calling preinit phase..." cd /mnt && exec < dev/console >dev/console 2>&1 reopenKernelConsole @@ -213,13 +214,15 @@ if test $? != 0;then PIVOT=false cleanInitrd && mount --move . / && chroot . ./preinit - chroot . rm ./preinit - chroot . rm ./include + chroot . rm -f ./preinit + chroot . rm -f ./include + chroot . rm -rf ./image else PIVOT=true ./preinit - rm ./preinit - rm ./include + rm -f ./preinit + rm -f ./include + rm -rf ./image fi #====================================== # 16) Unmount initrd / system init @@ -229,7 +232,6 @@ echo "----------------------------" export IFS=$IFS_ORIG mount -n -o remount,rw / 2>/dev/null -udevKill if [ $PIVOT = "true" ];then exec umount -n -l /mnt else 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-17 16:13:08.000000000 +0200 +++ new/kiwi/system/boot/xenboot/suse-linuxrc 2007-10-24 17:57:03.000000000 +0200 @@ -122,6 +122,7 @@ Echo "Activating Image: [$imageRootDevice]" /sbin/udevsettle --timeout=30 mount --move /dev /mnt/dev +udevKill Echo "Calling preinit phase..." cd /mnt && exec < dev/console >dev/console 2>&1 reopenKernelConsole @@ -129,13 +130,15 @@ if test $? != 0;then PIVOT=false cleanInitrd && mount --move . / && chroot . ./preinit - chroot . rm ./preinit - chroot . rm ./include + chroot . rm -f ./preinit + chroot . rm -f ./include + chroot . rm -rf ./image else PIVOT=true ./preinit - rm ./preinit - rm ./include + rm -f ./preinit + rm -f ./include + rm -rf ./image fi #====================================== # 13) Unmount initrd / system init @@ -145,7 +148,6 @@ echo "--------------------------" export IFS=$IFS_ORIG mount -n -o remount,rw / &>/dev/null -udevKill if [ $PIVOT = "true" ];then exec umount -n -l /mnt else ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org