From nobody@FreeBSD.org  Sun May 26 19:25:28 2013
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.FreeBSD.org [8.8.178.115])
	by hub.freebsd.org (Postfix) with ESMTP id 49B9292F
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 May 2013 19:25:28 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from oldred.FreeBSD.org (oldred.freebsd.org [8.8.178.121])
	by mx1.freebsd.org (Postfix) with ESMTP id 3B9C1994
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 May 2013 19:25:28 +0000 (UTC)
Received: from oldred.FreeBSD.org ([127.0.1.6])
	by oldred.FreeBSD.org (8.14.5/8.14.5) with ESMTP id r4QJPRg1046558
	for <freebsd-gnats-submit@FreeBSD.org>; Sun, 26 May 2013 19:25:27 GMT
	(envelope-from nobody@oldred.FreeBSD.org)
Received: (from nobody@localhost)
	by oldred.FreeBSD.org (8.14.5/8.14.5/Submit) id r4QJPRY5046557;
	Sun, 26 May 2013 19:25:27 GMT
	(envelope-from nobody)
Message-Id: <201305261925.r4QJPRY5046557@oldred.FreeBSD.org>
Date: Sun, 26 May 2013 19:25:27 GMT
From: Peter Schaefer <peter.schaefer@wilhelmheinrichs.de>
To: freebsd-gnats-submit@FreeBSD.org
Subject: error in message with zfs mount -> there is no "mount -F zfs" in FreeBSD
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         178996
>Category:       bin
>Synopsis:       [zfs] [patch] error in message with zfs mount -> there is no "mount -F zfs" in FreeBSD
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    mm
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          sw-bug
>Submitter-Id:   current-users
>Arrival-Date:   Sun May 26 19:30:00 UTC 2013
>Closed-Date:    Sun Jul 07 11:47:11 UTC 2013
>Last-Modified:  Sun Jul 07 11:47:11 UTC 2013
>Originator:     Peter Schaefer
>Release:        9.1 RELEASE
>Organization:
Hobbyschneiderin24
>Environment:
FreeBSD rescue 9.1-RELEASE FreeBSD 9.1-RELEASE #3 r243710M: Tue Apr 23 10:52:10 CEST 2013     root@FreeBSD:/usr/obj/usr/src/sys/GENERIC  amd64
>Description:
Fiddeling around with zfs set mountpoint=legacy pool/root there is a message from /sbin/zfs which tells me to use mount -F zfs pool/root instead.
Trying to do so brings up a new error message because the -F on solaris means the filesystemtype which is the -t in FreeBSD.

Simple, not very important, but annoying for anyone not using zfs  and mount very often.

(Never reported a bug before, hope to have done everything in the right manner)
>How-To-Repeat:
#zfs umount pool/root
#zfs set mountpoint=legacy pool/root
#zfs mount pool/root /mnt

should do the job

>Fix:
6496- 	"mounted using 'mount -F zfs'\n"), dataset);
6496+ 	"mounted using 'mount -t zfs'\n"), dataset);

