From owner-svn-src-all@FreeBSD.ORG  Sun Aug  5 17:04:59 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 1231C1065670;
	Sun,  5 Aug 2012 17:04:59 +0000 (UTC) (envelope-from ae@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id F10188FC12;
	Sun,  5 Aug 2012 17:04:58 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q75H4wdP005484;
	Sun, 5 Aug 2012 17:04:58 GMT (envelope-from ae@svn.freebsd.org)
Received: (from ae@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q75H4wB6005480;
	Sun, 5 Aug 2012 17:04:58 GMT (envelope-from ae@svn.freebsd.org)
Message-Id: <201208051704.q75H4wB6005480@svn.freebsd.org>
From: "Andrey V. Elsukov" <ae@FreeBSD.org>
Date: Sun, 5 Aug 2012 17:04:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r239073 - in head/sys/boot/userboot: . test userboot
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 05 Aug 2012 17:04:59 -0000

Author: ae
Date: Sun Aug  5 17:04:58 2012
New Revision: 239073
URL: http://svn.freebsd.org/changeset/base/239073

Log:
  Bump USERBOOT_VERSION.
  
  Requested by:	dfr

Modified:
  head/sys/boot/userboot/test/test.c
  head/sys/boot/userboot/userboot.h
  head/sys/boot/userboot/userboot/main.c

Modified: head/sys/boot/userboot/test/test.c
==============================================================================
--- head/sys/boot/userboot/test/test.c	Sun Aug  5 16:59:02 2012	(r239072)
+++ head/sys/boot/userboot/test/test.c	Sun Aug  5 17:04:58 2012	(r239073)
@@ -450,5 +450,5 @@ main(int argc, char** argv)
 	term.c_lflag &= ~(ICANON|ECHO);
 	tcsetattr(0, TCSAFLUSH, &term);
 
-	func(&cb, NULL, USERBOOT_VERSION_1, disk_fd >= 0);
+	func(&cb, NULL, USERBOOT_VERSION_2, disk_fd >= 0);
 }

Modified: head/sys/boot/userboot/userboot.h
==============================================================================
--- head/sys/boot/userboot/userboot.h	Sun Aug  5 16:59:02 2012	(r239072)
+++ head/sys/boot/userboot/userboot.h	Sun Aug  5 17:04:58 2012	(r239073)
@@ -30,6 +30,7 @@
  * USERBOOT interface versions
  */
 #define	USERBOOT_VERSION_1      1
+#define	USERBOOT_VERSION_2      2
 
 /*
  * Exit codes from the loader

Modified: head/sys/boot/userboot/userboot/main.c
==============================================================================
--- head/sys/boot/userboot/userboot/main.c	Sun Aug  5 16:59:02 2012	(r239072)
+++ head/sys/boot/userboot/userboot/main.c	Sun Aug  5 17:04:58 2012	(r239073)
@@ -36,6 +36,8 @@ __FBSDID("$FreeBSD$");
 #include "disk.h"
 #include "libuserboot.h"
 
+#define	USERBOOT_VERSION	USERBOOT_VERSION_2
+
 struct loader_callbacks_v1 *callbacks;
 void *callbacks_arg;
 
@@ -70,7 +72,7 @@ loader_main(struct loader_callbacks_v1 *
 	static char malloc[512*1024];
 	int i;
 
-        if (version != USERBOOT_VERSION_1)
+        if (version != USERBOOT_VERSION)
                 abort();
 
 	callbacks = cb;