shaba/lvm2
1
0
Fork 0
mirror of git://sourceware.org/git/lvm2.git synced 2025-01-02 01:18:26 +03:00
Code Releases Activity

Check whether udev supports built-in blkid.

Browse Source 
Built-in blkid is supported since udev v176 - set the UDEV_HAS_BUILTIN_BLKID
variable appropriately so we can use it in the rules to call the built-in
blkid conditionaly.
This commit is contained in:
Peter Rajnoha 2012-02-20 19:36:27 +00:00
parent 36c90588fc
commit b559a1e6f0
2 changed files with 27 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
configure vendored
View File

@ -606,6 +606,7 @@ kerneldir
interface
DMEVENTD_PIDFILE
WRITE_INSTALL
UDEV_HAS_BUILTIN_BLKID
UDEV_SYNC
UDEV_RULES
UDEV_PC
@ -8858,6 +8859,19 @@ fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UDEV_RULES" >&5
$as_echo "$UDEV_RULES" >&6; }
if test x$UDEV_RULES = xyes; then
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether udev supports builtin blkid" >&5
$as_echo_n "checking whether udev supports builtin blkid... " >&6; }
udev_version=$(udevadm info --version 2>/dev/null)
if test -n "$udev_version" && test "$udev_version" -ge 176; then
UDEV_HAS_BUILTIN_BLKID=yes
else
UDEV_HAS_BUILTIN_BLKID=no
fi
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $UDEV_HAS_BUILTIN_BLKID" >&5
$as_echo "$UDEV_HAS_BUILTIN_BLKID" >&6; }
fi
################################################################################
# Check whether --enable-compat was given.
if test "${enable_compat+set}" = set; then :
@ -10393,6 +10407,7 @@ LVM_LIBAPI=`echo "$VER" | $AWK -F '[()]' '{print $2}'`
################################################################################

12
configure.in
View File

@ -873,6 +873,17 @@ AC_ARG_ENABLE(udev_rules,
UDEV_RULES=$enableval, UDEV_RULES=$UDEV_SYNC)
AC_MSG_RESULT($UDEV_RULES)
if test x$UDEV_RULES = xyes; then
AC_MSG_CHECKING(whether udev supports builtin blkid)
udev_version=$(udevadm info --version 2>/dev/null)
if test -n "$udev_version" && test "$udev_version" -ge 176; then
UDEV_HAS_BUILTIN_BLKID=yes
else
UDEV_HAS_BUILTIN_BLKID=no
fi
AC_MSG_RESULT($UDEV_HAS_BUILTIN_BLKID)
fi
################################################################################
dnl -- Compatibility mode
AC_ARG_ENABLE(compat,
@ -1454,6 +1465,7 @@ AC_SUBST(UDEV_LIBS)
AC_SUBST(UDEV_PC)
AC_SUBST(UDEV_RULES)
AC_SUBST(UDEV_SYNC)
AC_SUBST(UDEV_HAS_BUILTIN_BLKID)
AC_SUBST(CUNIT_LIBS)
AC_SUBST(CUNIT_CFLAGS)
AC_SUBST(WRITE_INSTALL)