6499- 	(void) fprintf(stderr, gettext("If you must use 'mount -F zfs' "
6499+ 	(void) fprintf(stderr, gettext("If you must use 'mount -t zfs' "

>Release-Note:
>Audit-Trail:

From: Peter Schaefer <peter.schaefer@wilhelmheinrichs.de>
To: bug-followup@FreeBSD.org, peter.schaefer@wilhelmheinrichs.de
Cc:  
Subject: Re: kern/178996: error in message with zfs mount -&gt; there is no
 &quot;mount -F zfs&quot; in FreeBSD
Date: Sun, 26 May 2013 22:01:18 +0200

 The changes have to be made to main.c
 http://svnweb.freebsd.org/base/stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 
Responsible-Changed-From-To: freebsd-bugs->freebsd-fs 
Responsible-Changed-By: linimon 
Responsible-Changed-When: Sun May 26 20:53:43 UTC 2013 
Responsible-Changed-Why:  
Over to maintainer(s). 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178996 
Responsible-Changed-From-To: freebsd-fs->gjb 
Responsible-Changed-By: gjb 
Responsible-Changed-When: Wed Jun 26 00:15:34 UTC 2013 
Responsible-Changed-Why:  
Take. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=178996 
Responsible-Changed-From-To: gjb->mm 
Responsible-Changed-By: gjb 
Responsible-Changed-When: Thu Jul 4 21:30:18 UTC 2013 
Responsible-Changed-Why:  
Martin, would you mind looking at this?  It seems like this error 
should not be triggered in head/ (at least).  The PR originator 
has noted to me in private that this error message was triggered on 
a 9.1-RELEASE system. 


http://www.freebsd.org/cgi/query-pr.cgi?pr=178996 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/178996: commit references a PR
Date: Thu,  4 Jul 2013 22:26:50 +0000 (UTC)

 Author: mm
 Date: Thu Jul  4 22:26:38 2013
 New Revision: 252732
 URL: http://svnweb.freebsd.org/changeset/base/252732
 
 Log:
   Fix misleading or remove irrelevant illumos messages and manpage references
   in the zfs command.
   
   PR:		bin/178996
   Submitted by:	Peter Schaefer <peter.schaefer@wilhelmheinrichs.de>
   MFC after:	3 days
 
 Modified:
   head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 
 Modified: head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 ==============================================================================
 --- head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu Jul  4 22:09:14 2013	(r252731)
 +++ head/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Thu Jul  4 22:26:38 2013	(r252732)
 @@ -5601,8 +5601,8 @@ share_mount_one(zfs_handle_t *zhp, int o
  
  		(void) fprintf(stderr, gettext("cannot share '%s': "
  		    "legacy share\n"), zfs_get_name(zhp));
 -		(void) fprintf(stderr, gettext("use share(1M) to "
 -		    "share this filesystem, or set "
 +		(void) fprintf(stderr, gettext("to "
 +		    "share this filesystem set "
  		    "sharenfs property on\n"));
  		return (1);
  	}
 @@ -5618,7 +5618,7 @@ share_mount_one(zfs_handle_t *zhp, int o
  
  		(void) fprintf(stderr, gettext("cannot %s '%s': "
  		    "legacy mountpoint\n"), cmdname, zfs_get_name(zhp));
 -		(void) fprintf(stderr, gettext("use %s(1M) to "
 +		(void) fprintf(stderr, gettext("use %s(8) to "
  		    "%s this filesystem\n"), cmdname, cmdname);
  		return (1);
  	}
 @@ -6056,8 +6056,10 @@ unshare_unmount_path(int op, char *path,
  		    strcmp(smbshare_prop, "off") == 0) {
  			(void) fprintf(stderr, gettext("cannot unshare "
  			    "'%s': legacy share\n"), path);
 +#ifdef illumos
  			(void) fprintf(stderr, gettext("use "
  			    "unshare(1M) to unshare this filesystem\n"));
 +#endif
  		} else if (!zfs_is_shared(zhp)) {
  			(void) fprintf(stderr, gettext("cannot unshare '%s': "
  			    "not currently shared\n"), path);
 @@ -6076,7 +6078,7 @@ unshare_unmount_path(int op, char *path,
  			(void) fprintf(stderr, gettext("cannot unmount "
  			    "'%s': legacy mountpoint\n"),
  			    zfs_get_name(zhp));
 -			(void) fprintf(stderr, gettext("use umount(1M) "
 +			(void) fprintf(stderr, gettext("use umount(8) "
  			    "to unmount this filesystem\n"));
  		} else {
  			ret = zfs_unmountall(zhp, flags);
 @@ -6298,9 +6300,11 @@ unshare_unmount(int op, int argc, char *
  				(void) fprintf(stderr, gettext("cannot "
  				    "unshare '%s': legacy share\n"),
  				    zfs_get_name(zhp));
 +#ifdef illumos
  				(void) fprintf(stderr, gettext("use "
  				    "unshare(1M) to unshare this "
  				    "filesystem\n"));
 +#endif
  				ret = 1;
  			} else if (!zfs_is_shared(zhp)) {
  				(void) fprintf(stderr, gettext("cannot "
 @@ -6318,7 +6322,7 @@ unshare_unmount(int op, int argc, char *
  				    "unmount '%s': legacy "
  				    "mountpoint\n"), zfs_get_name(zhp));
  				(void) fprintf(stderr, gettext("use "
 -				    "umount(1M) to unmount this "
 +				    "umount(8) to unmount this "
  				    "filesystem\n"));
  				ret = 1;
  			} else if (!zfs_is_mounted(zhp, NULL)) {
 @@ -6504,12 +6508,12 @@ manual_mount(int argc, char **argv)
  		}
  	} else {
  		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
 -		    "mounted using 'mount -F zfs'\n"), dataset);
 +		    "mounted using 'mount -t zfs'\n"), dataset);
  		(void) fprintf(stderr, gettext("Use 'zfs set mountpoint=%s' "
  		    "instead.\n"), path);
 -		(void) fprintf(stderr, gettext("If you must use 'mount -F zfs' "
 -		    "or /etc/vfstab, use 'zfs set mountpoint=legacy'.\n"));
 -		(void) fprintf(stderr, gettext("See zfs(1M) for more "
 +		(void) fprintf(stderr, gettext("If you must use 'mount -t zfs' "
 +		    "or /etc/fstab, use 'zfs set mountpoint=legacy'.\n"));
 +		(void) fprintf(stderr, gettext("See zfs(8) for more "
  		    "information.\n"));
  		ret = 1;
  	}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/178996: commit references a PR
Date: Sun,  7 Jul 2013 09:22:01 +0000 (UTC)

 Author: mm
 Date: Sun Jul  7 09:21:39 2013
 New Revision: 252920
 URL: http://svnweb.freebsd.org/changeset/base/252920
 
 Log:
   MFC r252732:
   Fix misleading or remove irrelevant illumos messages and manpage references
   in the zfs command.
   
   PR:		bin/178996
   Submitted by:	Peter Schaefer <peter.schaefer@wilhelmheinrichs.de>
 
 Modified:
   stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 Directory Properties:
   stable/9/cddl/contrib/opensolaris/   (props changed)
   stable/9/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
 
 Modified: stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 ==============================================================================
 --- stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Jul  7 07:06:15 2013	(r252919)
 +++ stable/9/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Jul  7 09:21:39 2013	(r252920)
 @@ -5590,8 +5590,8 @@ share_mount_one(zfs_handle_t *zhp, int o
  
  		(void) fprintf(stderr, gettext("cannot share '%s': "
  		    "legacy share\n"), zfs_get_name(zhp));
 -		(void) fprintf(stderr, gettext("use share(1M) to "
 -		    "share this filesystem, or set "
 +		(void) fprintf(stderr, gettext("to "
 +		    "share this filesystem set "
  		    "sharenfs property on\n"));
  		return (1);
  	}
 @@ -5607,7 +5607,7 @@ share_mount_one(zfs_handle_t *zhp, int o
  
  		(void) fprintf(stderr, gettext("cannot %s '%s': "
  		    "legacy mountpoint\n"), cmdname, zfs_get_name(zhp));
 -		(void) fprintf(stderr, gettext("use %s(1M) to "
 +		(void) fprintf(stderr, gettext("use %s(8) to "
  		    "%s this filesystem\n"), cmdname, cmdname);
  		return (1);
  	}
 @@ -6045,8 +6045,10 @@ unshare_unmount_path(int op, char *path,
  		    strcmp(smbshare_prop, "off") == 0) {
  			(void) fprintf(stderr, gettext("cannot unshare "
  			    "'%s': legacy share\n"), path);
 +#ifdef illumos
  			(void) fprintf(stderr, gettext("use "
  			    "unshare(1M) to unshare this filesystem\n"));
 +#endif
  		} else if (!zfs_is_shared(zhp)) {
  			(void) fprintf(stderr, gettext("cannot unshare '%s': "
  			    "not currently shared\n"), path);
 @@ -6065,7 +6067,7 @@ unshare_unmount_path(int op, char *path,
  			(void) fprintf(stderr, gettext("cannot unmount "
  			    "'%s': legacy mountpoint\n"),
  			    zfs_get_name(zhp));
 -			(void) fprintf(stderr, gettext("use umount(1M) "
 +			(void) fprintf(stderr, gettext("use umount(8) "
  			    "to unmount this filesystem\n"));
  		} else {
  			ret = zfs_unmountall(zhp, flags);
 @@ -6287,9 +6289,11 @@ unshare_unmount(int op, int argc, char *
  				(void) fprintf(stderr, gettext("cannot "
  				    "unshare '%s': legacy share\n"),
  				    zfs_get_name(zhp));
 +#ifdef illumos
  				(void) fprintf(stderr, gettext("use "
  				    "unshare(1M) to unshare this "
  				    "filesystem\n"));
 +#endif
  				ret = 1;
  			} else if (!zfs_is_shared(zhp)) {
  				(void) fprintf(stderr, gettext("cannot "
 @@ -6307,7 +6311,7 @@ unshare_unmount(int op, int argc, char *
  				    "unmount '%s': legacy "
  				    "mountpoint\n"), zfs_get_name(zhp));
  				(void) fprintf(stderr, gettext("use "
 -				    "umount(1M) to unmount this "
 +				    "umount(8) to unmount this "
  				    "filesystem\n"));
  				ret = 1;
  			} else if (!zfs_is_mounted(zhp, NULL)) {
 @@ -6493,12 +6497,12 @@ manual_mount(int argc, char **argv)
  		}
  	} else {
  		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
 -		    "mounted using 'mount -F zfs'\n"), dataset);
 +		    "mounted using 'mount -t zfs'\n"), dataset);
  		(void) fprintf(stderr, gettext("Use 'zfs set mountpoint=%s' "
  		    "instead.\n"), path);
 -		(void) fprintf(stderr, gettext("If you must use 'mount -F zfs' "
 -		    "or /etc/vfstab, use 'zfs set mountpoint=legacy'.\n"));
 -		(void) fprintf(stderr, gettext("See zfs(1M) for more "
 +		(void) fprintf(stderr, gettext("If you must use 'mount -t zfs' "
 +		    "or /etc/fstab, use 'zfs set mountpoint=legacy'.\n"));
 +		(void) fprintf(stderr, gettext("See zfs(8) for more "
  		    "information.\n"));
  		ret = 1;
  	}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: bin/178996: commit references a PR
Date: Sun,  7 Jul 2013 09:22:17 +0000 (UTC)

 Author: mm
 Date: Sun Jul  7 09:22:03 2013
 New Revision: 252921
 URL: http://svnweb.freebsd.org/changeset/base/252921
 
 Log:
   MFC r252732:
   Fix misleading or remove irrelevant illumos messages and manpage references
   in the zfs command.
   
   PR:		bin/178996
   Submitted by:	Peter Schaefer <peter.schaefer@wilhelmheinrichs.de>
 
 Modified:
   stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 Directory Properties:
   stable/8/cddl/contrib/opensolaris/   (props changed)
   stable/8/cddl/contrib/opensolaris/cmd/zfs/   (props changed)
 
 Modified: stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c
 ==============================================================================
 --- stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Jul  7 09:21:39 2013	(r252920)
 +++ stable/8/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c	Sun Jul  7 09:22:03 2013	(r252921)
 @@ -5590,8 +5590,8 @@ share_mount_one(zfs_handle_t *zhp, int o
  
  		(void) fprintf(stderr, gettext("cannot share '%s': "
  		    "legacy share\n"), zfs_get_name(zhp));
 -		(void) fprintf(stderr, gettext("use share(1M) to "
 -		    "share this filesystem, or set "
 +		(void) fprintf(stderr, gettext("to "
 +		    "share this filesystem set "
  		    "sharenfs property on\n"));
  		return (1);
  	}
 @@ -5607,7 +5607,7 @@ share_mount_one(zfs_handle_t *zhp, int o
  
  		(void) fprintf(stderr, gettext("cannot %s '%s': "
  		    "legacy mountpoint\n"), cmdname, zfs_get_name(zhp));
 -		(void) fprintf(stderr, gettext("use %s(1M) to "
 +		(void) fprintf(stderr, gettext("use %s(8) to "
  		    "%s this filesystem\n"), cmdname, cmdname);
  		return (1);
  	}
 @@ -6045,8 +6045,10 @@ unshare_unmount_path(int op, char *path,
  		    strcmp(smbshare_prop, "off") == 0) {
  			(void) fprintf(stderr, gettext("cannot unshare "
  			    "'%s': legacy share\n"), path);
 +#ifdef illumos
  			(void) fprintf(stderr, gettext("use "
  			    "unshare(1M) to unshare this filesystem\n"));
 +#endif
  		} else if (!zfs_is_shared(zhp)) {
  			(void) fprintf(stderr, gettext("cannot unshare '%s': "
  			    "not currently shared\n"), path);
 @@ -6065,7 +6067,7 @@ unshare_unmount_path(int op, char *path,
  			(void) fprintf(stderr, gettext("cannot unmount "
  			    "'%s': legacy mountpoint\n"),
  			    zfs_get_name(zhp));
 -			(void) fprintf(stderr, gettext("use umount(1M) "
 +			(void) fprintf(stderr, gettext("use umount(8) "
  			    "to unmount this filesystem\n"));
  		} else {
  			ret = zfs_unmountall(zhp, flags);
 @@ -6287,9 +6289,11 @@ unshare_unmount(int op, int argc, char *
  				(void) fprintf(stderr, gettext("cannot "
  				    "unshare '%s': legacy share\n"),
  				    zfs_get_name(zhp));
 +#ifdef illumos
  				(void) fprintf(stderr, gettext("use "
  				    "unshare(1M) to unshare this "
  				    "filesystem\n"));
 +#endif
  				ret = 1;
  			} else if (!zfs_is_shared(zhp)) {
  				(void) fprintf(stderr, gettext("cannot "
 @@ -6307,7 +6311,7 @@ unshare_unmount(int op, int argc, char *
  				    "unmount '%s': legacy "
  				    "mountpoint\n"), zfs_get_name(zhp));
  				(void) fprintf(stderr, gettext("use "
 -				    "umount(1M) to unmount this "
 +				    "umount(8) to unmount this "
  				    "filesystem\n"));
  				ret = 1;
  			} else if (!zfs_is_mounted(zhp, NULL)) {
 @@ -6493,12 +6497,12 @@ manual_mount(int argc, char **argv)
  		}
  	} else {
  		(void) fprintf(stderr, gettext("filesystem '%s' cannot be "
 -		    "mounted using 'mount -F zfs'\n"), dataset);
 +		    "mounted using 'mount -t zfs'\n"), dataset);
  		(void) fprintf(stderr, gettext("Use 'zfs set mountpoint=%s' "
  		    "instead.\n"), path);
 -		(void) fprintf(stderr, gettext("If you must use 'mount -F zfs' "
 -		    "or /etc/vfstab, use 'zfs set mountpoint=legacy'.\n"));
 -		(void) fprintf(stderr, gettext("See zfs(1M) for more "
 +		(void) fprintf(stderr, gettext("If you must use 'mount -t zfs' "
 +		    "or /etc/fstab, use 'zfs set mountpoint=legacy'.\n"));
 +		(void) fprintf(stderr, gettext("See zfs(8) for more "
  		    "information.\n"));
  		ret = 1;
  	}
 _______________________________________________
 svn-src-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/svn-src-all
 To unsubscribe, send any mail to "svn-src-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: mm 
State-Changed-When: Sun Jul 7 11:47:10 UTC 2013 
State-Changed-Why:  
Committed. Thanks! 

http://www.freebsd.org/cgi/query-pr.cgi?pr=178996 
>Unformatted:
