Killed TIMEZONE, DST, and HZ keywords. They have generated a config error

for more than a year now. They've been replaced with userland methods for
changing (see adjkerntz).

1 files changed, 0 insertions, 41 deletions

diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y
index fb3ede0..221e388 100644
--- a/usr.sbin/config/config.y
+++ b/usr.sbin/config/config.y
@@ -20,11 +20,9 @@
 %token	DISK
 %token	DRIVE
 %token	DRQ
-%token	DST
 %token	DUMPS
 %token	EQUALS
 %token	FLAGS
-%token	HZ
 %token	IDENT
 %token	INTERLEAVE
 %token	IOMEM
@@ -51,7 +49,6 @@
 %token	SLAVE
 %token	SWAP
 %token	TARGET
-%token	TIMEZONE
 %token	TTY
 %token	TRACE
 %token	UNIT
@@ -198,32 +195,6 @@ Config_spec:
 	      = { ident = ns($2); } |
 	System_spec
 		|
-	HZ NUMBER
-	      = { yyerror("HZ specification obsolete; delete"); } |
-	TIMEZONE NUMBER
-	      = { zone = 60 * $2; check_tz(); } |
-	TIMEZONE NUMBER DST NUMBER
-	      = { zone = 60 * $2; dst = $4; check_tz(); } |
-	TIMEZONE NUMBER DST
-	      = { zone = 60 * $2; dst = 1; check_tz(); } |
-	TIMEZONE FPNUMBER
-	      = { zone = $2; check_tz(); } |
-	TIMEZONE FPNUMBER DST NUMBER
-	      = { zone = $2; dst = $4; check_tz(); } |
-	TIMEZONE FPNUMBER DST
-	      = { zone = $2; dst = 1; check_tz(); } |
-	TIMEZONE MINUS NUMBER
-	      = { zone = -60 * $3; check_tz(); } |
-	TIMEZONE MINUS NUMBER DST NUMBER
-	      = { zone = -60 * $3; dst = $5; check_tz(); } |
-	TIMEZONE MINUS NUMBER DST
-	      = { zone = -60 * $3; dst = 1; check_tz(); } |
-	TIMEZONE MINUS FPNUMBER
-	      = { zone = -$3; check_tz(); } |
-	TIMEZONE MINUS FPNUMBER DST NUMBER
-	      = { zone = -$3; dst = $5; check_tz(); } |
-	TIMEZONE MINUS FPNUMBER DST
-	      = { zone = -$3; dst = 1; check_tz(); } |
 	MAXUSERS NUMBER
 	      = { maxusers = $2; };
 
@@ -969,18 +940,6 @@ check_nexus(dev, num)
 }
 
 /*
- * Check the timezone to make certain it is sensible
- */
-
-check_tz()
-{
-	if (zone != 0 || dst != 0)
-		yyerror("timezone specification is no longer permitted");
-	else
-		hadtz = 1;
-}
-
-/*
  * Check system specification and apply defaulting
  * rules on root, argument, dump, and swap devices.
  */