--- a/usr/src/cmd/sulogin/sulogin.c	Fri Jun 14 19:45:37 2013 +0100
+++ b/usr/src/cmd/sulogin/sulogin.c	Tue Jun 18 19:32:00 2013 +0100
@@ -18,6 +18,11 @@
  *
  * CDDL HEADER END
  */
+
+/*
+ * Copyright 2013 Nexenta Systems, Inc. All rights reserved.
+ */
+
 /*
  * Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
  * Use is subject to license terms.
@@ -75,6 +80,7 @@
 #include <nss_dbdefs.h>
 #include <user_attr.h>
 #include <sys/vt.h>
+#include <sys/kd.h>
 
 /*
  * Intervals to sleep after failed login
@@ -442,7 +448,7 @@
 static void
 main_loop(char *devname, boolean_t cttyflag)
 {
-	int		fd, i;
+	int		fd, fb, i;
 	char		*user = NULL;		/* authorized user */
 	char		*pass;			/* password from user */
 	char		*cpass;			/* crypted password */
@@ -478,6 +484,12 @@
 	if (fd > 2)
 		(void) close(fd);
 
+	/* Stop progress bar and reset console mode to text */
+	if ((fb = open("/dev/fb", O_RDONLY)) >= 0) {
+		(void) ioctl(fb, KDSETMODE, KD_RESETTEXT);
+		(void) close(fb);
+	}
+
 	sysmsgfd = fopen("/dev/sysmsg", "w");
 
 	sanitize_tty(fileno(stdin));

--- a/usr/src/uts/common/os/cred.c	Fri Jun 14 19:45:37 2013 +0100
+++ b/usr/src/uts/common/os/cred.c	Tue Jun 18 19:32:00 2013 +0100
@@ -19,6 +19,9 @@
  * CDDL HEADER END
  */
 /*
+ * Copyright (c) 2013, Ira Cooper.  All rights reserved.
+ */
+/*
  * Copyright (c) 1989, 2010, Oracle and/or its affiliates. All rights reserved.
  */
 
@@ -1440,6 +1443,7 @@
 	}
 	mem->crg_ref = 1;
 	mem->crg_ngroups = n;
+	qsort(mem->crg_groups, n, sizeof (gid_t), gidcmp);
 	return (mem);
 }
 

--- a/usr/src/uts/common/os/logsubr.c	Fri Jun 14 19:45:37 2013 +0100
+++ b/usr/src/uts/common/os/logsubr.c	Tue Jun 18 19:32:00 2013 +0100
@@ -246,7 +246,7 @@
 	/*
 	 * Now that logging is enabled, emit the SunOS banner.
 	 */
-	printf("\rOpenIndiana Build %s %u-bit (illumos a7a845e4bf)\n",
+	printf("\rOpenIndiana Build %s %u-bit (illumos b77dfcc836)\n",
 	    utsname.version, NBBY * (uint_t)sizeof (void *));
 	printf("SunOS Release %s - Copyright 1983-2010 Oracle and/or its "
 	    "affiliates.\n", utsname.release);