Hello community,
here is the log from the commit of package kiwi for openSUSE:Factory checked in
at 2012-05-12 08:51:30
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kiwi (Old)
and /work/SRC/openSUSE:Factory/.kiwi.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kiwi", Maintainer is "m...@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kiwi/kiwi.changes 2012-05-08
12:27:44.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kiwi.new/kiwi.changes 2012-05-12
08:51:34.000000000 +0200
@@ -1,0 +2,81 @@
+Fri May 11 15:02:19 CEST 2012 - m...@suse.de
+
+- v5.03.5 released
+
+-------------------------------------------------------------------
+Wed May 9 13:19:53 CEST 2012 - m...@suse.de
+
+- fixed bootloader setup if yaboot is used. the boot partition
+ id is set to fat (0xc) and we have to make sure to provide
+ bootinfo.txt, yaboot.cnf and the yaboot binary at the root
+ of the boot partition. We don't distinguish the layout between
+ LVM and non LVM setup if yaboot is used in order to have a
+ clean state
+
+-------------------------------------------------------------------
+Wed May 9 13:16:53 CEST 2012 - m...@suse.de
+
+- changed function names installBootLoaderLilo and setupBootLoaderLilo
+ to installBootLoaderYaboot and setupBootLoaderYaboot. lilo is only
+ supported together with yaboot on ppc at the moment. So the function
+ names are misleading and would block us if we want to add support
+ for real lilo.
+
+-------------------------------------------------------------------
+Wed May 9 13:14:10 CEST 2012 - m...@suse.de
+
+- fixed package check for package scripts. The rpm database from
+ the image root system has to be used instead of the build system
+ package database
+
+-------------------------------------------------------------------
+Tue May 8 09:39:13 CEST 2012 - m...@suse.de
+
+- Revert "- don't set vga= kernel parameter for lilo bootlader setup"
+ This reverts commit 5e815b28c84e805d4777551d67be8da0433e1238.
+ lilo on ppc is something complete different than lilo on other
+ architectures. The vga value is supported well on 'real' lilo
+ so this issue should be fixed in the bootloader
+
+-------------------------------------------------------------------
+Mon May 7 21:53:21 CEST 2012 - m...@suse.de
+
+- don't set vga= kernel parameter for lilo bootlader setup
+ I was told this causes trouble when lilo.conf is converted
+ to yaboot.conf
+
+-------------------------------------------------------------------
+Mon May 7 14:49:40 CEST 2012 - m...@suse.de
+
+- use correct size for FAT table when yaboot is used
+
+-------------------------------------------------------------------
+Mon May 7 14:32:09 CEST 2012 - m...@suse.de
+
+- we don't need the mbrid information for ppc/yaboot
+ the searchOFBootDevice function doesn't request it
+
+-------------------------------------------------------------------
+Mon May 7 14:17:45 CEST 2012 - m...@suse.de
+
+- respect custom boot timeout value for yaboot setup
+
+-------------------------------------------------------------------
+Fri May 4 16:02:10 CEST 2012 - m...@suse.de
+
+- don't remove cpio program from initrd, required for custom splash setup
+ follow up fix for the other architectures s390, ppc and arm
+
+-------------------------------------------------------------------
+Fri May 4 15:59:22 CEST 2012 - m...@suse.de
+
+- allow evaluation of $DO_NOT_INSTALL_BOOTLOADER variable in
+ netboot suse-preinit to prevent installation of the bootloader
+ by a variable (bnc #760502)
+
+-------------------------------------------------------------------
+Fri May 4 15:54:26 CEST 2012 - m...@suse.de
+
+- netboot: use --metadata=0.9 format for raid setup (bnc #760713)
+
+-------------------------------------------------------------------
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kiwi.spec ++++++
--- /var/tmp/diff_new_pack.3BZeXH/_old 2012-05-12 08:51:36.000000000 +0200
+++ /var/tmp/diff_new_pack.3BZeXH/_new 2012-05-12 08:51:36.000000000 +0200
@@ -22,7 +22,7 @@
Summary: OpenSuSE - KIWI Image System
License: GPL-2.0
Group: System/Management
-Version: 5.03.4
+Version: 5.03.5
Release: 0
# requirements to build packages
BuildRequires: gcc-c++
++++++ kiwi-docu.tar.bz2 ++++++
/work/SRC/openSUSE:Factory/kiwi/kiwi-docu.tar.bz2
/work/SRC/openSUSE:Factory/.kiwi.new/kiwi-docu.tar.bz2 differ: char 11, line 1
++++++ kiwi-repo.tar.bz2 ++++++
++++++ kiwi.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision
--- old/kiwi/.revision 2012-04-20 13:43:32.000000000 +0200
+++ new/kiwi/.revision 2012-05-11 15:02:49.000000000 +0200
@@ -1 +1 @@
-af18267cc2338fd64a14227c20d716b3a647d835
+b6dd12ad80c978e0785462a84f8dd9c8c6c22717
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 2012-05-01 20:03:16.000000000 +0200
+++ new/kiwi/modules/KIWIBoot.pm 2012-05-11 15:02:53.000000000 +0200
@@ -1732,10 +1732,8 @@
# setup boot partition type
#------------------------------------------
my $partid = 83;
- if ($bootloader =~ /syslinux/) {
+ if ($bootloader =~ /syslinux|yaboot/) {
$partid = "c";
- } elsif ($bootloader eq "yaboot") {
- $partid = "41";
}
#==========================================
# add boot space if syslinux based
@@ -2246,11 +2244,11 @@
}
if ($bootloader =~ /syslinux|yaboot/) {
$kiwi -> info ("Creating DOS boot filesystem");
- if ($bootloader eq "yaboot") {
- $status = qxx ("/sbin/mkdosfs -F 16 -n 'BOOT'
$boot 2>&1");
- } else {
- $status = qxx ("/sbin/mkdosfs -F 32 -n 'BOOT'
$boot 2>&1");
+ my $FATSize = 32;
+ if (($bootloader eq "yaboot") && ($lvm)) {
+ $FATSize = 16;
}
+ $status = qxx ("/sbin/mkdosfs -F $FATSize -n 'BOOT'
$boot 2>&1");
$result = $? >> 8;
if ($result != 0) {
$kiwi -> failed ();
@@ -3829,26 +3827,14 @@
#------------------------------------------
if ($loader eq "yaboot") {
#==========================================
- # Create MBR id file for boot device check
- #------------------------------------------
- $kiwi -> info ("Saving disk label on disk: $this->{mbrid}...");
- qxx ("mkdir -p $tmpdir/boot/grub");
- if (! open (FD,">$tmpdir/boot/grub/mbrid")) {
- $kiwi -> failed ();
- $kiwi -> error ("Couldn't create mbrid file: $!");
- $kiwi -> failed ();
- return;
- }
- print FD "$this->{mbrid}";
- close FD;
- $kiwi -> done();
- #==========================================
# Create yaboot.cnf
#------------------------------------------
$kiwi -> info ("Creating lilo/yaboot config file...");
$cmdline =~ s/\n//g;
- my $title_standard;
- $title_standard = $this -> makeLabel ("$label");
+ my $bootTimeout = 80;
+ if (defined $type{boottimeout}) {
+ $bootTimeout = $type{boottimeout};
+ }
#==========================================
# Standard boot
#------------------------------------------
@@ -3859,83 +3845,59 @@
return;
}
#==========================================
- # CD NON-LVM BOOT
- #-------------------------------------------
- if (($type =~ /^KIWI CD/) && (!$lvm)) {
- print FD "default = $title_standard\n";
- print FD "image = /boot/linux\n";
- print FD "\t"."label = $title_standard\n";
- print FD "\t"."append = \"$cmdline loader=$bloader
cdinst=1\"\n";
- print FD "\t"."initrd = /boot/initrd\n";
- close FD;
- } elsif (($type =~ /^KIWI CD/) && ($lvm)) {
- #==========================================
- # CD LVM Boot
- #-------------------------------------------
- print FD "default = $title_standard\n";
- print FD "image = /boot/linux\n";
- print FD "\t"."label = $title_standard\n";
- print FD "\t"."append = \"$cmdline loader=$bloader
cdinst=1\"\n";
- print FD "\t"."initrd = /boot/initrd\n";
- close FD;
- } elsif (!($type =~ /^KIWI CD/) && (!$lvm)) {
- #==========================================
- # RAW NON-LVM
- #------------------------------------------
- print FD "partition = 2\n";
- print FD "timeout = 80\n";
- print FD "default = $title_standard\n";
- print FD "image = /boot/linux.vmx"."\n";
- print FD "\t"."label = $title_standard\n";
- print FD "\t"."root = /dev/sda2\n";
- print FD "\t"."append = \"$cmdline loader=$bloader\"\n";
- print FD "\t"."initrd = /boot/initrd.vmx\n";
- close FD;
- } elsif (!($type =~ /^KIWI CD/) && ($lvm)) {
- #==========================================
- # RAW LVM
- #-------------------------------------------
- print FD "default = $title_standard\n";
- print FD "image = linux.vmx"."\n";
- print FD "\t"."label = $title_standard\n";
- print FD "\t"."append = \"$cmdline loader=$bloader\"\n";
- print FD "\t"."initrd = initrd.vmx\n";
- close FD;
+ # General yaboot setup
+ #------------------------------------------
+ if ($type =~ /^KIWI (CD|USB)/) {
+ $title = $this -> makeLabel ("Install $label");
+ } else {
+ $title = $this -> makeLabel ("$label [ $type ]");
}
+ print FD "default = $title\n";
+ print FD "timeout = $bootTimeout\n";
#==========================================
- # Create bootinfo.txt (CD and LVM setups)
+ # Standard boot
#------------------------------------------
- if ($type =~ /^KIWI CD/) {
- if (! open (FD,">$tmpdir/bootinfo.txt")) {
- $kiwi -> failed ();
- $kiwi -> error ("Couldn't create bootinfo.txt:
$!");
- $kiwi -> failed ();
- return;
- }
- print FD "<chrp-boot>\n";
- print FD "<description>$title_standard</description>\n";
- print FD "<os-name>$title_standard</os-name>\n";
- print FD "<boot-script>boot
&device;:1,\\suseboot\\yaboot.ibm";
- print FD "</boot-script>\n";
- print FD "</chrp-boot>\n";
- close FD;
- qxx ("mkdir $tmpdir/suseboot");
- qxx ("cp /lib/lilo/chrp/yaboot.chrp
$tmpdir/suseboot/yaboot.ibm");
- qxx ("cp $tmpdir/etc/yaboot.conf
$tmpdir/suseboot/yaboot.cnf");
- } elsif (!($type =~ /^KIWI CD/) && ($lvm)) {
- if (! open (FD,">$tmpdir/bootinfo.txt")) {
- $kiwi -> failed ();
- $kiwi -> error ("Couldn't create bootinfo.txt:
$!");
- $kiwi -> failed ();
- return;
+ if ((! $isxen) || ($isxen && $xendomain eq "domU")) {
+ if ($type =~ /^KIWI CD/) {
+ print FD "\t"."label = $title\n";
+ print FD "\t"."image = /boot/linux\n";
+ print FD "\t"."initrd = /boot/initrd\n";
+ print FD "\t"."append = \"$cmdline
loader=$bloader cdinst=1\"";
+ print FD "\n";
+ } elsif (($type=~ /^KIWI USB/)||($imgtype=~
/vmx|oem|split/)) {
+ print FD "\t"."label = $title\n";
+ print FD "\t"."image = /boot/linux.vmx"."\n";
+ print FD "\t"."initrd = /boot/initrd.vmx\n";
+ print FD "\t"."append = \"$cmdline
loader=$bloader\"\n";
+ } else {
+ print FD "\t"."label = $title\n";
+ print FD "\t"."image = /boot/linux"."\n";
+ print FD "\t"."initrd = /boot/initrd\n";
+ print FD "\t"."append = \"$cmdline
loader=$bloader\"\n";
}
- print FD "<chrp-boot>\n";
- print FD "<description>$title_standard</description>\n";
- print FD "<os-name>$title_standard</os-name>\n";
- print FD "<boot-script>boot
&device;:1,yaboot</boot-script>\n";
- print FD "</chrp-boot>\n";
- close FD;
+ } else {
+ $kiwi -> failed ();
+ $kiwi -> error ("*** not implemented ***");
+ $kiwi -> failed ();
+ return;
+ }
+ close FD;
+ $kiwi -> done();
+ #==========================================
+ # Create bootinfo.txt
+ #------------------------------------------
+ if (! open (FD,">$tmpdir/boot/bootinfo.txt")) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Couldn't create bootinfo.txt: $!");
+ $kiwi -> failed ();
+ return;
}
+ print FD "<chrp-boot>\n";
+ print FD "<description>$title</description>\n";
+ print FD "<os-name>$title</os-name>\n";
+ print FD "<boot-script>boot &device;:1,yaboot</boot-script>\n";
+ print FD "</chrp-boot>\n";
+ close FD;
$kiwi -> done ();
}
#==========================================
@@ -4077,6 +4039,32 @@
return;
}
}
+ if ($loader eq "yaboot") {
+ $status = qxx ("mv $dest/boot/bootinfo.txt $dest");
+ $result = $? >> 8;
+ if ($result != 0) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Couldn't move bootinfo.txt: $status");
+ $kiwi -> failed ();
+ return;
+ }
+ $status = qxx ("mv $dest/boot/yaboot.cnf $dest");
+ $result = $? >> 8;
+ if ($result != 0) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Couldn't move yaboot config: $status");
+ $kiwi -> failed ();
+ return;
+ }
+ $status = qxx ("mv $dest/boot/yaboot $dest");
+ $result = $? >> 8;
+ if ($result != 0) {
+ $kiwi -> failed ();
+ $kiwi -> error ("Couldn't move yaboot loader: $status");
+ $kiwi -> failed ();
+ return;
+ }
+ }
return $this;
}
@@ -4527,34 +4515,7 @@
# install yaboot/lilo
#------------------------------------------
if ($loader eq "yaboot") {
- #==========================================
- # Activate devices
- #------------------------------------------
- if (! $this -> bindDiskPartitions ($this->{loop})) {
- $kiwi -> failed ();
- $this -> cleanLoop ();
- return;
- }
- #==========================================
- # install yaboot on PReP partition
- #------------------------------------------
- if (!$lvm) {
- my %deviceMap = %{$deviceMap};
- my $device = $deviceMap{$bootpart+1};
- if ($lvm) {
- $device = $deviceMap{0};
- }
- $kiwi -> info ("Installing yaboot on device: $device");
- $status = qxx ("dd if=/lib/lilo/chrp/yaboot.chrp
of=$device 2>&1");
- $result = $? >> 8;
- if ($result != 0) {
- $kiwi -> failed ();
- $kiwi -> error ("Couldn't install yaboot on
$device: $status");
- $kiwi -> failed ();
- $this -> cleanLoop ();
- return;
- }
- }
+ # presence of yaboot binary in the boot partition is already
done
}
#==========================================
# install uboot
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/modules/KIWIGlobals.pm
new/kiwi/modules/KIWIGlobals.pm
--- old/kiwi/modules/KIWIGlobals.pm 2012-05-04 15:23:37.000000000 +0200
+++ new/kiwi/modules/KIWIGlobals.pm 2012-05-11 15:02:53.000000000 +0200
@@ -42,7 +42,7 @@
# Globals (generic)
#------------------------------------------
my %data;
- $data{Version} = "5.03.4";
+ $data{Version} = "5.03.5";
$data{Publisher} = "SUSE LINUX Products GmbH";
$data{Preparer} = "KIWI - http://kiwi.berlios.de";;
$data{ConfigName} = "config.xml";
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 2012-05-04 15:23:37.000000000 +0200
+++ new/kiwi/modules/KIWILinuxRC.sh 2012-05-11 15:02:53.000000000 +0200
@@ -666,7 +666,7 @@
x86_64-grub) installBootLoaderGrub ;;
i*86-grub2) installBootLoaderGrub2 ;;
x86_64-grub2) installBootLoaderGrub2 ;;
- ppc*) installBootLoaderLilo ;;
+ ppc*) installBootLoaderYaboot ;;
arm*) installBootLoaderUBoot ;;
i*86-syslinux) installBootLoaderSyslinux ;;
x86_64-syslinux) installBootLoaderSyslinux ;;
@@ -827,12 +827,11 @@
fi
}
#======================================
-# installBootLoaderLilo
+# installBootLoaderYaboot
#--------------------------------------
-function installBootLoaderLilo {
+function installBootLoaderYaboot {
# /.../
- # install the lilo according to the contents of
- # /etc/lilo.conf
+ # install the lilo/yaboot bootloader
# ----
if [ -x /sbin/lilo ];then
Echo "Installing boot loader..."
@@ -1081,7 +1080,7 @@
x86_64-extlinux) eval setupBootLoaderSyslinux $para ;;
s390-zipl) eval setupBootLoaderS390 $para ;;
s390x-zipl) eval setupBootLoaderS390 $para ;;
- ppc*) eval setupBootLoaderLilo $para ;;
+ ppc*) eval setupBootLoaderYaboot $para ;;
arm*) eval setupBootLoaderUBoot $para ;;
*)
systemException \
@@ -2195,12 +2194,13 @@
return
}
#======================================
-# setupBootLoaderLilo
+# setupBootLoaderYaboot
#--------------------------------------
-function setupBootLoaderLilo {
+function setupBootLoaderYaboot {
# /.../
- # create lilo.conf file used for
- # installing the bootloader
+ # create lilo.conf file used for installing the bootloader
+ # this file is converted to yaboot.conf therefore lilo.conf
+ # has some restrictions
# ----
local mountPrefix=$1 # mount path of the image
local destsPrefix=$2 # base dir for the config files
@@ -7333,7 +7333,7 @@
fi
mdadm --zero-superblock $raidFirst
mdadm --zero-superblock $raidSecond
- mdadm --create --run /dev/md$mdcount \
+ mdadm --create --metadata=0.9 --run /dev/md$mdcount \
--level=$raidLevel --raid-disks=2 $raidFirst $raidSecond
if [ ! $? = 0 ];then
systemException \
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 2012-05-04 15:23:37.000000000 +0200
+++ new/kiwi/modules/KIWIManager.pm 2012-05-11 15:02:53.000000000 +0200
@@ -2372,7 +2372,7 @@
my $str = "not installed";
if (! $chroot) {
$kiwi -> info ("Checking for package: $pack");
- $data = qxx (" rpm -q \"$pack\" 2>&1 ");
+ $data = qxx ("rpm --root $root -q \"$pack\" 2>&1");
$code = $? >> 8;
} else {
$kiwi -> info ("Checking for package: $pack");
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kiwi/system/boot/armv7l/oemboot/suse-Factory/config.xml
new/kiwi/system/boot/armv7l/oemboot/suse-Factory/config.xml
--- old/kiwi/system/boot/armv7l/oemboot/suse-Factory/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/armv7l/oemboot/suse-Factory/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -152,7 +152,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="db"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/kiwi/system/boot/armv7l/vmxboot/suse-Factory/config.xml
new/kiwi/system/boot/armv7l/vmxboot/suse-Factory/config.xml
--- old/kiwi/system/boot/armv7l/vmxboot/suse-Factory/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/armv7l/vmxboot/suse-Factory/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -125,7 +125,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="cyrus-sasl"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-preinit
new/kiwi/system/boot/ix86/netboot/suse-preinit
--- old/kiwi/system/boot/ix86/netboot/suse-preinit 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/ix86/netboot/suse-preinit 2012-05-11
15:02:53.000000000 +0200
@@ -74,7 +74,7 @@
#======================================
# 7) Install boot loader on diskful
#--------------------------------------
-if [ "$bootLoaderOK" = 1 ];then
+if [ "$bootLoaderOK" = 1 ] && [ -z "$DO_NOT_INSTALL_BOOTLOADER" ]; then
installBootLoader
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml
new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/ppc/netboot/suse-SLES11/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -222,7 +222,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="db"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-preinit
new/kiwi/system/boot/ppc/netboot/suse-preinit
--- old/kiwi/system/boot/ppc/netboot/suse-preinit 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/ppc/netboot/suse-preinit 2012-05-11
15:02:53.000000000 +0200
@@ -74,7 +74,7 @@
#======================================
# 7) Install boot loader on diskful
#--------------------------------------
-if [ "$bootLoaderOK" = 1 ];then
+if [ "$bootLoaderOK" = 1 ] && [ -z "$DO_NOT_INSTALL_BOOTLOADER" ]; then
installBootLoader
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml
new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -146,7 +146,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="db"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml
new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/ppc/vmxboot/suse-SLES11/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -105,7 +105,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="cyrus-sasl"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml
new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/s390/netboot/suse-SLES11/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -114,7 +114,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="db"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-preinit
new/kiwi/system/boot/s390/netboot/suse-preinit
--- old/kiwi/system/boot/s390/netboot/suse-preinit 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/s390/netboot/suse-preinit 2012-05-11
15:02:53.000000000 +0200
@@ -80,7 +80,7 @@
#======================================
# 8) Install boot loader on diskful
#--------------------------------------
-if [ "$bootLoaderOK" = 1 ];then
+if [ "$bootLoaderOK" = 1 ] && [ -z "$DO_NOT_INSTALL_BOOTLOADER" ]; then
installBootLoader
fi
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml
new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -108,7 +108,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="db"/>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml
new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml
--- old/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2012-04-20
13:43:32.000000000 +0200
+++ new/kiwi/system/boot/s390/vmxboot/suse-SLES11/config.xml 2012-05-11
15:02:53.000000000 +0200
@@ -95,7 +95,6 @@
<package name="PolicyKit"/>
<package name="audit-libs"/>
<package name="blocxx"/>
- <package name="cpio"/>
<package name="cracklib-dict-full"/>
<package name="cracklib-dict-small"/>
<package name="cyrus-sasl"/>
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
