mirror of
				https://git.proxmox.com/git/mirror_zfs.git
				synced 2025-10-26 18:05:04 +03:00 
			
		
		
		
	Make zoned/jailed zfsprops(7) make more sense.
- Distribute zfs-[un]jail.8 on FreeBSD and zfs-[un]zone.8 on Linux - zfsprops.7: mirror zoned/jailed, only available on respective platforms Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz> Closes #15161
This commit is contained in:
		
							parent
							
								
									084ff4abd2
								
							
						
					
					
						commit
						1b696429c1
					
				| @ -60,7 +60,6 @@ usr/share/man/man8/zfs-get.8 | |||||||
| usr/share/man/man8/zfs-groupspace.8 | usr/share/man/man8/zfs-groupspace.8 | ||||||
| usr/share/man/man8/zfs-hold.8 | usr/share/man/man8/zfs-hold.8 | ||||||
| usr/share/man/man8/zfs-inherit.8 | usr/share/man/man8/zfs-inherit.8 | ||||||
| usr/share/man/man8/zfs-jail.8 |  | ||||||
| usr/share/man/man8/zfs-list.8 | usr/share/man/man8/zfs-list.8 | ||||||
| usr/share/man/man8/zfs-load-key.8 | usr/share/man/man8/zfs-load-key.8 | ||||||
| usr/share/man/man8/zfs-mount-generator.8 | usr/share/man/man8/zfs-mount-generator.8 | ||||||
| @ -80,7 +79,6 @@ usr/share/man/man8/zfs-set.8 | |||||||
| usr/share/man/man8/zfs-share.8 | usr/share/man/man8/zfs-share.8 | ||||||
| usr/share/man/man8/zfs-snapshot.8 | usr/share/man/man8/zfs-snapshot.8 | ||||||
| usr/share/man/man8/zfs-unallow.8 | usr/share/man/man8/zfs-unallow.8 | ||||||
| usr/share/man/man8/zfs-unjail.8 |  | ||||||
| usr/share/man/man8/zfs-unload-key.8 | usr/share/man/man8/zfs-unload-key.8 | ||||||
| usr/share/man/man8/zfs-unmount.8 | usr/share/man/man8/zfs-unmount.8 | ||||||
| usr/share/man/man8/zfs-unzone.8 | usr/share/man/man8/zfs-unzone.8 | ||||||
|  | |||||||
| @ -38,7 +38,6 @@ dist_man_MANS = \ | |||||||
| 	%D%/man8/zfs-groupspace.8 \
 | 	%D%/man8/zfs-groupspace.8 \
 | ||||||
| 	%D%/man8/zfs-hold.8 \
 | 	%D%/man8/zfs-hold.8 \
 | ||||||
| 	%D%/man8/zfs-inherit.8 \
 | 	%D%/man8/zfs-inherit.8 \
 | ||||||
| 	%D%/man8/zfs-jail.8 \
 |  | ||||||
| 	%D%/man8/zfs-list.8 \
 | 	%D%/man8/zfs-list.8 \
 | ||||||
| 	%D%/man8/zfs-load-key.8 \
 | 	%D%/man8/zfs-load-key.8 \
 | ||||||
| 	%D%/man8/zfs-mount.8 \
 | 	%D%/man8/zfs-mount.8 \
 | ||||||
| @ -57,14 +56,11 @@ dist_man_MANS = \ | |||||||
| 	%D%/man8/zfs-share.8 \
 | 	%D%/man8/zfs-share.8 \
 | ||||||
| 	%D%/man8/zfs-snapshot.8 \
 | 	%D%/man8/zfs-snapshot.8 \
 | ||||||
| 	%D%/man8/zfs-unallow.8 \
 | 	%D%/man8/zfs-unallow.8 \
 | ||||||
| 	%D%/man8/zfs-unjail.8 \
 |  | ||||||
| 	%D%/man8/zfs-unload-key.8 \
 | 	%D%/man8/zfs-unload-key.8 \
 | ||||||
| 	%D%/man8/zfs-unmount.8 \
 | 	%D%/man8/zfs-unmount.8 \
 | ||||||
