diff options
| author | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2008-11-10 08:00:08 -0700 |
|---|---|---|
| committer | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2008-11-10 08:00:08 -0700 |
| commit | d0f3f37e7f24f68fdbd85386c60e576883622762 (patch) | |
| tree | 3cd8f55ff9e9c961f779d751ef4ee85685c8c4b0 /usr/src/grub | |
| parent | 9059856ebcd775578d6f7889324f4a54af5f31f7 (diff) | |
| download | illumos-joyent-d0f3f37e7f24f68fdbd85386c60e576883622762.tar.gz | |
PSARC/2008/659 New ZFS "passthrough-x" ACL inheritance rules
6765166 Need to provide mechanism to optionally inherit ACE_EXECUTE
Diffstat (limited to 'usr/src/grub')
| -rw-r--r-- | usr/src/grub/capability | 2 | ||||
| -rw-r--r-- | usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/usr/src/grub/capability b/usr/src/grub/capability index cba2f25a56..1bede33e77 100644 --- a/usr/src/grub/capability +++ b/usr/src/grub/capability @@ -40,7 +40,7 @@ # This file and the associated version are Solaris specific and are # not a part of the open source distribution of GRUB. # -VERSION=4 +VERSION=5 dboot xVM zfs diff --git a/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h b/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h index 5450018afb..24a72ae594 100644 --- a/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h +++ b/usr/src/grub/grub-0.97/stage2/zfs-include/zfs.h @@ -27,7 +27,7 @@ /* * On-disk version number. */ -#define SPA_VERSION 13ULL +#define SPA_VERSION 14ULL /* * The following are configuration names used in the nvlist describing a pool's |