Print this page
2882 implement libzfs_core
2883 changing "canmount" property to "on" should not always remount dataset
2900 "zfs snapshot" should be able to create multiple, arbitrary snapshots at once
Reviewed by: George Wilson <george.wilson@delphix.com>
Reviewed by: Chris Siden <christopher.siden@delphix.com>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Reviewed by: Bill Pijewski <wdp@joyent.com>
Reviewed by: Dan Kruchinin <dan.kruchinin@gmail.com>
| Split |
Close |
| Expand all |
| Collapse all |
--- old/usr/src/pkg/manifests/system-file-system-zfs.mf
+++ new/usr/src/pkg/manifests/system-file-system-zfs.mf
1 1 #
2 2 # CDDL HEADER START
3 3 #
4 4 # The contents of this file are subject to the terms of the
5 5 # Common Development and Distribution License (the "License").
6 6 # You may not use this file except in compliance with the License.
7 7 #
8 8 # You can obtain a copy of the license at usr/src/OPENSOLARIS.LICENSE
9 9 # or http://www.opensolaris.org/os/licensing.
10 10 # See the License for the specific language governing permissions
11 11 # and limitations under the License.
12 12 #
13 13 # When distributing Covered Code, include this CDDL HEADER in each
14 14 # file and include the License file at usr/src/OPENSOLARIS.LICENSE.
15 15 # If applicable, add the following below this CDDL HEADER, with the
16 16 # fields enclosed by brackets "[]" replaced with your own identifying
17 17 # information: Portions Copyright [yyyy] [name of copyright owner]
18 18 #
19 19 # CDDL HEADER END
20 20 #
21 21
22 22 #
23 23 # Copyright (c) 2010, Oracle and/or its affiliates. All rights reserved.
24 24 # Copyright (c) 2012 by Delphix. All rights reserved.
25 25 #
26 26
27 27 set name=pkg.fmri value=pkg:/system/file-system/zfs@$(PKGVERS)
28 28 set name=pkg.description value="ZFS libraries and commands"
29 29 set name=pkg.summary value=ZFS
30 30 set name=info.classification \
31 31 value="org.opensolaris.category.2008:System/File System"
32 32
33 33 #
34 34 # Skip manifest generation until build 134 can be required on the
35 35 # build systems, due to a Python flavor identification bug in pkgdepend.
36 36 #
37 37 set name=org.opensolaris.nodepend value=true
38 38 set name=variant.arch value=$(ARCH)
39 39 dir path=etc group=sys
40 40 dir path=etc/fs group=sys
41 41 dir path=etc/fs/zfs group=sys
42 42 dir path=etc/sysevent group=sys
43 43 dir path=etc/sysevent/config group=sys
44 44 dir path=etc/zfs group=sys
45 45 dir path=kernel group=sys
46 46 dir path=kernel/drv group=sys
47 47 dir path=kernel/drv/$(ARCH64) group=sys
48 48 dir path=kernel/fs group=sys
49 49 dir path=kernel/fs/$(ARCH64) group=sys
50 50 dir path=kernel/kmdb group=sys
51 51 dir path=kernel/kmdb/$(ARCH64) group=sys
52 52 dir path=lib
53 53 dir path=lib/$(ARCH64)
54 54 dir path=sbin group=sys
55 55 dir path=usr group=sys
56 56 dir path=usr/lib
57 57 dir path=usr/lib/$(ARCH64)
58 58 dir path=usr/lib/devfsadm group=sys
59 59 dir path=usr/lib/devfsadm/linkmod group=sys
60 60 dir path=usr/lib/fs group=sys
61 61 dir path=usr/lib/fs/zfs group=sys
62 62 dir path=usr/lib/mdb group=sys
63 63 dir path=usr/lib/mdb/kvm group=sys
64 64 dir path=usr/lib/mdb/kvm/$(ARCH64) group=sys
65 65 dir path=usr/lib/mdb/proc group=sys
66 66 $(sparc_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64) group=sys
67 67 $(i386_ONLY)dir path=usr/lib/mdb/proc/$(ARCH64)
68 68 dir path=usr/lib/python2.6
69 69 dir path=usr/lib/python2.6/vendor-packages
70 70 dir path=usr/lib/python2.6/vendor-packages/zfs
71 71 dir path=usr/lib/sysevent
72 72 dir path=usr/lib/sysevent/modules
73 73 dir path=usr/lib/zfs
74 74 dir path=usr/sbin
75 75 $(i386_ONLY)dir path=usr/sbin/$(ARCH32)
76 76 dir path=usr/sbin/$(ARCH64)
77 77 dir path=usr/share/man/man1m
|
↓ open down ↓ |
77 lines elided |
↑ open up ↑ |
78 78 driver name=zfs perms="* 0600 root sys" perms="zfs 0666 root sys"
79 79 file \
80 80 path=etc/sysevent/config/SUNW,EC_zfs,ESC_ZFS_bootfs_vdev_attach,sysevent.conf \
81 81 group=sys
82 82 file path=kernel/drv/$(ARCH64)/zfs group=sys
83 83 $(i386_ONLY)file path=kernel/drv/zfs group=sys
84 84 file path=kernel/drv/zfs.conf group=sys
85 85 file path=kernel/kmdb/$(ARCH64)/zfs group=sys mode=0555
86 86 $(i386_ONLY)file path=kernel/kmdb/zfs group=sys mode=0555
87 87 file path=lib/$(ARCH64)/libzfs.so.1
88 +file path=lib/$(ARCH64)/libzfs_core.so.1
88 89 file path=lib/$(ARCH64)/llib-lzfs.ln
90 +file path=lib/$(ARCH64)/llib-lzfs_core.ln
89 91 file path=lib/libzfs.so.1
92 +file path=lib/libzfs_core.so.1
90 93 file path=lib/llib-lzfs
91 94 file path=lib/llib-lzfs.ln
95 +file path=lib/llib-lzfs_core
96 +file path=lib/llib-lzfs_core.ln
92 97 file path=sbin/zfs mode=0555
93 98 file path=sbin/zpool mode=0555
94 99 file path=usr/lib/$(ARCH64)/libzfs_jni.so.1
95 100 file path=usr/lib/$(ARCH64)/libzpool.so.1
96 101 file path=usr/lib/devfsadm/linkmod/SUNW_zfs_link.so group=sys
97 102 file path=usr/lib/fs/zfs/bootinstall mode=0555
98 103 file path=usr/lib/fs/zfs/fstyp.so.1 mode=0555
99 104 file path=usr/lib/libzfs_jni.so.1
100 105 $(i386_ONLY)file path=usr/lib/libzpool.so.1
101 106 file path=usr/lib/mdb/kvm/$(ARCH64)/zfs.so group=sys mode=0555
102 107 $(i386_ONLY)file path=usr/lib/mdb/kvm/zfs.so group=sys mode=0555
103 108 file path=usr/lib/mdb/proc/$(ARCH64)/libzpool.so group=sys mode=0555
104 109 file path=usr/lib/mdb/proc/libzpool.so group=sys mode=0555
105 110 file path=usr/lib/python2.6/vendor-packages/zfs/__init__.py
106 111 file path=usr/lib/python2.6/vendor-packages/zfs/__init__.pyc
107 112 file path=usr/lib/python2.6/vendor-packages/zfs/allow.py
108 113 file path=usr/lib/python2.6/vendor-packages/zfs/allow.pyc
109 114 file path=usr/lib/python2.6/vendor-packages/zfs/dataset.py
110 115 file path=usr/lib/python2.6/vendor-packages/zfs/dataset.pyc
111 116 file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.py
112 117 file path=usr/lib/python2.6/vendor-packages/zfs/groupspace.pyc
113 118 file path=usr/lib/python2.6/vendor-packages/zfs/holds.py
114 119 file path=usr/lib/python2.6/vendor-packages/zfs/holds.pyc
115 120 file path=usr/lib/python2.6/vendor-packages/zfs/ioctl.so
116 121 file path=usr/lib/python2.6/vendor-packages/zfs/table.py
117 122 file path=usr/lib/python2.6/vendor-packages/zfs/table.pyc
118 123 file path=usr/lib/python2.6/vendor-packages/zfs/unallow.py
119 124 file path=usr/lib/python2.6/vendor-packages/zfs/unallow.pyc
120 125 file path=usr/lib/python2.6/vendor-packages/zfs/userspace.py
121 126 file path=usr/lib/python2.6/vendor-packages/zfs/userspace.pyc
122 127 file path=usr/lib/python2.6/vendor-packages/zfs/util.py
123 128 file path=usr/lib/python2.6/vendor-packages/zfs/util.pyc
124 129 file path=usr/lib/sysevent/modules/zfs_mod.so group=sys
125 130 file path=usr/lib/zfs/availdevs mode=0555
126 131 file path=usr/lib/zfs/pyzfs.py mode=0555
127 132 file path=usr/lib/zfs/pyzfs.pyc mode=0555
128 133 $(i386_ONLY)file path=usr/sbin/$(ARCH32)/zdb mode=0555
129 134 file path=usr/sbin/$(ARCH64)/zdb mode=0555
130 135 file path=usr/sbin/zstreamdump mode=0555
131 136 file path=usr/share/man/man1m/zdb.1m
132 137 file path=usr/share/man/man1m/zfs.1m
133 138 file path=usr/share/man/man1m/zpool.1m
134 139 file path=usr/share/man/man1m/zstreamdump.1m
135 140 file path=usr/share/man/man5/zpool-features.5
136 141 hardlink path=kernel/fs/$(ARCH64)/zfs target=../../../kernel/drv/$(ARCH64)/zfs
137 142 $(i386_ONLY)hardlink path=kernel/fs/zfs target=../../kernel/drv/zfs
138 143 hardlink path=usr/lib/fs/zfs/fstyp target=../../../sbin/fstyp
|
↓ open down ↓ |
37 lines elided |
↑ open up ↑ |
139 144 hardlink path=usr/sbin/zdb target=../../usr/lib/isaexec
140 145 legacy pkg=SUNWzfskr desc="ZFS kernel root components" \
141 146 name="ZFS Kernel (Root)"
142 147 legacy pkg=SUNWzfsr desc="ZFS root components" name="ZFS (Root)"
143 148 legacy pkg=SUNWzfsu desc="ZFS libraries and commands" name="ZFS (Usr)"
144 149 license cr_Sun license=cr_Sun
145 150 license lic_CDDL license=lic_CDDL
146 151 link path=etc/fs/zfs/mount target=../../../sbin/zfs
147 152 link path=etc/fs/zfs/umount target=../../../sbin/zfs
148 153 link path=lib/$(ARCH64)/libzfs.so target=libzfs.so.1
154 +link path=lib/$(ARCH64)/libzfs_core.so target=libzfs_core.so.1
149 155 link path=lib/libzfs.so target=libzfs.so.1
156 +link path=lib/libzfs_core.so target=libzfs_core.so.1
150 157 link path=usr/lib/$(ARCH64)/libzfs.so \
151 158 target=../../../lib/$(ARCH64)/libzfs.so.1
152 159 link path=usr/lib/$(ARCH64)/libzfs.so.1 \
153 160 target=../../../lib/$(ARCH64)/libzfs.so.1
161 +link path=usr/lib/$(ARCH64)/libzfs_core.so \
162 + target=../../../lib/$(ARCH64)/libzfs_core.so.1
163 +link path=usr/lib/$(ARCH64)/libzfs_core.so.1 \
164 + target=../../../lib/$(ARCH64)/libzfs_core.so.1
154 165 link path=usr/lib/$(ARCH64)/libzfs_jni.so target=libzfs_jni.so.1
155 166 link path=usr/lib/$(ARCH64)/libzpool.so target=libzpool.so.1
156 167 link path=usr/lib/$(ARCH64)/llib-lzfs.ln \
157 168 target=../../../lib/$(ARCH64)/llib-lzfs.ln
169 +link path=usr/lib/$(ARCH64)/llib-lzfs_core.ln \
170 + target=../../../lib/$(ARCH64)/llib-lzfs_core.ln
158 171 link path=usr/lib/fs/zfs/mount target=../../../../sbin/zfs
159 172 link path=usr/lib/fs/zfs/umount target=../../../../sbin/zfs
160 173 link path=usr/lib/libzfs.so target=../../lib/libzfs.so.1
161 174 link path=usr/lib/libzfs.so.1 target=../../lib/libzfs.so.1
175 +link path=usr/lib/libzfs_core.so target=../../lib/libzfs_core.so.1
176 +link path=usr/lib/libzfs_core.so.1 target=../../lib/libzfs_core.so.1
162 177 link path=usr/lib/libzfs_jni.so target=libzfs_jni.so.1
163 178 $(i386_ONLY)link path=usr/lib/libzpool.so target=libzpool.so.1
164 179 link path=usr/lib/llib-lzfs target=../../lib/llib-lzfs
165 180 link path=usr/lib/llib-lzfs.ln target=../../lib/llib-lzfs.ln
181 +link path=usr/lib/llib-lzfs_core target=../../lib/llib-lzfs_core
182 +link path=usr/lib/llib-lzfs_core.ln target=../../lib/llib-lzfs_core.ln
166 183 link path=usr/sbin/zfs target=../../sbin/zfs
167 184 link path=usr/sbin/zpool target=../../sbin/zpool
168 185 depend fmri=runtime/python-26 type=require
XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX