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

Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch

This commit is contained in:
Brian Behlendorf 2010-07-01 10:44:48 -07:00
parent d8c228876e e42a4778d8
commit c794cc3891
4 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -11,7 +11,7 @@ SUBDIRS = $(USER_DIR) $(KERNEL_DIR)
AUTOMAKE_OPTIONS = foreign dist-zip AUTOMAKE_OPTIONS = foreign dist-zip
EXTRA_DIST = autogen.sh config/config.awk EXTRA_DIST = autogen.sh config/config.awk
EXTRA_DIST += zfs.spec.in zfs-modules.spec.in EXTRA_DIST += zfs.spec.in zfs-modules.spec.in
EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT EXTRA_DIST += META DISCLAIMER COPYRIGHT GIT README.markdown
EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE EXTRA_DIST += OPENSOLARIS.LICENSE ZFS.RELEASE
noinst_HEADERS = zfs_config.h noinst_HEADERS = zfs_config.h

3
cmd/ztest/ztest.c
View File

@ -5519,7 +5519,8 @@ main(int argc, char **argv)
process_options(argc, argv); process_options(argc, argv);
/* Override location of zpool.cache */ /* Override location of zpool.cache */
(void) asprintf((char **)&spa_config_path, "%s/zpool.cache", zopt_dir); VERIFY(asprintf((char **)&spa_config_path, "%s/zpool.cache",
zopt_dir) != -1);
/* /*
* Blow away any existing copy of zpool.cache * Blow away any existing copy of zpool.cache

2
lib/libspl/include/Makefile.am
View File

@ -4,4 +4,6 @@ nobase_pkginclude_HEADERS += rpc/*.h
nobase_pkginclude_HEADERS += sys/*.h nobase_pkginclude_HEADERS += sys/*.h
nobase_pkginclude_HEADERS += sys/dktp/*.h nobase_pkginclude_HEADERS += sys/dktp/*.h
nobase_pkginclude_HEADERS += sys/sysevent/*.h nobase_pkginclude_HEADERS += sys/sysevent/*.h
nobase_pkginclude_HEADERS += sys/tsol/*.h
nobase_pkginclude_HEADERS += tsol/*.h nobase_pkginclude_HEADERS += tsol/*.h
nobase_pkginclude_HEADERS += util/*.h

2
zfs.spec.in
View File

@ -60,7 +60,7 @@ rm -rf $RPM_BUILD_ROOT
%files %files
%defattr(-, root, root) %defattr(-, root, root)
%doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER %doc AUTHORS ChangeLog COPYING COPYRIGHT DISCLAIMER
%doc GIT OPENSOLARIS.LICENSE README ZFS.RELEASE %doc GIT OPENSOLARIS.LICENSE README.markdown ZFS.RELEASE
%{_sbindir}/* %{_sbindir}/*
%{_bindir}/* %{_bindir}/*
%{_libdir}/* %{_libdir}/*