why do we use two set of tools in geninitrd? like require that initrd version is present but also use the tools from normal system? imho it would be sufficent to use only initrd version of tools to do lvdisplay, etc...
-- glen
--- Begin Message ---Author: glen Date: Sun Apr 12 06:17:25 2009 New Revision: 10326 Modified: geninitrd/trunk/mod-lvm.sh Log: - check LVM tools version only if lvm is enabled. lp#359718 Modified: geninitrd/trunk/mod-lvm.sh ============================================================================== --- geninitrd/trunk/mod-lvm.sh (original) +++ geninitrd/trunk/mod-lvm.sh Sun Apr 12 06:17:25 2009 @@ -29,15 +29,15 @@ lvm=$(find_tool $initrd_dir/lvm /sbin/initrd-lvm) if [ -x /sbin/lvm -a -x "$lvm" ]; then USE_LVM=yes - else - USE_LVM=no - fi - if [ -z "$LVMTOOLSVERSION" ]; then - LVMTOOLSVERSION=$(LC_ALL=C $lvm vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}') if [ -z "$LVMTOOLSVERSION" ]; then - die "Can't determine LVM tools version. Please set LVMTOOLSVERSION and rerun $PROGRAM." + LVMTOOLSVERSION=$(LC_ALL=C $lvm vgchange --version 2>/dev/null | awk '/LVM version:/{if ($3 >= 2) print "2"}') + if [ -z "$LVMTOOLSVERSION" ]; then + die "Can't determine LVM tools version. Please set LVMTOOLSVERSION and rerun $PROGRAM." + fi fi + else + USE_LVM=no fi } @@ -84,10 +84,6 @@ debug "LVM: $devpath is LVM node" - if [ ! -x $lvm -o ! -x /sbin/lvdisplay -o ! -x /sbin/pvdisplay ]; then - die "root on LVM but /sbin/lvdisplay or /sbin/pvdisplay not found. Please install lvm(2) and lvm(2)-initrd package and rerun $PROGRAM." - fi - local vg=$(find_lvm_vg "$devpath") debug "LVM VG for $devpath: $vg" VGVOLUMES=$(echo $VGVOLUMES $vg | tr ' ' '\n' | sort -u) _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
--- End Message ---
_______________________________________________ pld-devel-en mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-devel-en
