From: deraadt <deraadt@openbsd.org>
Date: Sat, 8 Apr 2000 05:06:24 +0000 (+0000)
Subject: 2.7-beta
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=2db9671b2b8b774664997a0cb53369c0c5b0e33a;p=openbsd

2.7-beta
---

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 4fc201e0510..1bc555582b3 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$OpenBSD: install.sub,v 1.149 2000/03/19 01:14:03 espie Exp $
+#	$OpenBSD: install.sub,v 1.150 2000/04/08 05:06:25 deraadt Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997,1998 Todd Miller, Theo de Raadt
@@ -69,7 +69,7 @@
 #	OpenBSD installation/upgrade script - common subroutines.
 
 ROOTDISK=				# filled in below
-VERSION=26
+VERSION=27
 VERSION_MAJOR=$(( $VERSION / 10 ))
 VERSION_MINOR=$(( $VERSION % 10 ))
 export VERSION VERSION_MAJOR VERSION_MINOR
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 45baf8797cc..a61aec0b89a 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.21 1999/09/23 08:25:01 deraadt Exp $
+#	$OpenBSD: sys.mk,v 1.22 2000/04/08 05:06:25 deraadt Exp $
 #	$NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -10,7 +10,7 @@
 
 unix=		We run OpenBSD.
 OSMAJOR=	2
-OSMINOR=	6
+OSMINOR=	7
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index a4f380ea74f..de649e59bce 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.18 2000/02/05 12:24:12 espie Exp $
+.\"	$OpenBSD: doc-common,v 1.19 2000/04/08 05:06:25 deraadt Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -197,7 +197,7 @@
 .de Os
 .ds oS Null
 .if "\\$1"" \{\
-.	ds oS OpenBSD 2.6
+.	ds oS OpenBSD 2.7
 .\}
 .if "\\$2"" \{\
 .	ds aa Non-Null
@@ -253,6 +253,7 @@
 .	if "\\$2"2.4"  .as oS \02.4
 .	if "\\$2"2.5"  .as oS \02.5
 .	if "\\$2"2.6"  .as oS \02.6
+.	if "\\$2"2.7"  .as oS \02.7
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index f20d350acfa..03605f736e7 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.22 1999/11/27 20:51:48 deraadt Exp $
+#	$OpenBSD: newvers.sh,v 1.23 2000/04/08 05:06:25 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -62,7 +62,7 @@ id=`basename ${d}`
 #
 
 ost="OpenBSD"
-osr="2.6"
+osr="2.7"
 
 echo "char ostype[] = \"${ost}\";" > vers.c
 echo "char osrelease[] = \"${osr}\";" >> vers.c
@@ -70,7 +70,7 @@ echo "char osversion[] = \"${id}#${v}\";" >> vers.c
 echo "char sccs[8] = { ' ', ' ', ' ', ' ', '@', '(', '#', ')' };" >> vers.c
 echo \
   "char version[] = \
-    \"${ost} ${osr}-current (${id}) #${v}: ${t}\\n    ${u}@${h}:${d}\\n\";" \
+    \"${ost} ${osr}-beta (${id}) #${v}: ${t}\\n    ${u}@${h}:${d}\\n\";" \
   >> vers.c
 
 echo `expr ${v} + 1` > version
diff --git a/sys/sys/param.h b/sys/sys/param.h
index a971af102ec..cf5a9418cdd 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.27 2000/01/14 23:37:21 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.28 2000/04/08 05:06:24 deraadt Exp $	*/
 /*	$NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $	*/
 
 /*-
@@ -45,8 +45,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	199912		/* OpenBSD version (year & month). */
-#define OpenBSD2_6 1		/* OpenBSD 2.6 */
+#define OpenBSD	200006		/* OpenBSD version (year & month). */
+#define OpenBSD2_7 1		/* OpenBSD 2.7 */
 
 #ifndef NULL
 #ifdef 	__GNUG__