Hello community, here is the log from the commit of package kiwi for openSUSE:Factory checked in at Mon Jul 11 09:32:43 CEST 2011.
-------- --- kiwi/kiwi.changes 2011-07-01 16:24:30.000000000 +0200 +++ /mounts/work_src_done/STABLE/kiwi/kiwi.changes 2011-07-08 15:41:02.000000000 +0200 @@ -1,0 +2,33 @@ +Fri Jul 8 15:34:36 CEST 2011 - [email protected] + +- v4.92.2 released + +------------------------------------------------------------------- +Wed Jul 6 12:50:13 CEST 2011 - [email protected] + +- activate NFS locking for nfsroot systems. This means the + mount call doesn't use -o nolock anymore + +------------------------------------------------------------------- +Wed Jul 6 10:36:13 CEST 2011 - [email protected] + +- make sure rpc_pipefs is mounted if /var/lib/nfs/rpc_pipefs exists +- force NFS version 3 for NFSROOT setup. In that case v4 features + are not required + +------------------------------------------------------------------- +Tue Jul 5 12:55:36 CEST 2011 - [email protected] + +- added check if reading the md5 file was successful (bnc #703829) + +------------------------------------------------------------------- +Tue Jul 5 12:29:21 CEST 2011 - [email protected] + +- don't remove /etc/netconfig for nfsroot setup (bnc #672172) + +------------------------------------------------------------------- +Tue Jul 5 11:15:57 CEST 2011 - [email protected] + +- changed order of resize/check operation to check/resize + +------------------------------------------------------------------- calling whatdependson for head-i586 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kiwi.spec ++++++ --- /var/tmp/diff_new_pack.073Wik/_old 2011-07-11 09:27:44.000000000 +0200 +++ /var/tmp/diff_new_pack.073Wik/_new 2011-07-11 09:27:44.000000000 +0200 @@ -69,7 +69,7 @@ %endif %endif Summary: OpenSuSE - KIWI Image System -Version: 4.92.1 +Version: 4.92.2 Release: 1 Group: System/Management License: GPLv2 ++++++ kiwi-docu.tar.bz2 ++++++ kiwi/kiwi-docu.tar.bz2 /mounts/work_src_done/STABLE/kiwi/kiwi-docu.tar.bz2 differ: char 11, line 1 ++++++ kiwi.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/.revision new/kiwi/.revision --- old/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200 +++ new/kiwi/.revision 2011-06-12 21:49:13.000000000 +0200 @@ -1 +1 @@ -56be332f6f3e2031fac024e28e59b120096f2f36 +ee597b3cb48ce426edff219edf7d46e6dec145f2 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-07-01 16:20:06.000000000 +0200 +++ new/kiwi/modules/KIWIConfig.sh 2011-07-08 15:37:36.000000000 +0200 @@ -971,7 +971,7 @@ true touch sleep sh pidof sed rmdir rm pwd ps mv mkdir kill hostname gzip grep false df cp cat bash basename arch sort ls uniq lsmod usleep parted mke2fs pvcreate vgcreate lvm resize2fs ln hdparm - dmesg splash fbmngplay portmap start-statd sm-notify + dmesg splash fbmngplay portmap start-statd sm-notify rpcbind rpc.statd rpc.idmapd nbd-client mount.nfs mount.nfs4 eject blockdev posbios ping killall killall5 udevcontrol udevd udevsettle udevtrigger mknod stat path_id hwup scsi_id scsi_tur @@ -1012,6 +1012,7 @@ /etc/protocols /etc/services /etc/termcap /etc/aliases /etc/bash.bashrc /etc/filesystems /etc/ld.so.conf /etc/magic /etc/group /etc/passwd /etc/nsswitch.conf /etc/scsi_id.config + /etc/netconfig " for i in $files;do if [ -e $i ];then 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-07-01 16:20:06.000000000 +0200 +++ new/kiwi/modules/KIWIGlobals.pm 2011-07-08 15:37:36.000000000 +0200 @@ -40,7 +40,7 @@ # Globals (generic) #------------------------------------------ my %data; - $data{Version} = "4.92.1"; + $data{Version} = "4.92.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-07-01 16:20:06.000000000 +0200 +++ new/kiwi/modules/KIWILinuxRC.sh 2011-07-08 15:37:36.000000000 +0200 @@ -432,6 +432,42 @@ test -L $prefix/stderr || ln -s fd/2 $prefix/stderr } #====================================== +# mount_rpc_pipefs +#-------------------------------------- +function mount_rpc_pipefs { + # See if the file system is there yet + case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs` in + *67596969*) + return 0;; + esac + mount -t rpc_pipefs rpc_pipefs /var/lib/nfs/rpc_pipefs +} +#====================================== +# umount_rpc_pipefs +#-------------------------------------- +function umount_rpc_pipefs { + # See if the file system is there + case `stat -c "%t" -f /var/lib/nfs/rpc_pipefs` in + *67596969*) + umount /var/lib/nfs/rpc_pipefs + esac +} +#====================================== +# setupNFSServices +#-------------------------------------- +function setupNFSServices { + mount_rpc_pipefs + if [ -x /sbin/rpcbind ];then + startproc /sbin/rpcbind + fi + if [ -x /usr/sbin/rpc.statd ];then + startproc /usr/sbin/rpc.statd --no-notify + fi + if [ -x /usr/sbin/rpc.idmapd ];then + startproc /usr/sbin/rpc.idmapd + fi +} +#====================================== # mountSystemFilesystems #-------------------------------------- function mountSystemFilesystems { @@ -442,6 +478,7 @@ # umountSystemFilesystems #-------------------------------------- function umountSystemFilesystems { + umount_rpc_pipefs umount /dev/pts &>/dev/null umount /sys &>/dev/null umount /proc &>/dev/null @@ -4529,7 +4566,7 @@ # on it if not remote. Mount the filesystem # ---- if [ "$roDevice" = "nfs" ];then - rwDevice="-o nolock,rw $nfsRootServer:$rwDevice" + rwDevice="-o vers=3,rw $nfsRootServer:$rwDevice" fi if [ ! "$roDevice" = "nfs" ] && ! setupReadWrite; then return 1 @@ -4684,7 +4721,7 @@ #====================================== # wait for storage device to appear #-------------------------------------- - if ! echo $mountDevice | grep -qE "loop|nolock";then + if ! echo $mountDevice | grep -qE "loop|vers=";then waitForStorageDevice $mountDevice fi #====================================== @@ -5546,8 +5583,8 @@ exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ "/preinit ; . /include ; cleanImage ; exec /sbin/halt -fihp" fi - # FIXME: clicfs doesn't like run-init - if [ ! "$haveClicFS" = "yes" ];then + # FIXME: clicfs / nfsroot doesn't like run-init + if [ ! "$haveClicFS" = "yes" ] && [ -z "$NFSROOT" ];then exec /lib/mkinitrd/bin/run-init -c /dev/console /mnt /bin/bash -c \ "/preinit ; . /include ; cleanImage ; exec /sbin/init $option" else @@ -6548,6 +6585,9 @@ fi if [ -z "$callme" ];then if [ $ramdisk -eq 0 ];then + $check + fi + if [ $ramdisk -eq 0 ];then eval $resize_lucks eval $resize_fs else @@ -6559,9 +6599,6 @@ "Failed to resize/check filesystem" \ "reboot" fi - if [ $ramdisk -eq 0 ];then - $check - fi INITRD_MODULES="$INITRD_MODULES $FSTYPE" else echo $resize_fs diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ix86/netboot/suse-linuxrc new/kiwi/system/boot/ix86/netboot/suse-linuxrc --- old/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-05-06 15:22:52.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-linuxrc 2011-07-08 15:37:36.000000000 +0200 @@ -570,10 +570,11 @@ if [ -z "$nfsRootServer" ];then nfsRootServer=$SERVER fi + setupNFSServices Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..." - imageRootDevice="-o nolock,rw $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice" if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then - imageRootDevice="-o nolock,ro $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice" fi if [ ! -z "$UNIONFS_CONFIG" ];then unionFST=`echo $UNIONFS_CONFIG | cut -d , -f 3` @@ -770,6 +771,12 @@ Echo "Configuration files reload forced via RELOAD_CONFIG..." fi #======================================= + # 17.0) Import NFS root files + #--------------------------------------- + if [ ! -z "$NFSROOT" ];then + test -f /etc/resolv.conf && cp /etc/resolv.conf /mnt/etc + fi + #======================================= # 17.1) Import files from backup #--------------------------------------- BCFG_BASE='etc/KIWI' 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 2011-04-13 18:18:10.000000000 +0200 +++ new/kiwi/system/boot/ix86/netboot/suse-preinit 2011-07-08 15:37:36.000000000 +0200 @@ -120,33 +120,19 @@ fi #====================================== -# 11) setup network for nfs boot -#-------------------------------------- -if [ ! -z "$NFSROOT" ];then - mount -t proc proc /proc - mount -t sysfs sysfs /sys - mount -t devpts devpts /dev/pts - if [ -x /etc/init.d/portmap ];then - /etc/init.d/portmap start - elif [ -x /etc/init.d/rpcbind ];then - /etc/init.d/rpcbind start - fi -fi - -#====================================== -# 12) setup console +# 11) setup console #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then setupConsole fi #====================================== -# 13) setup console +# 12) kernelCheck #-------------------------------------- kernelCheck #====================================== -# 14) kill udev +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems 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-07-01 16:20:06.000000000 +0200 +++ new/kiwi/system/boot/ix86/oemboot/suse-dump 2011-07-08 15:37:36.000000000 +0200 @@ -603,7 +603,11 @@ Source=$(echo $i | cut -f1 -d:) Target=$(echo $i | cut -f2 -d:) if [ -z "$OEM_PARTITION_INSTALL" ];then - read sum1 blocks blocksize zblocks zblocksize < $imageMD5 + if ! read sum1 blocks blocksize zblocks zblocksize < $imageMD5;then + systemException \ + "Reading of $imageMD5 failed" \ + "reboot" + fi else blocksize=4096 partKB=$(partitionSize $Source) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kiwi/system/boot/ppc/netboot/suse-linuxrc new/kiwi/system/boot/ppc/netboot/suse-linuxrc --- old/kiwi/system/boot/ppc/netboot/suse-linuxrc 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-linuxrc 2011-07-08 15:37:36.000000000 +0200 @@ -570,10 +570,11 @@ if [ -z "$nfsRootServer" ];then nfsRootServer=$SERVER fi + setupNFSServices Echo "Mounting NFS root system: $nfsRootServer:$nfsRootDevice..." - imageRootDevice="-o nolock,rw $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,rw $nfsRootServer:$nfsRootDevice" if [ ! -z "$COMBINED_IMAGE" ] || [ ! -z "$UNIONFS_CONFIG" ];then - imageRootDevice="-o nolock,ro $nfsRootServer:$nfsRootDevice" + imageRootDevice="-o vers=3,ro $nfsRootServer:$nfsRootDevice" fi if [ ! -z "$UNIONFS_CONFIG" ];then unionFST=`echo $UNIONFS_CONFIG | cut -d , -f 3` @@ -770,6 +771,12 @@ Echo "Configuration files reload forced via RELOAD_CONFIG..." fi #======================================= + # 17.0) Import NFS root files + #--------------------------------------- + if [ ! -z "$NFSROOT" ];then + test -f /etc/resolv.conf && cp /etc/resolv.conf /mnt/etc + fi + #======================================= # 17.1) Import files from backup #--------------------------------------- BCFG_BASE='etc/KIWI' 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 2011-06-07 09:45:48.000000000 +0200 +++ new/kiwi/system/boot/ppc/netboot/suse-preinit 2011-07-08 15:37:36.000000000 +0200 @@ -120,33 +120,19 @@ fi #====================================== -# 11) setup network for nfs boot -#-------------------------------------- -if [ ! -z "$NFSROOT" ];then - mount -t proc proc /proc - mount -t sysfs sysfs /sys - mount -t devpts devpts /dev/pts - if [ -x /etc/init.d/portmap ];then - /etc/init.d/portmap start - elif [ -x /etc/init.d/rpcbind ];then - /etc/init.d/rpcbind start - fi -fi - -#====================================== -# 12) setup console +# 11) setup console #-------------------------------------- if [ "$systemIntegrity" = "clean" ];then setupConsole fi #====================================== -# 13) setup console +# 12) kernelCheck #-------------------------------------- kernelCheck #====================================== -# 14) kill udev +# 13) kill udev #-------------------------------------- udevSystemStop umountSystemFilesystems ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
