Mercurial > illumos > illumos-gate

changeset 4098:0a182c2128e6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6545726 make ZFS_IOC_POOL_*_PROPS in sync with zfs_ioc_pool_props_* 6549344 'bootfs' grub command should not print out half-cooked default bootfs value
author lling
date Tue, 24 Apr 2007 16:07:37 -0700
parents 9f6f3e4cd944
children 9c9793408924
files usr/src/grub/grub-0.95/stage2/builtins.c usr/src/uts/common/fs/zfs/zfs_ioctl.c
diffstat 2 files changed, 6 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/grub/grub-0.95/stage2/builtins.c	Tue Apr 24 15:35:43 2007 -0700
+++ b/usr/src/grub/grub-0.95/stage2/builtins.c	Tue Apr 24 16:07:37 2007 -0700
@@ -3893,10 +3893,9 @@
 	    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);
 	}
--- a/usr/src/uts/common/fs/zfs/zfs_ioctl.c	Tue Apr 24 15:35:43 2007 -0700
+++ b/usr/src/uts/common/fs/zfs/zfs_ioctl.c	Tue Apr 24 16:07:37 2007 -0700
@@ -1056,7 +1056,7 @@
 }
 
 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 @@
 }
 
 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 @@
 	{ 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