Hello community, here is the log from the commit of package device-mapper for openSUSE:Factory checked in at Sat Oct 3 00:34:39 CEST 2009. -------- --- device-mapper/device-mapper.changes 2009-08-31 20:59:33.000000000 +0200 +++ device-mapper/device-mapper.changes 2009-09-23 09:12:44.000000000 +0200 @@ -1,0 +2,5 @@ +Wed Sep 23 06:39:29 UTC 2009 - xwhu@novell.com + +- Add -devmapper- infix to mkinitrd scripts + +------------------------------------------------------------------- --- device-mapper/lvm2.changes 2009-08-28 09:38:31.000000000 +0200 +++ device-mapper/lvm2.changes 2009-09-23 09:21:33.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Sep 23 06:38:47 UTC 2009 - xwhu@novell.com + +- Add -lvm2- infix to mkinitrd scripts +- collect_lvm reads /etc/sysconfig/lvm (bnc#523944) + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- mkinitrd-boot.sh mkinitrd-setup.sh New: ---- mkinitrd-devmapper-boot.sh mkinitrd-devmapper-setup.sh mkinitrd-lvm2-boot.sh mkinitrd-lvm2-setup.sh ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ device-mapper.spec ++++++ --- /var/tmp/diff_new_pack.OnLtQ5/_old 2009-10-03 00:32:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OnLtQ5/_new 2009-10-03 00:32:43.000000000 +0200 @@ -27,12 +27,12 @@ %endif # Version: 1.02.31 -Release: 6 +Release: 7 Summary: Device Mapper Tools Source: LVM2.2.02.45.tar.bz2 Source1: boot.device-mapper -Source2: mkinitrd-setup.sh -Source3: mkinitrd-boot.sh +Source2: mkinitrd-devmapper-setup.sh +Source3: mkinitrd-devmapper-boot.sh Patch: improve_probing.diff Patch2: no-inc-audit.diff Patch3: no_buildroot_shared.diff ++++++ lvm2-clvm.spec ++++++ --- /var/tmp/diff_new_pack.OnLtQ5/_old 2009-10-03 00:32:43.000000000 +0200 +++ /var/tmp/diff_new_pack.OnLtQ5/_new 2009-10-03 00:32:43.000000000 +0200 @@ -24,7 +24,7 @@ License: GPL v2 or later ; LGPL v2.1 or later Group: System/Base Version: 2.02.45 -Release: 6 +Release: 7 Requires: device-mapper >= 1.02.25 lvm2 = %{version} openais Provides: clvm PreReq: %fillup_prereq %insserv_prereq @@ -34,8 +34,8 @@ Source1: lvm.conf Source2: boot.lvm Source3: sysconfig.lvm -Source4: mkinitrd-setup.sh -Source5: mkinitrd-boot.sh +Source4: mkinitrd-lvm2-setup.sh +Source5: mkinitrd-lvm2-boot.sh Source6: 64-lvm2.rules Source7: collect_lvm Source8: clvmd.ocf ++++++ lvm2.spec ++++++ --- /var/tmp/diff_new_pack.OnLtQ5/_old 2009-10-03 00:32:44.000000000 +0200 +++ /var/tmp/diff_new_pack.OnLtQ5/_new 2009-10-03 00:32:44.000000000 +0200 @@ -29,14 +29,14 @@ PreReq: %fillup_prereq %insserv_prereq AutoReqProv: on Version: 2.02.45 -Release: 6 +Release: 7 Summary: LVM2 Tools Source: LVM2.%{version}.tar.bz2 Source1: lvm.conf Source2: boot.lvm Source3: sysconfig.lvm -Source4: mkinitrd-setup.sh -Source5: mkinitrd-boot.sh +Source4: mkinitrd-lvm2-setup.sh +Source5: mkinitrd-lvm2-boot.sh Source6: 64-lvm2.rules Source7: collect_lvm Source8: clvmd.ocf ++++++ collect_lvm ++++++ --- /var/tmp/diff_new_pack.OnLtQ5/_old 2009-10-03 00:32:44.000000000 +0200 +++ /var/tmp/diff_new_pack.OnLtQ5/_new 2009-10-03 00:32:44.000000000 +0200 @@ -1,6 +1,8 @@ #!/bin/sh PVNAME=$1 +source /etc/sysconfig/lvm + /sbin/lvm pvs --config "devices {filter = [ \"a|$PVNAME|\", \"r/.*/\" ]}" --partial -o vg_name,vg_attr,pv_uuid,vg_uuid --ignorelockingfailure --noheadings $PVNAME 2>/dev/null | while read vgname vgattr pvuuid vguuid; do if [[ $vgattr =~ mode. ]]; then continue @@ -32,6 +34,20 @@ echo VGUUID=$vguuid echo VGNAME=$vgname + if [[ -n $LVM_VGS_ACTIVATED_ON_BOOT ]]; then + found=0 + for autovg in $LVM_VGS_ACTIVATED_ON_BOOT; do + if [[ $vgname == $autovg ]]; then + found=1 + break + fi + done + if [[ $found == 0 ]]; then + echo COLLECT=1 + exit 0 + fi + fi + collected=0 for pv in $pvlist; do if [[ x$pv = x$pvuuid ]]; then ++++++ mkinitrd-devmapper-boot.sh ++++++ #!/bin/bash #%stage: boot #%depends: start #%modules: $dm_modules dm-mod dm-snapshot #%programs: /sbin/dmsetup /sbin/blockdev # dm-crypt dm-zero dm-mirror #%if: -n "$root_dm" # ##### Device Mapper ## ## If the root device uses device mapper, this initializes and waits for the control file ## ## Command line parameters ## ----------------------- ## ## root_dm=1 use device mapper ## load_modules # because we run before udev we need to create the device node manually mkdir /dev/mapper mknod /dev/mapper/control c 10 63 ++++++ mkinitrd-devmapper-setup.sh ++++++ #!/bin/bash # #%stage: devicemapper #%depends: dmroot # # no dmsetup -> no dm if [ -x /sbin/dmsetup ]; then dm_blockdev= # if any device before was on dm we have to activate it [ "$tmp_root_dm" ] && root_dm=1 blockdev="$(dm_resolvedeps_recursive $blockdev)" [ "$?" = 0 ] && root_dm=1 # include dm when using dm based block devs [ "$DM_BLOCK" ] && root_dm=1 # include modules if [ -n "$root_dm" ] ; then # Add all dm modules dm_modules= for table in $(dmsetup table | cut -f 4 -d ' ' | sort | uniq); do if [ "$table" ] && [ "$table" != "linear" ] && [ "$table" != "striped" ] ; then dm_modules="$dm_modules dm-$table" fi done fi # include dm block var from sysconfig mkdir -p etc/sysconfig grep DM_BLOCK /etc/sysconfig/kernel > etc/sysconfig/kernel save_var root_dm fi ++++++ mkinitrd-lvm2-boot.sh ++++++ #!/bin/bash #%stage: volumemanager #%depends: evms #%programs: /sbin/vgscan /sbin/vgchange /sbin/lvm #%modules: linear #%if: -n "$root_lvm2" # ##### LVM (Logical Volume Management) ## ## This activates and waits for an LVM. ## ## Command line parameters ## ----------------------- ## ## root_lvm2=1 use LVM ## root=/dev/mapper/... use this device as Volume Group ## vg_roots use this group as Volume Group ## lvm2_get_vg() { local param=$1 local vg_root vg_name local sysdev case $param in /dev/disk/by-*/*) vg_root= ;; /dev/mapper/*) vg_name=${o##root=/dev/mapper/} vg_root=${vg_name%%-*} ;; /dev/*) set -- $(IFS=/ ; echo $param) if [ "$#" = "3" ] ; then # Check sysfs. If there are subdirectories # matching this name it's a block device for d in /sys/block/$2\!* ; do if [ -d $d ] ; then sysdev=$d fi done # Not found in sysfs, looks like a VG then if [ -z "$sysdev" ] ; then vg_root=$2 fi fi ;; esac echo $vg_root } # load the necessary module before we initialize the raid system load_modules if [ -n "$root_lvm2" ] ; then o=$(get_param root) # Fallback if 'root=' is not specified [ -z "$o" ] && o=$rootdev vg_root=$(lvm2_get_vg $o) if [ "$vg_root" ] ; then # We are waiting for a device-mapper device root_major=$(sed -n 's/\(.*\) device-mapper/\1/p' /proc/devices) fi o=$(get_param resume) vg_resume=$(lvm2_get_vg $o) if [ "$vg_resume" ] ; then resume_major=$(sed -n 's/\(.*\) device-mapper/\1/p' /proc/devices) fi fi # initialize remebered and parameterized devices for vgr in $vg_root $vg_resume $vg_roots; do vgchange -a y $vgr done unset lvm2_get_vg ++++++ mkinitrd-lvm2-setup.sh ++++++ #!/bin/bash # #%stage: volumemanager #%depends: evms # # get information about the current blockdev update_blockdev # Check whether we are using LVM2 (only available when not using EVMS) if [ -z "$root_evms" ] && [ -x /sbin/lvdisplay ] ; then lvm_blockdev= for bd in $blockdev; do update_blockdev $bd vg_name=$(lvdisplay -c 2> /dev/null | sed -n "/.*:$blockmajor:$blockminor/p") vg_dev=${vg_name%%:*} vg_name=${vg_name#*:} vg_root=${vg_name%%:*} if [ "$vg_root" ] ; then local vg_blockdev root_lvm2=1 realrootdev=${vg_dev## } vg_blockdev=$(vgs --noheadings --options pv_name $vg_root 2> /dev/null | sed "s@,@\n@g" | sed "s@([0-9]*)@@g;s@ @@g" | sort | uniq) lvm_blockdev="$lvm_blockdev $vg_blockdev" [ $? -eq 0 ] || return 1 vg_roots="$vg_roots $vg_root" else lvm_blockdev="$lvm_blockdev $bd" fi done blockdev="$lvm_blockdev" fi if use_script lvm2; then tmp_root_dm=1 # lvm needs dm mkdir -p $tmp_mnt/etc/lvm mkdir -p $tmp_mnt/var/lock/lvm cp -a /etc/lvm/lvm.conf $tmp_mnt/etc/lvm cp -a /etc/sysconfig/lvm $tmp_mnt/etc/sysconfig # udev rule for lvm2 if [ -e /lib/udev/rules.d/64-lvm2.rules ]; then cp /lib/udev/rules.d/64-lvm2.rules $tmp_mnt/lib/udev/rules.d/ fi fi save_var root_lvm2 save_var vg_roots ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org