9423abeee4
Merge commit 'refs/top-bases/linux-have-idmap' into linux-have-idmap
2009-10-15 16:45:56 -07:00
88e0496770
Merge branch 'linux-ztest' into refs/top-bases/linux-zfs-branch
2009-10-15 16:45:50 -07:00
40369b1821
Merge commit 'refs/top-bases/linux-ztest' into linux-ztest
2009-10-15 16:45:49 -07:00
851876e252
Merge branch 'linux-have-zpl' into refs/top-bases/linux-zfs-branch
2009-10-15 16:45:43 -07:00
7190c77120
Merge commit 'refs/top-bases/linux-have-zpl' into linux-have-zpl
2009-10-15 16:45:41 -07:00
bac03509b5
Merge branch 'linux-unused' into refs/top-bases/linux-zfs-branch
2009-10-15 16:45:36 -07:00
20e39fc8ba
Merge commit 'refs/top-bases/linux-unused' into linux-unused
2009-10-15 16:45:34 -07:00
f238ec127f
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-15 16:45:28 -07:00
b1f0167254
Merge commit 'refs/top-bases/linux-libspl' into linux-libspl
2009-10-15 16:45:27 -07:00
77d3c1757d
Merge branch 'linux-zpios' into refs/top-bases/linux-zfs-branch
2009-10-15 16:45:21 -07:00
af214824d3
Merge commit 'refs/top-bases/linux-zpios' into linux-zpios
2009-10-15 16:45:19 -07:00
295d45555e
Merge branch 'linux-user-disk' into refs/top-bases/linux-zfs-branch
2009-10-15 16:45:13 -07:00
3d24809465
Merge commit 'refs/top-bases/linux-user-disk' into linux-user-disk
2009-10-15 16:45:11 -07:00
9b95020082
Merge branch 'linux-symbol-collisions' into refs/top-bases/linux-zfs-branch
2009-10-15 16:45:05 -07:00
56b92b7161
Merge commit 'refs/top-bases/linux-symbol-collisions' into linux-symbol-collisions
2009-10-15 16:45:04 -07:00
0a8e64a0bf
Merge branch 'linux-legacy' into refs/top-bases/linux-zfs-branch
2009-10-15 16:44:58 -07:00
2bf493292b
Merge commit 'refs/top-bases/linux-legacy' into linux-legacy
2009-10-15 16:44:56 -07:00
9d8f113878
Merge branch 'linux-kernel-mem' into refs/top-bases/linux-zfs-branch
2009-10-15 16:44:51 -07:00
75b14a7c2e
Merge commit 'refs/top-bases/linux-kernel-mem' into linux-kernel-mem
2009-10-15 16:44:49 -07:00
a99e6d7cef
Merge branch 'linux-kernel-disk' into refs/top-bases/linux-zfs-branch
2009-10-15 16:44:43 -07:00
aa3069aea1
Merge commit 'refs/top-bases/linux-kernel-disk' into linux-kernel-disk
2009-10-15 16:44:41 -07:00
66521bcff9
Merge branch 'linux-have-zvol' into refs/top-bases/linux-zfs-branch
2009-10-15 16:44:36 -07:00
ea9d8282cc
Merge commit 'refs/top-bases/linux-have-zvol' into linux-have-zvol
2009-10-15 16:44:34 -07:00
066296b078
Merge branch 'linux-have-uio-rw' into refs/top-bases/linux-zfs-branch
2009-10-15 16:44:28 -07:00
1fd6e4326e
Merge commit 'refs/top-bases/linux-have-uio-rw' into linux-have-uio-rw
2009-10-15 16:44:26 -07:00
89d78d3a0e
Merge commit 'refs/top-bases/linux-debug-zerocopy' into linux-debug-zerocopy
2009-10-15 16:44:25 -07:00
79f002a4a3
Merge branch 'linux-have-sysevent' into refs/top-bases/linux-zfs-branch
2009-10-15 16:44:15 -07:00
0ebe5a0462
Merge commit 'refs/top-bases/linux-have-sysevent' into linux-have-sysevent
2009-10-15 16:44:14 -07:00
05a70f9b9c
Merge commit 'refs/top-bases/linux-kernel-module' into linux-kernel-module
2009-10-15 16:44:13 -07:00
e21206239f
Merge branch 'linux-have-spl-debug' into refs/top-bases/linux-zfs-branch
2009-10-15 16:44:03 -07:00
6d82040da7
Merge commit 'refs/top-bases/linux-have-spl-debug' into linux-have-spl-debug
2009-10-15 16:44:01 -07:00
46f26aa8e1
Merge branch 'linux-have-mntent' into refs/top-bases/linux-zfs-branch
2009-10-15 16:43:55 -07:00
4353a3cbf9
Merge commit 'refs/top-bases/linux-have-mntent' into linux-have-mntent
2009-10-15 16:43:53 -07:00
0826192db7
Merge branch 'linux-have-fm' into refs/top-bases/linux-zfs-branch
2009-10-15 16:43:48 -07:00
b93807aae8
Merge commit 'refs/top-bases/linux-have-fm' into linux-have-fm
2009-10-15 16:43:46 -07:00
c1b4a1ef92
Merge branch 'linux-docs' into refs/top-bases/linux-zfs-branch
2009-10-15 16:43:40 -07:00
199a5fa8e5
Merge commit 'refs/top-bases/linux-docs' into linux-docs
2009-10-15 16:43:38 -07:00
48d1b0c5ab
Cleanly integrate ZFS tools with libblkid.
...
The majority of this this patch concerns itself with doing a direct
replacement of Solaris's libdiskmgt library with libblkid+libefi.
You'll notice that this patch removes all libdiskmgt code instead of
ifdef'ing it out. This was done to minimize any confusion when reading
the code because it seems unlikely we will ever port libdiskmgt to Linux.
Despite the replacement the behavior of the tools should have remained
the same with one exception. For the moment, we are unable to check
the partitions of devices which have an MBR style partition table when
creating a filesystem. If a non-efi partition sceme is detected on a
whole disk device we prompt the user to explicity use the force option.
It would not be a ton of work to make the tool aware of MBR style
partitions if this becomes a problem.
I've done basic sanity checking for various configurations and all
the issues I'm aware of have been addressed. Even things like blkid
misidentifing a disk as ext3 when it is added to a zfs pool. I'm
careful to always zero out the first 4k of any new zfs partition. That
all said this is all new code and while it looks like it's working right
for me we should keep an eye on it for any strange behavior.
2009-10-15 16:28:47 -07:00
a09d33e929
Update build system for libblkid integration
2009-10-15 16:25:18 -07:00
00aa119139
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-15 09:43:17 -07:00
733c119cef
Remove linux-have-libdiskmgt from dependency list.
2009-10-15 09:39:27 -07:00
d5c9d50ffd
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-15 09:38:54 -07:00
ec3ebaf978
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-10-15 09:38:52 -07:00
702a78ed33
Merge branch 'linux-have-libdiskmgt' into refs/top-bases/linux-zfs-branch
2009-10-15 09:38:51 -07:00
172ca0a7f1
Remove topic branch linux-have-libdiskmgt
2009-10-15 09:34:17 -07:00
ee1de79aa3
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-14 16:54:45 -07:00
41f3beca71
Merge commit 'refs/top-bases/linux-zfs-branch' into linux-zfs-branch
2009-10-14 16:54:43 -07:00
553e366ce5
Merge branch 'linux-libspl' into refs/top-bases/linux-zfs-branch
2009-10-14 16:54:42 -07:00
22925be29c
Add in missing header required by libefi.
2009-10-14 16:50:26 -07:00
4a704a81ac
Merge commit 'refs/top-bases/linux-configure-branch' into linux-configure-branch
2009-10-14 16:32:19 -07:00
Brian Behlendorf