Commit Graph

382 Commits

Author SHA1 Message Date
Brian Behlendorf 7733d3b4c6 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-05-23 10:07:03 -07:00
Brian Behlendorf 8aa7455978 Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-23 10:04:22 -07:00
Brian Behlendorf fd6bf51a0a Use more correct /usr/bin/awk patch for default. 2010-05-23 09:57:05 -07:00
Brian Behlendorf 343bcf823f Refresh autogen products with automake 1.11.1 2010-05-21 16:04:53 -07:00
Brian Behlendorf 233c86a30a Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-05-18 16:24:57 -07:00
Brian Behlendorf 437789841d Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch 2010-05-18 16:22:46 -07:00
Brian Behlendorf d28ada9eaa Remove explicit import from zconfig test 1.
Due to now resolved bug in the SPL you would need to explicitly
import you zpools after module load.  Now that is no longer the case.
If a cache file is found your pool will be automatically loaded and
available so I'm removing the explicit imports from the test case.
2010-05-18 16:15:57 -07:00
Brian Behlendorf d5c0441641 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-05-18 15:13:53 -07:00
Brian Behlendorf cf07f0acd5 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-05-18 15:12:33 -07:00
Brian Behlendorf 3a8dbc184a Move zpios script change to correct linux-zpios branch. 2010-05-18 15:06:37 -07:00
Brian Behlendorf 4e7fd8ff9d Move build system and core script changes to correct zfs-branch. 2010-05-18 15:05:44 -07:00
Brian Behlendorf ecb8603d26 Revert changes which don't belong on linux-configure-branch. 2010-05-18 15:04:19 -07:00
Brian Behlendorf 43afa9e1d4 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-04-29 12:06:40 -07:00
Brian Behlendorf 9dc83e5f34 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 12:06:04 -07:00
Brian Behlendorf fa60ee8c86 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 12:04:39 -07:00
Brian Behlendorf 66ba722b0a Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 12:04:36 -07:00
Brian Behlendorf 3affbe6d7e Update nvpair's to include nv_alloc_fixed support 2010-04-29 11:59:41 -07:00
Brian Behlendorf a45a62d1a2 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-04-29 10:44:02 -07:00
Brian Behlendorf 50cf137f41 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-04-29 10:43:27 -07:00
Brian Behlendorf 91b582d4a1 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-04-29 10:42:02 -07:00
Brian Behlendorf 1368594e11 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2010-04-29 10:41:59 -07:00
Brian Behlendorf fa42225a3d Add Solaris FMA style support 2010-04-29 10:37:15 -07:00
Brian Behlendorf 34edbcd956 Refresh autogen products 2010-03-26 15:57:19 -07:00
Brian Behlendorf 5421d05a48 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-11 14:10:36 -08:00
Brian Behlendorf eb7888a1eb Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-11 14:09:58 -08:00
Brian Behlendorf b0436b0a97 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-03-11 14:08:33 -08:00
Brian Behlendorf feee765f99 Remove promise example config replace with a supermicro config
The promise config never worked quite right.  I'm replacing it with
a Supermicro config which does and which I've tested on a real test
system.
2010-03-11 14:04:12 -08:00
Brian Behlendorf e7b3766a69 Remove udev dependency when running in-tree
After much contemplation I can't see a clean way to use udev entirely
in-tree for testing.  This patch removed a horrible horrible hack which
would copy the needed udev bits in to place on your system to make it
work.  That however is simply not acceptable, nothing you in in-tree
should ever ever ever install something on your system.

