[readonly/geninitrd: 554/1068] - use blkid by default when blkid binary detected
draenog
draenog at pld-linux.org
Sat Nov 2 19:58:59 CET 2013
commit af07548859527d6b2d2ffe81e3f1d999886d966d
Author: undefine <undefine at pld-linux.org>
Date: Mon Jan 28 22:51:41 2008 +0000
- use blkid by default when blkid binary detected
svn-id: @9208
geninitrd | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/geninitrd b/geninitrd
index 1111d71..1d3a20b 100755
--- a/geninitrd
+++ b/geninitrd
@@ -91,7 +91,7 @@ usage() {
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 @@ if [ -x /sbin/multipath ]; then
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 @@ while [ $# -gt 0 ]; do
--without-multipath)
USE_MULTPATH=no
;;
- --with-blkid)
- USE_BLKID=yes
+ --without-blkid)
+ USE_BLKID=no
;;
--with=*)
BASICMODULES="$BASICMODULES ${1#--with=}"
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/readonly/geninitrd.git/commitdiff/147754ca159d40ca5eb541074dc043d8cbd92090
More information about the pld-cvs-commit
mailing list