Merge branch 'master' of http://github.com/illumos/illumos-gate into …

…gcc/upgrade

usr/src/cmd/beadm/beadm.c

@@ -133,8 +133,8 @@ usage(void)
 	    "\tbeadm destroy [-F] beName@snapshot \n"
 	    "\tbeadm list [[-a] | [-d] [-s]] [-H] [beName]\n"
 	    "\tbeadm mount [-s ro|rw] beName [mountpoint]\n"
-	    "\tbeadm unmount [-f] beName\n"
-	    "\tbeadm umount [-f] beName\n"
+	    "\tbeadm unmount [-f] beName | mountpoint\n"
+	    "\tbeadm umount [-f] beName | mountpoint\n"
 	    "\tbeadm rename origBeName newBeName\n"
 	    "\tbeadm rollback beName snapshot\n"
 	    "\tbeadm rollback beName@snapshot\n"));

usr/src/cmd/sgs/mcs/common/main.c

@@ -20,6 +20,8 @@
  */
 
 /*
+ * Copyright 2012 Nexenta Systems, Inc.  All rights reserved.
+ *
  *	Copyright (c) 1988 AT&T
  *	  All Rights Reserved
  *
@@ -43,15 +45,14 @@ static size_t optbufsz = OPTUNIT;
 static void usage(int);
 static void sigexit(int);
 static int setup_sectname(char *, int);
-static void check_swap();
 static void queue(int, char *);
 
 int
 main(int argc, char ** argv, char ** envp)
 {
 	const char	*opt;
 	char		*str;
-	int		error_count = 0, num_sect = 0, errflag = 0, Dflag = 0;
+	int		error_count = 0, num_sect = 0, errflag = 0;
 	int		c, i, my_prog;
 	Cmd_Info	*cmd_info;
 
@@ -72,10 +73,10 @@ main(int argc, char ** argv, char ** envp)
 
 	if (strcmp(str, "mcs") == 0) {
 		my_prog = MCS;
-		opt = "Da:cdn:pVz?";
+		opt = "a:cdn:pVz?";
 	} else if (strcmp(str, "strip") == 0) {
 		my_prog = STRIP;
-		opt = "DlxV?";
+		opt = "lxV?";
 	} else
 		exit(FAILURE);
 
@@ -108,10 +109,6 @@ main(int argc, char ** argv, char ** envp)
 
 	while ((c = getopt(argc, argv, (char *)opt)) != EOF) {
 		switch (c) {
-		case 'D':
-			optcnt++;
-			Dflag++;
-			break;
 		case 'a':
 			optcnt++;
 			queue(ACT_APPEND, optarg);
@@ -169,9 +166,6 @@ main(int argc, char ** argv, char ** envp)
 		exit(FAILURE);
 	}
 
-	if (Dflag)
-		check_swap();
-
 	/*
 	 * strip command may not take any options.
 	 */
@@ -235,8 +229,6 @@ main(int argc, char ** argv, char ** envp)
 		}
 	}
 
-	if (Dflag)
-		check_swap();
 	mcs_exit(error_count);
 	/*NOTREACHED*/
 	return (0);
@@ -372,9 +364,3 @@ sectcmp(char *name)
 	}
 	return (1);
 }
-
-static void
-check_swap()
-{
-	(void) system("/usr/sbin/swap -s");
-}

usr/src/cmd/wall/Makefile

@@ -21,13 +21,17 @@
 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
 # Use is subject to license terms.
 #
+# Copyright 2012 Joyent, Inc. All Rights Reserved.
+#
 
 PROG= wall
 
 include ../Makefile.cmd
 
 FILEMODE = 02555
 
+LDLIBS += -lzonecfg -lcontract
+
 .KEEP_STATE:
 
 all: $(PROG)