diff options
Diffstat (limited to 'usr/src')
| -rw-r--r-- | usr/src/grub/grub-0.95/stage2/builtins.c | 5 | ||||
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_ioctl.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/usr/src/grub/grub-0.95/stage2/builtins.c b/usr/src/grub/grub-0.95/stage2/builtins.c index 1d12737dd1..0ccd3677e3 100644 --- a/usr/src/grub/grub-0.95/stage2/builtins.c +++ b/usr/src/grub/grub-0.95/stage2/builtins.c @@ -3893,10 +3893,9 @@ bootfs_func (char *arg, int flags) else if (current_rootpool[0] != 0 && current_bootfs_obj != 0) grub_printf("The zfs boot filesystem is <default: %s/%u>.", current_rootpool, current_bootfs_obj); - else if (current_rootpool[0] != 0 && current_bootfs_obj == 0) - grub_printf("The zfs boot pool is '%s'.", current_rootpool); else - grub_printf ("The zfs boot filesystem will be <default>.\n"); + grub_printf ("The zfs boot filesystem will be derived from " + "the default bootfs pool property.\n"); return (1); } diff --git a/usr/src/uts/common/fs/zfs/zfs_ioctl.c b/usr/src/uts/common/fs/zfs/zfs_ioctl.c index b5f8b0368d..fccfc1355e 100644 --- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c +++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c @@ -1056,7 +1056,7 @@ zfs_ioc_set_prop(zfs_cmd_t *zc) } static int -zfs_ioc_pool_props_set(zfs_cmd_t *zc) +zfs_ioc_pool_set_props(zfs_cmd_t *zc) { nvlist_t *nvl; int error, reset_bootfs = 0; @@ -1152,7 +1152,7 @@ zfs_ioc_pool_props_set(zfs_cmd_t *zc) } static int -zfs_ioc_pool_props_get(zfs_cmd_t *zc) +zfs_ioc_pool_get_props(zfs_cmd_t *zc) { spa_t *spa; int error; @@ -1647,8 +1647,8 @@ static zfs_ioc_vec_t zfs_ioc_vec[] = { { zfs_ioc_snapshot, zfs_secpolicy_write, dataset_name }, { zfs_ioc_dsobj_to_dsname, zfs_secpolicy_config, pool_name }, { zfs_ioc_obj_to_path, zfs_secpolicy_config, no_name }, - { zfs_ioc_pool_props_set, zfs_secpolicy_config, pool_name }, - { zfs_ioc_pool_props_get, zfs_secpolicy_read, pool_name }, + { zfs_ioc_pool_set_props, zfs_secpolicy_config, pool_name }, + { zfs_ioc_pool_get_props, zfs_secpolicy_read, pool_name }, }; static int |