Skip to content
This repository

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse code

1126 date(1)'s usage message doesn't mention -R

1788 "WARNING: Cannot lookup root device: /devices" is useless when rootfs is zfs
1828 powerd's "Able to open /dev/srn" notice is useless
2547 Minor updates to README
2678 zfs manpage mis-identifies checksum default value
2811 missing implementation: zfs send -r
3199 Update copyright years in usr/src/prototypes/
Reviewed by: Joshua M. Clulow <josh@sysmgr.org>
Reviewed by: Garrett D'Amore <garrett@damore.org>
Approved by: Dan McDonald <danmcd@nexenta.com>
  • Loading branch information...
commit bde2df36223c26750e6e5e801907d885e088ee30 1 parent df7dfa5
Yuri Pankov authored September 21, 2012
35  README
... ...
@@ -1,4 +1,4 @@
1  
-illumos gate README - Sept 12, 2010.
  1
+illumos gate README - Sep 16, 2012.
2 2
 
3 3
 This is the illumos gate.  This is the illumos source tree.  It contains
4 4
 the following subdirectories:
@@ -12,7 +12,7 @@ the following subdirectories:
12 12
 
13 13
 Integration Rules:
14 14
 
15  
-        All changes must have been reviewed, and approved by and advocate
  15
+        All changes must have been reviewed, and approved by an advocate
16 16
 	(below).  A code review may be performed by someone other than the
17 17
 	advocate, but the final integration should still be approved by the
18 18
 	advocate. 
@@ -24,27 +24,26 @@ Integration Rules:
24 24
         All changes must adhere to typical ON style and quality rules.
25 25
         For example, pass full cstyle, applicable lint rules, etc.
26 26
 
27  
-        All commits must include either a CDDL license, unless
28  
-        approved otherwise by the gatekeeper, or the modified code
29  
-	already carries a different license.  Exceptions shall require
30  
-	the approval of the gatekeeper.
  27
+        All new code must be licensed under CDDL, and modifications to existing
  28
+        code may not alter the original license terms.  Integrations of code
  29
+        from upstream sources that use another liberal open source license are
  30
+        permissible, subject to approval of the advocates or developer council.
  31
+        Exceptions to this policy shall require the approval of the developer
  32
+        council.
31 33
 
32  
-        Hg commits should have comments of the following form:
  34
+        Commits should have comments of the following form:
33 35
 
34 36
         1234 This is a sample bug report synopsis
35  
-        4567 If you have a second bug synopsis...
36  
-        Reviewed by: codereviewer@somewhere.net
37  
-        Approved by: gatekeeper@somewhere.else.com
  37
+        4567 If you have a second bug synopsis…
  38
+        Reviewed by: Frodo Baggins <frodo.baggins@underhill.net>
  39
+        Reviewed by: Legolas <elf-coder@mirkwood.org>
  40
+        Approved by: Gandalf The Grey <rti-advocate@white-council.com>
38 41
 
39 42
 	Each commit must have at least one bug id that is listed in the
40 43
 	illumos-gate project at www.illumos.org.
41 44
 
42  
-Branches:
43  
-
44  
-        Please talk to the gatekeeper about personal branches.  In general,
45  
-        they will be allowed as long as we don't go *too* wild on them.
46  
-
47  
-Gatekeeper:     garrett@nexenta.com  (Interim)
48  
-IRC channel:    #illumos on irc.freenode.net
49  
-Mailing list:   developer@lists.illumos.org
  45
+RTI Advocates:     advocates@lists.illumos.org
  46
+Developer Council: developer-council@lists.illumos.org
50 47
 
  48
+IRC channel:       #illumos on irc.freenode.net
  49
+Mailing list:      developer@lists.illumos.org
4  usr/src/cmd/date/date.c
@@ -24,7 +24,7 @@
24 24
  * Use is subject to license terms.
25 25
  */
26 26
 /*
27  
- * Copyright 2011 Nexenta Systems, Inc.  All rights reserved.
  27
+ * Copyright 2012 Nexenta Systems, Inc. All rights reserved.
28 28
  */
29 29
 
