Author: undefine
Date: Mon Jan 28 23:51:41 2008
New Revision: 9208

Modified:
   geninitrd/trunk/geninitrd
Log:
- use blkid by default when blkid binary detected


Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd   (original)
+++ geninitrd/trunk/geninitrd   Mon Jan 28 23:51:41 2008
@@ -91,7 +91,7 @@
        echo "       [--with-suspend] [--without-suspend]"
        echo "       [--with-tuxonice] [--without-tuxonice]"
        echo "       [--without-dmraid] [--without-multipath]"
-       echo "       [--with-blkid]"
+       echo "       [--without-blkid]"
        echo "       <initrd-image> <kernel-version>"
        echo ""
        echo "example:"
@@ -1551,6 +1551,10 @@
        USE_MULTIPATH=yes
 fi
 
+if [ -x /sbin/initrd-blkid ]; then
+       USE_BLKID=yes
+fi
+
 if [ -r /etc/sysconfig/geninitrd ]; then
        . /etc/sysconfig/geninitrd
 fi
@@ -1636,8 +1640,8 @@
        --without-multipath)
                USE_MULTPATH=no
                ;;
-       --with-blkid)
-               USE_BLKID=yes
+       --without-blkid)
+               USE_BLKID=no
                ;;
        --with=*)
                BASICMODULES="$BASICMODULES ${1#--with=}"
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit

Reply via email to