Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions

This commit is contained in:
Brian Behlendorf 2010-05-18 15:12:13 -07:00
parent f3d4e7adc5 4e7fd8ff9d
commit 2162a61b70
2 changed files with 27 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
config/zfs-build.m4
View File

@ -20,15 +20,21 @@ AC_DEFUN([ZFS_AC_DEBUG], [
) )
if test "$zfs_ac_debug" = yes; then if test "$zfs_ac_debug" = yes; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
AC_DEFINE([DEBUG], [1],
[Define to 1 to enable debug tracing])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG " KERNELCPPFLAGS="${KERNELCPPFLAGS} -DDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DDEBUG "
USERDEBUG="-DDEBUG"
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_DEFINE([NDEBUG], [1], AC_DEFINE([NDEBUG], [1],
[Define to 1 to disable debug tracing]) [Define to 1 to disable debug tracing])
KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG " KERNELCPPFLAGS="${KERNELCPPFLAGS} -DNDEBUG "
HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG " HOSTCFLAGS="${HOSTCFLAGS} -DNDEBUG "
USERDEBUG="-DNDEBUG"
fi fi
AC_SUBST(USERDEBUG)
]) ])
AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [ AC_DEFUN([ZFS_AC_CONFIG_SCRIPT], [

2
scripts/zpool-create.sh
View File

@ -24,10 +24,10 @@ DESCRIPTION:
OPTIONS: OPTIONS:
-h Show this message -h Show this message
-v Verbose -v Verbose
-f Force everything
-c Configuration for zpool -c Configuration for zpool
-p Name for zpool -p Name for zpool
-d Destroy zpool (default create) -d Destroy zpool (default create)
-f Force everything
-l Additional zpool options -l Additional zpool options
-s Additional zfs options -s Additional zfs options