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

Merge commit 'refs/top-bases/linux-arc' into linux-arc

This commit is contained in:
Brian Behlendorf 2009-01-14 15:41:05 -08:00
parent 52e8abfe6e 9c22d76019
commit 1406bb78e6
4 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/ztest/Makefile.am
View File

@ -28,3 +28,6 @@ ztest_LDADD = \
$(top_builddir)/lib/libzfs/libzfs.la $(top_builddir)/lib/libzfs/libzfs.la
ztest_LDFLAGS = -pthread -lm -lz -lrt -ldl ztest_LDFLAGS = -pthread -lm -lz -lrt -ldl
check:
./ztest -V

2
configure.ac
View File

@ -60,7 +60,6 @@ AC_CONFIG_FILES([
Makefile Makefile
config/Makefile config/Makefile
doc/Makefile doc/Makefile
scripts/Makefile
lib/Makefile lib/Makefile
lib/libavl/Makefile lib/libavl/Makefile
lib/libnvpair/Makefile lib/libnvpair/Makefile
@ -91,5 +90,6 @@ AC_CONFIG_FILES([
module/zcommon/include/sys/fm/Makefile module/zcommon/include/sys/fm/Makefile
module/zcommon/include/sys/fm/fs/Makefile module/zcommon/include/sys/fm/fs/Makefile
module/zfs/Makefile module/zfs/Makefile
scripts/Makefile
]) ])
AC_OUTPUT AC_OUTPUT

3
scripts/Makefile.am
View File

@ -1,4 +1,5 @@
EXTRA_DIST = update-zfs.sh check.sh zfs.sh create-zpool.sh EXTRA_DIST = update-zfs.sh check.sh zfs.sh create-zpool.sh
check: check:
./check.sh ./zfs.sh -v
./zfs.sh -vu

17
scripts/check.sh
View File

@ -1,17 +0,0 @@
#!/bin/bash
prog=check.sh
die() {
echo "${prog}: $1" >&2
exit 1
}
if [ $(id -u) != 0 ]; then
die "Must run as root"
fi
./zfs.sh -v || die ""
./zfs.sh -vu || die ""
exit 0