| 	%D%/man8/zfs-unzone.8 \
 |  | ||||||
| 	%D%/man8/zfs-upgrade.8 \
 | 	%D%/man8/zfs-upgrade.8 \
 | ||||||
| 	%D%/man8/zfs-userspace.8 \
 | 	%D%/man8/zfs-userspace.8 \
 | ||||||
| 	%D%/man8/zfs-wait.8 \
 | 	%D%/man8/zfs-wait.8 \
 | ||||||
| 	%D%/man8/zfs-zone.8 \
 |  | ||||||
| 	%D%/man8/zfs_ids_to_path.8 \
 | 	%D%/man8/zfs_ids_to_path.8 \
 | ||||||
| 	%D%/man8/zgenhostid.8 \
 | 	%D%/man8/zgenhostid.8 \
 | ||||||
| 	%D%/man8/zinject.8 \
 | 	%D%/man8/zinject.8 \
 | ||||||
| @ -104,6 +100,18 @@ dist_man_MANS = \ | |||||||
| 	%D%/man8/zstreamdump.8 \
 | 	%D%/man8/zstreamdump.8 \
 | ||||||
| 	%D%/man8/zpool_influxdb.8 | 	%D%/man8/zpool_influxdb.8 | ||||||
| 
 | 
 | ||||||
|  | if BUILD_FREEBSD | ||||||
|  | dist_man_MANS += \
 | ||||||
|  | 	%D%/man8/zfs-jail.8 \
 | ||||||
|  | 	%D%/man8/zfs-unjail.8 | ||||||
|  | endif | ||||||
|  | 
 | ||||||
|  | if BUILD_LINUX | ||||||
|  | dist_man_MANS += \
 | ||||||
|  | 	%D%/man8/zfs-unzone.8 \
 | ||||||
|  | 	%D%/man8/zfs-zone.8 | ||||||
|  | endif | ||||||
|  | 
 | ||||||
| nodist_man_MANS = \
 | nodist_man_MANS = \
 | ||||||
| 	%D%/man8/zed.8 \
 | 	%D%/man8/zed.8 \
 | ||||||
| 	%D%/man8/zfs-mount-generator.8 | 	%D%/man8/zfs-mount-generator.8 | ||||||
|  | |||||||
| @ -38,7 +38,7 @@ | |||||||
| .\" Copyright (c) 2019, Kjeld Schouten-Lebbing | .\" Copyright (c) 2019, Kjeld Schouten-Lebbing | ||||||
| .\" Copyright (c) 2022 Hewlett Packard Enterprise Development LP. | .\" Copyright (c) 2022 Hewlett Packard Enterprise Development LP. | ||||||
| .\" | .\" | ||||||
| .Dd April 18, 2023 | .Dd August 8, 2023 | ||||||
| .Dt ZFSPROPS 7 | .Dt ZFSPROPS 7 | ||||||
| .Os | .Os | ||||||
| . | . | ||||||
| @ -1916,13 +1916,15 @@ See | |||||||
| for more information. | for more information. | ||||||
| Jails are a | Jails are a | ||||||
| .Fx | .Fx | ||||||
| feature and are not relevant on other platforms. | feature and this property is not available on other platforms. | ||||||
| The default value is | .It Sy zoned Ns = Ns Sy off Ns | Ns Sy on | ||||||
| .Sy off . |  | ||||||
| .It Sy zoned Ns = Ns Sy on Ns | Ns Sy off |  | ||||||
| Controls whether the dataset is managed from a non-global zone or namespace. | Controls whether the dataset is managed from a non-global zone or namespace. | ||||||
| The default value is | See | ||||||
| .Sy off . | .Xr zfs-zone 8 | ||||||
|  | for more information. | ||||||
|  | Zoning is a | ||||||
|  | Linux | ||||||
|  | feature and this property is not available on other platforms. | ||||||
| .El | .El | ||||||
| .Pp | .Pp | ||||||
| The following three properties cannot be changed after the file system is | The following three properties cannot be changed after the file system is | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user
	 наб
						наб