Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Sep 26 10:07:08 CEST 2011. -------- --- kiwi/kiwi.changes 2011-09-16 14:14:52.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-09-23 14:36:04.000000000 +0200 @@ -1,0 +2,109 @@ +Fri Sep 23 14:03:51 CEST 2011 - ms@suse.de + +- v4.97.2 released + +------------------------------------------------------------------- +Fri Sep 23 11:50:07 CEST 2011 - ms@suse.de + +- fixed RHEL authentication setup + +------------------------------------------------------------------- +Fri Sep 23 10:05:48 CEST 2011 - ms@suse.de + +- fixed typo in perl to bash list dereferencing + +------------------------------------------------------------------- +Thu Sep 22 18:27:21 CEST 2011 - ms@suse.de + +- use generic vgchange -an in cleanLoop to make sure the loop maps + can be cleaned up even if we can't read the name of the volume + group from the image + +------------------------------------------------------------------- +Thu Sep 22 18:25:07 CEST 2011 - ms@suse.de + +- fixed sysconfig template check to work on RHEL too +- fixed init call for RHEL, does not work with run-init program + +------------------------------------------------------------------- +Thu Sep 22 18:24:38 CEST 2011 - ms@suse.de + +- added kernel to be installed in rhel-05.4-JeOS template + +------------------------------------------------------------------- +Thu Sep 22 18:24:12 CEST 2011 - ms@suse.de + +- fixed use of uninitialized value + +------------------------------------------------------------------- +Thu Sep 22 16:11:28 CEST 2011 - ms@suse.de + +- make sure mpath_wait program exists in initrd for RHEL + +------------------------------------------------------------------- +Thu Sep 22 15:50:41 CEST 2011 - ms@suse.de + +- fixed missing done flag for info message + +------------------------------------------------------------------- +Thu Sep 22 11:25:03 CEST 2011 - ms@suse.de + +- make sure loop module is loaded + +------------------------------------------------------------------- +Thu Sep 22 10:17:48 CEST 2011 - ms@suse.de + +- applied following changes to the ppc boot code +* fixed download of md5 file in oem pxe install mode +* make sure iputils is there in oemboot for pxe based installation +* allow installation via the kiwi install image into a ramdisk. + +------------------------------------------------------------------- +Thu Sep 22 10:07:43 CEST 2011 - ms@suse.de + +- fixed s390 netboot code: +* make sure there is also a lowercase version of cmdline params +* make sure cleanPartitionTable is called before setup +* make sure setupNetworkStatic also brings up the network + +------------------------------------------------------------------- +Thu Sep 22 10:00:29 CEST 2011 - ms@suse.de + +- applied following changes to the s390 boot code +* fixed download of md5 file in oem pxe install mode +* make sure iputils is there in oemboot for pxe based installation +* allow installation via the kiwi install image into a ramdisk. + +------------------------------------------------------------------- +Wed Sep 21 15:00:06 CEST 2011 - ms@suse.de + +- fixed download of md5 file in oem pxe install mode + +------------------------------------------------------------------- +Wed Sep 21 11:38:25 CEST 2011 - ms@suse.de + +- make sure iputils is there in oemboot for pxe based installation + +------------------------------------------------------------------- +Tue Sep 20 17:25:15 CEST 2011 - ms@suse.de + +- use ext3 filesystem for the boot partition + +------------------------------------------------------------------- +Tue Sep 20 13:51:21 CEST 2011 - ms@suse.de + +- make sure system filesystems like proc and friends + are umounted in rhel-preinit + +------------------------------------------------------------------- +Mon Sep 19 12:38:13 CEST 2011 - ms@suse.de + +- allow long names in install iso images (-joliet-long) + This is related to (bnc #716149) + +------------------------------------------------------------------- +Mon Sep 19 11:42:22 CEST 2011 - adrian@suse.de + + [product] unpack themes in defined order + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.WmOx4R/_old 2011-09-26 10:06:59.000000000 +0200 +++ /var/tmp/diff_new_pack.WmOx4R/_new 2011-09-26 10:06:59.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.97.1 +Version: 4.97.2 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-09-16 14:03:53.000000000 +0200 +++ new/kiwi/.revision 2011-09-16 14:03:53.000000000 +0200 @@ -1 +1 @@ -2f9955419b6b08fa443dfa7925b43278239ec0b5 +71e47f2c2e9184d28777d6a72ee2852fd3b6b509 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 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/modules/KIWIBoot.pm 2011-09-23 14:28:22.000000000 +0200 @@ -950,7 +950,8 @@ if ($bootloader eq "grub") { # let isolinux run grub second stage... $base = "-R -J -f -b boot/grub/stage2 -no-emul-boot $volid"; - $opts = "-boot-load-size 4 -boot-info-table -udf -allow-limited-size"; + $opts = "-boot-load-size 4 -boot-info-table -udf -allow-limited-size "; + $opts.= "-pad -joliet-long"; } elsif ($bootloader =~ /(sys|ext)linux/) { # turn sys/extlinux configuation into a isolinux configuration... my $cfg_ext = "$tmpdir/boot/syslinux/syslinux.cfg"; @@ -963,10 +964,11 @@ qxx ("mv $tmpdir/boot/linux $tmpdir/boot/syslinux"); qxx ("mv $tmpdir/boot/syslinux $tmpdir/boot/loader 2>&1"); $base = "-R -J -f -b boot/loader/isolinux.bin -no-emul-boot $volid"; - $opts = "-boot-load-size 4 -boot-info-table -udf -allow-limited-size"; + $opts = "-boot-load-size 4 -boot-info-table -udf -allow-limited-size "; + $opts.= "-pad -joliet-long"; } elsif ($bootloader eq "lilo") { $base = "-r"; - $opts = "-U -chrp-boot"; + $opts = "-U -chrp-boot -pad -joliet-long"; } else { # don't know how to use this bootloader together with isolinux $kiwi -> failed (); @@ -2290,7 +2292,7 @@ ($lvm) || ($bootloader eq "extlinux") ) { $root = $deviceMap{dmapper}; - $kiwi -> info ("Creating ext2 boot filesystem"); + $kiwi -> info ("Creating ext3 boot filesystem"); if (($haveluks) || ($needBootP)) { if (($syszip) || ($haveSplit) || ($dmapper)) { $root = $deviceMap{3}; @@ -2307,8 +2309,8 @@ my %FSopts = $main::global -> checkFSOptions( @{$cmdL -> getFilesystemOptions()} ); - my $fsopts = $FSopts{ext2}; - my $fstool = "mkfs.ext2"; + my $fsopts = $FSopts{ext3}; + my $fstool = "mkfs.ext3"; $status = qxx ("$fstool $fsopts $root 2>&1"); $result = $? >> 8; if ($result != 0) { @@ -2691,7 +2693,7 @@ $main::global -> umount(); if ((defined $loop) && ($loop =~ /loop/)) { if (defined $lvm) { - qxx ("vgchange -an $this->{lvmgroup} 2>&1"); + qxx ("vgchange -an 2>&1"); } $this -> cleanLoopMaps(); qxx ("/sbin/losetup -d $loop 2>&1"); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWICollect.pm new/kiwi/modules/KIWICollect.pm --- old/kiwi/modules/KIWICollect.pm 2011-09-08 15:58:26.000000000 +0200 +++ new/kiwi/modules/KIWICollect.pm 2011-09-23 14:28:22.000000000 +0200 @@ -1166,7 +1166,7 @@ my @themes = readdir(TD); closedir(TD); my $found=0; - foreach my $d(@themes) { + foreach my $d(sort(@themes)) { if($d =~ m{$thema}i) { $this->logMsg("I", "Using thema $d"); $thema = $d; # changed after I saw that yast2-slideshow has a thema "SuSE-SLES" (matches "SuSE", but not in line 831) @@ -1175,7 +1175,7 @@ } } if($found==0) { - foreach my $d(@themes) { + foreach my $d(sort(@themes)) { if($d =~ m{linux|sles|suse}i) { $this->logMsg("W", "Using fallback theme $d instead of $thema"); $thema = $d; @@ -1185,8 +1185,7 @@ } ## $thema is now the thema to use: for my $i(1..3) { - ## @lars: wtf soll denn sein, wenn es CD2 gibt, aber die Konfig der Medien kein Medium "2" hat? - ## Laut Rudi (tm) ist das zulässig! + # drop not used configs when media does not exist if(-d "$tmp/SuSE/$thema/CD$i" and $this->{m_basesubdir}->{$i} and -d "$tmp/SuSE/$thema/CD$i") { qx(cp -a $tmp/SuSE/$thema/CD$i/* $this->{m_basesubdir}->{$i}); } 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 2011-09-16 14:03:53.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2011-09-23 14:28:22.000000000 +0200 @@ -985,7 +985,7 @@ setterm kpartx vgcfgbackup vgcfgrestore lsdasd dasd_configure qeth_configure fdasd mkdosfs egrep mkfs.xfs mdadm yes fdisk startproc zfcp_host_configure zfcp_disk_configure vgrename - kpartx_id mpath_id dmraid dmevent_tool which + kpartx_id mpath_id dmraid dmevent_tool which mpath_wait " tools="$tools $@" for path in /sbin /usr/sbin /usr/bin /bin;do 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 2011-09-16 14:03:53.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-09-23 14:28:22.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.97.1"; + $data{Version} = "4.97.2"; $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 2011-09-16 14:03:53.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-09-23 14:28:22.000000000 +0200 @@ -2503,6 +2503,7 @@ fi local sysimg_ktempl=$srcprefix/var/adm/fillup-templates/sysconfig.kernel local sysimg_ktempl2=$sysimg_ktempl-mkinitrd + local sysimg_ktempl3=/etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release local sysimg_syskernel=$srcprefix/etc/sysconfig/kernel local syskernel=$destprefix/etc/sysconfig/kernel local newstyle_mkinitrd=$srcprefix/lib/mkinitrd/scripts/boot-usb.sh @@ -2512,7 +2513,11 @@ #====================================== # check for sysconfig template file #-------------------------------------- - if [ ! -f $sysimg_ktempl ] && [ ! -f $sysimg_ktempl2 ];then + if \ + [ ! -f $sysimg_ktempl ] && \ + [ ! -f $sysimg_ktempl2 ] && \ + [ ! -f $sysimg_ktempl3 ] + then systemException \ "Can't find kernel sysconfig template in system image !" \ "reboot" @@ -2924,7 +2929,7 @@ #====================================== # Manual loading of modules #-------------------------------------- - for i in rd brd edd dm-mod xennet xenblk virtio_blk;do + for i in rd brd edd dm-mod xennet xenblk virtio_blk loop;do modprobe $i &>/dev/null done udevPending @@ -3811,7 +3816,7 @@ echo "REMOTE_IPADDR='$pointopoint'" >> $netFile fi fi - setupDefaultGateway + setupDefaultGateway $up setupDNS } #====================================== @@ -5773,8 +5778,11 @@ exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ "/preinit ; . /include ; cleanImage ; exec /sbin/halt -fihp" fi - # FIXME: clicfs / nfsroot doesn't like run-init - if [ ! "$haveClicFS" = "yes" ] && [ -z "$NFSROOT" ];then + # FIXME: clicfs / nfsroot / RHEL doesn't like run-init + if \ + [ ! "$haveClicFS" = "yes" ] && [ -z "$NFSROOT" ] && \ + [ ! -e /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ] + then exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ "/preinit ; . /include ; cleanImage ; exec $init $option" else 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 2011-08-30 16:22:03.000000000 +0200 +++ new/kiwi/modules/KIWIManager.pm 2011-09-23 14:28:22.000000000 +0200 @@ -1284,7 +1284,7 @@ print $fd "while kill -0 \$SPID &>/dev/null; do sleep 1;done\n"; print $fd "echo 1 > $screenCall.exit; exit 1; }\n"; print $fd "trap clean INT TERM\n"; - print $fd "for i in @@addonPackages;do\n"; + print $fd "for i in @addonPackages;do\n"; print $fd "\tif ! @kchroot @yum list all \$i;then\n"; print $fd "\t\tECODE=1\n"; print $fd "\t\techo \$ECODE > $screenCall.exit\n"; @@ -1652,7 +1652,7 @@ print $fd "SPID=\$!;wait \$SPID\n"; } if (@addonPackages) { - print $fd "for i in @@addonPackages;do\n"; + print $fd "for i in @addonPackages;do\n"; print $fd "\tif ! @kchroot @yum list all \$i;then\n"; print $fd "\t\tECODE=1\n"; print $fd "\t\techo \$ECODE > $screenCall.exit\n"; @@ -2348,6 +2348,7 @@ if ($manager eq "yum") { $kiwi -> info ("Removing yum repo(s) in: $dataDir"); qxx ("rm -f $dataDir/*.repo 2>&1"); + $kiwi -> done(); } return $this; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/modules/KIWIXMLValidator.pm new/kiwi/modules/KIWIXMLValidator.pm --- old/kiwi/modules/KIWIXMLValidator.pm 2011-07-29 11:59:53.000000000 +0200 +++ new/kiwi/modules/KIWIXMLValidator.pm 2011-09-23 14:28:22.000000000 +0200 @@ -61,7 +61,10 @@ #========================================== # Check pre-conditions #------------------------------------------ - if (! -f $configPath) { + if ((! $configPath) || (! -f $configPath)) { + if (! $configPath) { + $configPath = "undefined"; + } $kiwi -> error ("Could not find specified configuration: $configPath"); $kiwi -> failed (); return undef; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/isoboot/rhel-preinit new/kiwi/system/boot/ix86/isoboot/rhel-preinit --- old/kiwi/system/boot/ix86/isoboot/rhel-preinit 2010-03-18 11:42:52.000000000 +0100 +++ new/kiwi/system/boot/ix86/isoboot/rhel-preinit 2011-09-23 14:28:22.000000000 +0200 @@ -24,3 +24,14 @@ #-------------------------------------- Echo "Calling pre-init stage in system image" errorLogStart + +#====================================== +# 2) update auth config +#-------------------------------------- +authconfig --updateall + +#====================================== +# 3) clean mount +#-------------------------------------- +umountSystemFilesystems + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-11.3/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -147,6 +147,7 @@ <package name="syslinux"/> <package name="dosfstools"/> <package name="xfsprogs"/> + <package name="iputils"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-11.4/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -151,6 +151,7 @@ <package name="dosfstools"/> <package name="xfsprogs"/> <package name="kernel-firmware"/> + <package name="iputils"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-12.1/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -148,6 +148,7 @@ <package name="dosfstools"/> <package name="xfsprogs"/> <package name="kernel-firmware"/> + <package name="iputils"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED10/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -112,6 +112,7 @@ <package name="glibc"/> <package name="glibc-locale"/> <package name="openssl"/> + <package name="iputils"/> </packages> <packages type="delete"> <package name="cracklib-dict-small"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLED11/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -133,6 +133,7 @@ <package name="gettext-runtime"/> <package name="syslinux"/> <package name="dosfstools"/> + <package name="iputils"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES10/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -114,6 +114,7 @@ <package name="glibc"/> <package name="glibc-locale"/> <package name="openssl"/> + <package name="iputils"/> </packages> <packages type="delete"> <package name="cracklib-dict-small"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml --- old/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-SLES11/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -137,6 +137,7 @@ <package name="kpartx"/> <package name="syslinux"/> <package name="dosfstools"/> + <package name="iputils"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/oemboot/suse-dump new/kiwi/system/boot/ix86/oemboot/suse-dump --- old/kiwi/system/boot/ix86/oemboot/suse-dump 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2011-09-23 14:28:23.000000000 +0200 @@ -575,13 +575,13 @@ #-------------------------------------- if [ ! -z "$pxe" ];then multicast="disable" - fetchFile $imageMD5 /image.md5 uncompressed $imageServer + fetchFile $imageMD5 /etc/image.md5 uncompressed $imageServer if test $loadCode != 0 || ! loadOK "$loadStatus";then systemException \ "Download of $imageMD5 failed: $loadStatus" \ "reboot" fi - imageMD5=/image.md5 + imageMD5=/etc/image.md5 fi fi #====================================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/vmxboot/rhel-preinit new/kiwi/system/boot/ix86/vmxboot/rhel-preinit --- old/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2011-09-07 11:42:59.000000000 +0200 +++ new/kiwi/system/boot/ix86/vmxboot/rhel-preinit 2011-09-23 14:28:23.000000000 +0200 @@ -74,7 +74,12 @@ setupConsole #====================================== -# 8) kill udev +# 8) update auth config +#-------------------------------------- +authconfig --updateall + +#====================================== +# 9) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems 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 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-SLES11/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -25,6 +25,7 @@ <drivers type="drivers"> <file name="drivers/usb/*"/> <file name="drivers/block/loop.ko"/> + <file name="drivers/block/brd.ko"/> <file name="net/packet/*"/> <file name="lib/zlib_deflate/zlib_deflate.ko"/> <file name="lib/libcrc32c.ko"/> @@ -128,6 +129,7 @@ <package name="gettext-runtime"/> <package name="kexec-tools"/> <package name="kpartx"/> + <package name="iputils"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/oemboot/suse-dump new/kiwi/system/boot/ppc/oemboot/suse-dump --- old/kiwi/system/boot/ppc/oemboot/suse-dump 2011-09-07 11:42:59.000000000 +0200 +++ new/kiwi/system/boot/ppc/oemboot/suse-dump 2011-09-23 14:28:23.000000000 +0200 @@ -185,6 +185,9 @@ cut -f1 -d"("` fi export deviceDisks=`echo $deviceDisks` + if [ ! -z "$ramdisk" ];then + deviceDisks="$deviceDisks /dev/ram1" + fi if [ -z "$deviceDisks" ];then systemException \ "No device(s) for installation found... abort" \ @@ -572,13 +575,13 @@ #-------------------------------------- if [ ! -z "$pxe" ];then multicast="disable" - fetchFile $imageMD5 /image.md5 uncompressed $imageServer + fetchFile $imageMD5 /etc/image.md5 uncompressed $imageServer if test $loadCode != 0 || ! loadOK "$loadStatus";then systemException \ "Download of $imageMD5 failed: $loadStatus" \ "reboot" fi - imageMD5=/image.md5 + imageMD5=/etc/image.md5 fi fi #====================================== @@ -777,6 +780,9 @@ #-------------------------------------- if [ -z "$OEM_PARTITION_INSTALL" ];then blockdev --rereadpt $imageDevice + if echo $imageDevice | grep -q "^\/dev\/ram";then + kpartx -a $imageDevice + fi deviceTest=$(ddn $imageDevice 1) if ! waitForStorageDevice $deviceTest;then systemException \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/netboot/suse-linuxrc new/kiwi/system/boot/s390/netboot/suse-linuxrc --- old/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-08-26 16:01:55.000000000 +0200 +++ new/kiwi/system/boot/s390/netboot/suse-linuxrc 2011-09-23 14:28:23.000000000 +0200 @@ -91,7 +91,7 @@ #====================================== # 4) Include proc/cmdline information #-------------------------------------- -includeKernelParameters +includeKernelParametersLowerCase if [ ! -z $IMAGE ];then # /.../ # if the image information is already in place at this stage @@ -122,7 +122,7 @@ #-------------------------------------- runHook prenetwork if [ $LOCAL_BOOT = "no" ];then - setupNetworkStatic + setupNetworkStatic 1 fi runHook postnetwork @@ -347,8 +347,8 @@ #====================================== # Standard table #-------------------------------------- - createPartitionerInput $(pxePartitionInput) cleanPartitionTable + createPartitionerInput $(pxePartitionInput) callPartitioner $input else #====================================== @@ -386,8 +386,8 @@ for raid_dev in $raidDiskFirst $raidDiskSecond;do imageDiskDevice=$raid_dev rm -f $input - createPartitionerInput $(pxeRaidPartitionInput) cleanPartitionTable + createPartitionerInput $(pxeRaidPartitionInput) callPartitioner $input done imageDiskDevice=$DISK 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 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-SLES11/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -21,6 +21,7 @@ <file name="net/packet/*"/> <file name="drivers/s390/*"/> <file name="drivers/virtio/*"/> + <file name="drivers/block/brd.ko"/> <file name="drivers/net/*"/> <file name="drivers/md/*"/> <file name="drivers/block/*"/> @@ -90,6 +91,7 @@ <package name="gettext-runtime"/> <package name="kexec-tools"/> <package name="kpartx"/> + <package name="iputils"/> </packages> <packages type="bootstrap"> <package name="filesystem"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/s390/oemboot/suse-dump new/kiwi/system/boot/s390/oemboot/suse-dump --- old/kiwi/system/boot/s390/oemboot/suse-dump 2011-09-07 11:42:59.000000000 +0200 +++ new/kiwi/system/boot/s390/oemboot/suse-dump 2011-09-23 14:28:23.000000000 +0200 @@ -185,6 +185,9 @@ cut -f1 -d"("` fi export deviceDisks=`echo $deviceDisks` + if [ ! -z "$ramdisk" ];then + deviceDisks="$deviceDisks /dev/ram1" + fi if [ -z "$deviceDisks" ];then systemException \ "No device(s) for installation found... abort" \ @@ -572,13 +575,13 @@ #-------------------------------------- if [ ! -z "$pxe" ];then multicast="disable" - fetchFile $imageMD5 /image.md5 uncompressed $imageServer + fetchFile $imageMD5 /etc/image.md5 uncompressed $imageServer if test $loadCode != 0 || ! loadOK "$loadStatus";then systemException \ "Download of $imageMD5 failed: $loadStatus" \ "reboot" fi - imageMD5=/image.md5 + imageMD5=/etc/image.md5 fi fi #====================================== @@ -777,6 +780,9 @@ #-------------------------------------- if [ -z "$OEM_PARTITION_INSTALL" ];then blockdev --rereadpt $imageDevice + if echo $imageDevice | grep -q "^\/dev\/ram";then + kpartx -a $imageDevice + fi deviceTest=$(ddn $imageDevice 1) if ! waitForStorageDevice $deviceTest;then systemException \ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-05.4-JeOS/config.xml new/kiwi/template/ix86/rhel-05.4-JeOS/config.xml --- old/kiwi/template/ix86/rhel-05.4-JeOS/config.xml 2011-09-16 10:07:37.000000000 +0200 +++ new/kiwi/template/ix86/rhel-05.4-JeOS/config.xml 2011-09-23 14:28:23.000000000 +0200 @@ -47,6 +47,7 @@ <package name="dhclient"/> <package name="parted"/> <package name="lvm2"/> + <package name="kernel"/> <rhelGroup name="System Tools"/> <rhelGroup name="Text-based Internet"/> <package name="gfxboot-branding-upstream" bootinclude="true" bootdelete="true"/> diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/login.defs new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/login.defs --- old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/login.defs 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/login.defs 2011-09-23 14:28:23.000000000 +0200 @@ -0,0 +1,59 @@ +# *REQUIRED* +# Directory where mailboxes reside, _or_ name of file, relative to the +# home directory. If you _do_ define both, MAIL_DIR takes precedence. +# QMAIL_DIR is for Qmail +# +#QMAIL_DIR Maildir +MAIL_DIR /var/spool/mail +#MAIL_FILE .mail + +# Password aging controls: +# +# PASS_MAX_DAYS Maximum number of days a password may be used. +# PASS_MIN_DAYS Minimum number of days allowed between password changes. +# PASS_MIN_LEN Minimum acceptable password length. +# PASS_WARN_AGE Number of days warning given before a password expires. +# +PASS_MAX_DAYS 99999 +PASS_MIN_DAYS 0 +PASS_MIN_LEN 5 +PASS_WARN_AGE 7 + +# +# Min/max values for automatic uid selection in useradd +# +UID_MIN 500 +UID_MAX 60000 + +# +# Min/max values for automatic gid selection in groupadd +# +GID_MIN 500 +GID_MAX 60000 + +# +# If defined, this command is run when removing a user. +# It should remove any at/cron/print jobs etc. owned by +# the user to be removed (passed as the first argument). +# +#USERDEL_CMD /usr/sbin/userdel_local + +# +# If useradd should create home directories for users by default +# On RH systems, we do. This option is overridden with the -m flag on +# useradd command line. +# +CREATE_HOME yes + +# The permission mask is initialized to this value. If not specified, +# the permission mask will be initialized to 022. +UMASK 077 + +# This enables userdel to remove user groups if no members exist. +# +USERGROUPS_ENAB yes + +# Use MD5 or DES to encrypt password? Red Hat use MD5 by default. +MD5_CRYPT_ENAB yes + +ENCRYPT_METHOD MD5 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/selinux/config new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/selinux/config --- old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/selinux/config 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/selinux/config 2011-09-23 14:28:23.000000000 +0200 @@ -0,0 +1,16 @@ + +# This file controls the state of SELinux on the system. +# SELINUX= can take one of these three values: +# enforcing - SELinux security policy is enforced. +# permissive - SELinux prints warnings instead of enforcing. +# disabled - No SELinux policy is loaded. +SELINUX=permissive +# SELINUXTYPE= can take one of these two values: +# targeted - Only targeted network daemons are protected. +# strict - Full SELinux protection. +# mls - Multi Level Security protection. +SELINUXTYPE=targeted +# SETLOCALDEFS= Check local definition changes +SETLOCALDEFS=0 + + diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/authconfig new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/authconfig --- old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/authconfig 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/authconfig 2011-09-23 14:28:23.000000000 +0200 @@ -0,0 +1,19 @@ +USEWINBINDAUTH=no +USEHESIOD=no +USESYSNETAUTH=no +USEPAMACCESS=no +USEKERBEROS=no +FORCESMARTCARD=no +USESMBAUTH=no +USESMARTCARD=no +USELDAPAUTH=no +PASSWDALGORITHM=md5 +USEWINBIND=no +USESHADOW=yes +USEDB=no +USEPASSWDQC=no +USELOCAUTHORIZE=yes +USEMKHOMEDIR=no +USELDAP=no +USECRACKLIB=yes +USENIS=no diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/network new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/network --- old/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/network 1970-01-01 01:00:00.000000000 +0100 +++ new/kiwi/template/ix86/rhel-05.4-JeOS/root/etc/sysconfig/network 2011-09-23 14:28:23.000000000 +0200 @@ -0,0 +1,3 @@ +NETWORKING=yes +NETWORKING_IPV6=no +HOSTNAME=localhost.localdomain ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org