30 30
 /*	Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T	*/
@@ -68,7 +68,7 @@ static  struct  utmpx wtmpx[2] = {
68 68
 	{"", "", NTIME_MSG, 0, NEW_TIME, 0, 0, 0}
69 69
 	};
70 70
 static char *usage =
71  
-	"usage:\tdate [-u] mmddHHMM[[cc]yy][.SS]\n\tdate [-u] [+format]\n"
  71
+	"usage:\tdate [-u] mmddHHMM[[cc]yy][.SS]\n\tdate [-Ru] [+format]\n"
72 72
 	"\tdate -a [-]sss[.fff]\n";
73 73
 static int uflag = 0;
74 74
 static int Rflag = 0;
1  usr/src/cmd/power/powerd.c
@@ -399,7 +399,6 @@ autos3_monitor(void)
399 399
 		logerror("Unable to open %s: %s", SRN, strerror(errno));
400 400
 		thr_exit((void *) errno);
401 401
 	}
402  
-	logerror("Able to open %s", SRN);
403 402
 
404 403
 	/*
405 404
 	 * Tell device we want the special sauce
2  usr/src/cmd/zfs/zfs_main.c
@@ -252,7 +252,7 @@ get_usage(zfs_help_t idx)
252 252
 	case HELP_ROLLBACK:
253 253
 		return (gettext("\trollback [-rRf] <snapshot>\n"));
254 254
 	case HELP_SEND:
255  
-		return (gettext("\tsend [-DnPpRrv] [-[iI] snapshot] "
  255
+		return (gettext("\tsend [-DnPpRv] [-[iI] snapshot] "
256 256
 		    "<snapshot>\n"));
257 257
 	case HELP_SET:
258 258
 		return (gettext("\tset <property=value> "
20  usr/src/man/man1m/zfs.1m
@@ -26,7 +26,7 @@
26 26
 .\" Copyright (c) 2012, Joyent, Inc. All rights reserved.
27 27
 .\" Copyright 2012 Nexenta Systems, Inc. All Rights Reserved.
28 28
 .\"
29  
-.TH ZFS 1M "Aug 16, 2012"
  29
+.TH ZFS 1M "Sep 16, 2012"
30 30
 .SH NAME
31 31
 zfs \- configures ZFS file systems
32 32
 .SH SYNOPSIS
@@ -886,14 +886,14 @@ This property is not inherited.
886 886
 .sp
887 887
 .ne 2
888 888
 .na
889  
-\fB\fBchecksum\fR=\fBon\fR | \fBoff\fR | \fBfletcher2,\fR| \fBfletcher4\fR |
  889
+\fB\fBchecksum\fR=\fBon\fR | \fBoff\fR | \fBfletcher2\fR | \fBfletcher4\fR |
890 890
 \fBsha256\fR\fR
891 891
 .ad
892 892
 .sp .6
893 893
 .RS 4n
894 894
 Controls the checksum used to verify data integrity. The default value is
895 895
 \fBon\fR, which automatically selects an appropriate algorithm (currently,
896  
-\fBfletcher2\fR, but this may change in future releases). The value \fBoff\fR
  896
+\fBfletcher4\fR, but this may change in future releases). The value \fBoff\fR
897 897
 disables integrity checking on user data. Disabling checksums is \fBNOT\fR a
898 898
 recommended practice.
899 899
 .sp
@@ -2733,7 +2733,7 @@ Unshare the specified filesystem. The command can also be given a path to a
2733 2733
 .sp
2734 2734
 .ne 2
2735 2735
 .na
2736  
-\fBzfs send\fR [\fB-DnPpRrv\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
  2736
+\fBzfs send\fR [\fB-DnPpRv\fR] [\fB-\fR[\fBiI\fR] \fIsnapshot\fR] \fIsnapshot\fR
2737 2737
 .ad
2738 2738
 .sp .6
2739 2739
 .RS 4n
@@ -2809,18 +2809,6 @@ will be much better if the filesystem uses a dedup-capable checksum (eg.
2809 2809
 .sp
2810 2810
 .ne 2
2811 2811
 .na
2812  
-\fB\fB-r\fR\fR
2813  
-.ad
2814  
-.sp .6
2815  
-.RS 4n
2816  
-Recursively send all descendant snapshots.  This is similar to the \fB-R\fR
2817  
-flag, but information about deleted and renamed datasets is not included, and
2818  
-property information is only included if the \fB-p\fR flag is specified.
2819  
-.RE
2820  
-
2821  
-.sp
2822  
-.ne 2
2823  
-.na
2824 2812
 \fB\fB-p\fR\fR
2825 2813
 .ad
2826 2814
 .sp .6
2  usr/src/prototypes/README
@@ -17,5 +17,5 @@ CDDL version 1.0 for each new file introduced in illumos.
17 17
  */
