Hello community, here is the log from the commit of package mkinitrd checked in at Fri Sep 29 01:04:07 CEST 2006. -------- --- mkinitrd/mkinitrd.changes 2006-09-26 15:40:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd.changes 2006-09-28 14:34:25.000000000 +0200 @@ -1,0 +2,7 @@ +Thu Sep 28 13:38:03 CEST 2006 - hare@suse.de + +- Fix detection of LVM devices (208417) +- Do not include md modules if not required. +- Don't print annoying 'File descriptor XX left open' messages + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mkinitrd.spec ++++++ --- /var/tmp/diff_new_pack.NiWyLz/_old 2006-09-29 01:03:27.000000000 +0200 +++ /var/tmp/diff_new_pack.NiWyLz/_new 2006-09-29 01:03:27.000000000 +0200 @@ -18,7 +18,7 @@ # bootsplash required only if creating splash initrd's. Autoreqprov: on Version: 1.2 -Release: 125 +Release: 126 Summary: Creates an Initial RAM Disk Image for Preloading Modules BuildRoot: %{_tmppath}/%{name}-%{version}-build Source0: mkinitrd @@ -87,6 +87,10 @@ %doc %{_mandir}/man8/mkinitrd.8.gz %changelog -n mkinitrd +* Thu Sep 28 2006 - hare@suse.de +- Fix detection of LVM devices (208417) +- Do not include md modules if not required. +- Don't print annoying 'File descriptor XX left open' messages * Tue Sep 26 2006 - seife@suse.de - Update userspace suspend support. - Protect calls to hwinfo and kpartx (206423) ++++++ mkinitrd ++++++ --- mkinitrd/mkinitrd 2006-09-26 15:40:08.000000000 +0200 +++ /mounts/work_src_done/STABLE/mkinitrd/mkinitrd 2006-09-28 14:34:22.000000000 +0200 @@ -23,7 +23,7 @@ # This file is kept in the following CVS repository: # # $Source: /suse/yast2/cvsroot/mkinitrd/mkinitrd,v $ -# $Revision: 1.335 $ +# $Revision: 1.338 $ usage() { cat<<EOF @@ -3058,23 +3058,31 @@ major=$(devmajor $rootdevn) minor=$(devminor $rootdevn) # Check whether we are using EVMS - region=$(echo "q:r" | evms -s | grep -B 2 "Minor: $minor" | sed -n 's@Region Name: \(.\)@\1@p') - if [ "$region" ] ; then - volume=$(echo "q:v,r=$region" | evms -s | sed -n 's@Volume Name: \(.*\)@\1@p') - root_evms=1 - realrootdev=$volume + if [ -x /sbin/evms ] ; then + region=$(echo "q:r" | evms -s | grep -B 2 "Minor: $minor" | sed -n 's@Region Name: \(.\)@\1@p') + if [ "$region" ] ; then + volume=$(echo "q:v,r=$region" | evms -s | sed -n 's@Volume Name: \(.*\)@\1@p') + if [ -f "$volume" ] ; then + root_evms=1 + realrootdev=$volume + fi + fi + else + root_evms= fi # Check whether we are using LVM2 - if [ -z "$root_evms" ] ; then - vg_root=$(lvs --noheadings -o vg_name,lv_kernel_major,lv_kernel_minor | sed -n "s/ \(.*\) *$major *$minor/\1/p") + if [ -z "$root_evms" ] && [ -x /sbin/lvs ] ; then + vg_root=$(lvs --noheadings -o vg_name,lv_kernel_major,lv_kernel_minor 2> /dev/null | sed -n "s/ \(.*\) *$major *$minor/\1/p") if [ "$vg_root" ] ; then root_lvm2=1 fi + else + root_lvm2= fi if [ "$root_lvm2" ] ; then # Check for LVM2 on top of md md_list= - pv_list=$(vgs --noheadings --options devices $vg_root | sed -n "s@ \(/dev/.*\)([0-9]*)@\1@p") + pv_list=$(vgs --noheadings --options devices $vg_root 2> /dev/null | sed -n "s@ \(/dev/.*\)([0-9]*)@\1@p") for dev in $pv_list ; do case $dev in /dev/dm-*) @@ -3082,10 +3090,12 @@ root_mpath=1 ;; *) - mdconf=$(mdadm -Db $dev) - md_dev=${dev##/dev/} - md_list="$md_dev $md_list" - eval md_conf_${md_dev}=\"$mdconf\" + mdconf=$(mdadm -Db $dev 2> /dev/null) + if [ -n "$mdconf" ] ; then + md_dev=${dev##/dev/} + md_list="$md_dev $md_list" + eval md_conf_${md_dev}=\"$mdconf\" + fi ;; esac done @@ -3093,16 +3103,18 @@ unset mdconf fi fi - if [ "$root_md" ] ; then + if [ "$root_md" ] && [ -x /sbin/mdadm ] ; then minor=$(devminor $rootdevn) # get md configuration - mdconf=$(mdadm -Db $rootdev | sed -n "s@/dev/md[0-9]*@/dev/md$minor@p") + mdconf=$(mdadm -Db $rootdev 2> /dev/null | sed -n "s@/dev/md[0-9]*@/dev/md$minor@p") md_dev=${rootdev##/dev/} md_list="$md_dev" eval md_conf_${md_dev}=\"$mdconf\" unset minor unset md_dev unset mdconf + else + root_md= fi fi ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org