Since I could not come up with a clean way to use udev in-tree.  The
fix is to simply parse the zdev config file and create the needed
symlinks in a sub-diretory or your working tree.  This is not as clean
as using udev but it does work perfectly well for in-tree testing.
2010-03-11 13:56:20 -08:00
Brian Behlendorf 414f1f975e Rename update-zfs.sh -> zfs-update.sh for consistency 2010-03-11 09:53:59 -08:00
Brian Behlendorf 68b657e394 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-03-09 14:56:34 -08:00
Brian Behlendorf 037d965f04 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-03-09 14:56:01 -08:00
Ricardo M. Correia 17c7323211 Fix scripts to work when invoked from other directories. 2010-03-09 14:51:49 -08:00
Ricardo M. Correia 4853ac3d53 Fix scripts to work when invoked from other directories. 2010-03-09 14:50:15 -08:00
Brian Behlendorf 02d15b4e4f Refresh autogen products 2010-03-08 10:57:16 -08:00
Brian Behlendorf 98ae569641 Refresh autogen products 2010-03-02 10:17:58 -08:00
Brian Behlendorf cdc2e52139 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
Conflicts:

	scripts/udev-rules/99-zpool.rules.dragon
2010-03-02 10:08:59 -08:00
Brian Behlendorf 06d354b4f3 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
Conflicts:

	cmd/Makefile.am
2010-03-02 10:06:26 -08:00
Brian Behlendorf e6d92ae57d Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
Conflicts:

	cmd/Makefile.am
2010-03-02 10:01:51 -08:00
Brian Behlendorf 7df02c0f57 Split the udev rule from a specific configuration
While I completely agree the udev is the lesser of many possibles
evils when solving the device issue... it is still evil.  After
attempting to craft a single rule which will work for various
versions of udev in various distros.  I've come to the conclusion
the only maintainable way to solve this issue is to split the rule
from any particular configuration.

This commit provides a generic 60-zpool.rules file which use a
small helper util 'zpool_id' to parse a configuration file by
default located in /etc/zfs/zdev.conf.  The helper script maps
a by-path udev name to a more friendly name of <channel><rank>
for large configurations.

As part of this change all of the support scripts why rely on
this udev naming convention have been updated as needed.  Example
zdev.conf files have also been added for 3 different systems by
you will always need to add one for your exact hardware.

Finally, included in these changes are the proper tweaks to the
build system to ensure everything still get's packaged properly
in the rpms and can run in or out of tree.
2010-03-01 16:51:21 -08:00
Brian Behlendorf 2d43af054e Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2010-01-08 10:26:41 -08:00
Brian Behlendorf 0e63df30fe Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2010-01-08 10:26:22 -08:00
Brian Behlendorf 6dba7c4354 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2010-01-08 10:25:37 -08:00
Brian Behlendorf e0aff96a14 Use udevadm if available otherwise use udevtrigger/udevsettle
Moving forward udevadm {trigger/settle} replaced udevtrigger/udevsettle
as the correct interface to use.  However, since we need to work in
both environments for testing check and see if udevadm is available.
If it is then use it.  If it is not fall back to the legacy interface.
2010-01-08 10:20:03 -08:00
Brian Behlendorf 9b473082fa Refresh autogen products 2009-12-23 14:53:51 -08:00
Brian Behlendorf 64f8a4c314 Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch 2009-12-11 16:24:16 -08:00
Brian Behlendorf 4fdebcdb85 Merge commit 'refs/top-bases/linux-zpios' into linux-zpios 2009-12-11 16:23:43 -08:00
Brian Behlendorf c0abfb43b0 Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch 2009-12-11 16:22:27 -08:00
Brian Behlendorf 77825f6f77 Merge commit 'refs/top-bases/zfs-branch' into zfs-branch 2009-12-11 16:22:24 -08:00
Brian Behlendorf 058ac9ba78 Pull in latest man pages as part of update-zfs.sh
The script has been updated to download the latest documentations
packages for Solaris and extract the needed ZFS man pages.  These
will still need a little markup to handle changes between the
Solaris and Linux versions of ZFS.  Howver, they should be pretty
minor I've tried hard to keep the interface the same.

In additional to the script update the zdb, zfs, and zpool man
pages have been added to the repo.
2009-12-11 16:15:33 -08:00
Brian Behlendorf 05c9e047cc Refresh autogen products 2009-11-24 15:53:47 -08:00