18 18
 
19 19
 /*
20  
- * Copyright 2010 <contributor>.  All rights reserved.
  20
+ * Copyright 2012 <contributor>.  All rights reserved.
21 21
  */
2  usr/src/prototypes/prototype.Makefile
@@ -10,6 +10,6 @@
10 10
 #
11 11
 
12 12
 #
13  
-# Copyright 2011 <contributor>.  All rights reserved.
  13
+# Copyright 2012 <contributor>.  All rights reserved.
14 14
 #
15 15
 
2  usr/src/prototypes/prototype.c
@@ -10,7 +10,7 @@
10 10
  */
11 11
 
12 12
 /*
13  
- * Copyright 2011 <contributor>.  All rights reserved.
  13
+ * Copyright 2012 <contributor>.  All rights reserved.
14 14
  */
15 15
 
16 16
 /*
2  usr/src/prototypes/prototype.csh
@@ -12,6 +12,6 @@
12 12
 #
13 13
 
14 14
 #
15  
-# Copyright 2011 <contributor>.  All rights reserved.
  15
+# Copyright 2012 <contributor>.  All rights reserved.
16 16
 #
17 17
 
2  usr/src/prototypes/prototype.h
@@ -10,7 +10,7 @@
10 10
  */
11 11
 
12 12
 /*
13  
- * Copyright 2011 <contributor>.  All rights reserved.
  13
+ * Copyright 2012 <contributor>.  All rights reserved.
14 14
  */
15 15
 
16 16
 #ifndef _PROTOTYPE_H
2  usr/src/prototypes/prototype.java
@@ -10,7 +10,7 @@
10 10
  */
11 11
 
12 12
 /*
13  
- * Copyright 2011 <contributor>.  All rights reserved.
  13
+ * Copyright 2012 <contributor>.  All rights reserved.
14 14
  */
15 15
 
16 16
 /*
2  usr/src/prototypes/prototype.ksh
@@ -12,6 +12,6 @@
12 12
 #
13 13
 
14 14
 #
15  
-# Copyright 2011 <contributor>.  All rights reserved.
  15
+# Copyright 2012 <contributor>.  All rights reserved.
16 16
 #
17 17
 
3  usr/src/prototypes/prototype.man
... ...
@@ -1,4 +1,3 @@
1  
-'\" t
2 1
 .\"
3 2
 .\" This file and its contents are supplied under the terms of the
4 3
 .\" Common Development and Distribution License ("CDDL"), version 1.0.
@@ -10,5 +9,5 @@
10 9
 .\" http://www.illumos.org/license/CDDL.
11 10
 .\"
12 11
 .\"
13  
-.\" Copyright 2011 <contributor>.  All rights reserved.
  12
+.\" Copyright 2012 <contributor>.  All rights reserved.
14 13
 .\"
2  usr/src/prototypes/prototype.mapfile-vers
@@ -10,7 +10,7 @@
10 10
 #
11 11
 
12 12
 #
13  
-# Copyright 2011 <contributor>.  All rights reserved.
  13
+# Copyright 2012 <contributor>.  All rights reserved.
14 14
 #
15 15
 
16 16
 #
2  usr/src/prototypes/prototype.pl
@@ -11,7 +11,7 @@
11 11
 #
12 12
 
13 13
 #
14  
-# Copyright 2011 <contributor>.  All rights reserved.
  14
+# Copyright 2012 <contributor>.  All rights reserved.
15 15
 #
16 16
 
17 17
 #
2  usr/src/prototypes/prototype.py
@@ -11,7 +11,7 @@
11 11
 #
12 12
 
13 13
 #
14  
-# Copyright 2011 <contributor>.  All rights reserved.
  14
+# Copyright 2012 <contributor>.  All rights reserved.
15 15
 #
16 16
 
17 17
 #
2  usr/src/prototypes/prototype.s
@@ -10,7 +10,7 @@
10 10
  */
11 11
 
12 12
 /*
13  
- * Copyright 2011 <contributor>.  All rights reserved.
  13
+ * Copyright 2012 <contributor>.  All rights reserved.
14 14
  */
15 15
 
16 16
 	.file	"prototype.s"
2  usr/src/prototypes/prototype.sh
@@ -12,6 +12,6 @@
12 12
 #
13 13
 
14 14
 #
15  
-# Copyright 2011 <contributor>.  All rights reserved.
  15
+# Copyright 2012 <contributor>.  All rights reserved.
16 16
 #
17 17
 
40  usr/src/uts/common/fs/vfs.c
@@ -935,29 +935,33 @@ vfs_mountroot(void)
935 935
 	}
936 936
 #endif /* __sparc */
937 937
 
938  
-	/*
939  
-	 * Look up the root device via devfs so that a dv_node is
940  
-	 * created for it. The vnode is never VN_RELE()ed.
941  
-	 * We allocate more than MAXPATHLEN so that the
942  
-	 * buffer passed to i_ddi_prompath_to_devfspath() is
943  
-	 * exactly MAXPATHLEN (the function expects a buffer
944  
-	 * of that length).
945  
-	 */
946  
-	plen = strlen("/devices");
947  
-	path = kmem_alloc(plen + MAXPATHLEN, KM_SLEEP);
948  
-	(void) strcpy(path, "/devices");
  938
+	if (strcmp(rootfs.bo_fstype, "zfs") != 0) {
  939
+		/*
  940
+		 * Look up the root device via devfs so that a dv_node is
  941
+		 * created for it. The vnode is never VN_RELE()ed.
  942
+		 * We allocate more than MAXPATHLEN so that the
  943
+		 * buffer passed to i_ddi_prompath_to_devfspath() is
  944
+		 * exactly MAXPATHLEN (the function expects a buffer
  945
+		 * of that length).
  946
+		 */
  947
+		plen = strlen("/devices");
  948
+		path = kmem_alloc(plen + MAXPATHLEN, KM_SLEEP);
  949
+		(void) strcpy(path, "/devices");
949 950
 
950  
-	if (i_ddi_prompath_to_devfspath(rootfs.bo_name, path + plen)
951  
-	    != DDI_SUCCESS ||
952  
-	    lookupname(path, UIO_SYSSPACE, FOLLOW, NULLVPP, &rvp)) {
  951
+		if (i_ddi_prompath_to_devfspath(rootfs.bo_name, path + plen)
  952
+		    != DDI_SUCCESS ||
  953
+		    lookupname(path, UIO_SYSSPACE, FOLLOW, NULLVPP, &rvp)) {
953 954
 
954  
-		/* NUL terminate in case "path" has garbage */
955  
-		path[plen + MAXPATHLEN - 1] = '\0';
  955
+			/* NUL terminate in case "path" has garbage */
  956
+			path[plen + MAXPATHLEN - 1] = '\0';
956 957
 #ifdef	DEBUG
957  
-		cmn_err(CE_WARN, "!Cannot lookup root device: %s", path);
  958
+			cmn_err(CE_WARN, "!Cannot lookup root device: %s",
  959
+			    path);
958 960
 #endif
  961
+		}
  962
+		kmem_free(path, plen + MAXPATHLEN);
959 963
 	}
960  
-	kmem_free(path, plen + MAXPATHLEN);
  964
+
961 965
 	vfs_mnttabvp_setup();
962 966
 }
963 967
 

0 notes on commit bde2df3

Please sign in to comment.
Something went wrong with that request. Please try again.