d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
for more than a year now. They've been replaced with userland methods for
changing (see adjkerntz).
This commit is contained in:
dg 1995-06-29 07:19:19 +00:00
parent cfb8597aa5
commit d4661f8c46
4 changed files with 1 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/config/config.h
View File

@ -210,8 +210,6 @@ int yyline;
struct file_list *ftab, *conf_list, **confp, *comp_list, **compp;
int zone, hadtz;
int dst;
int profiling;
int debugging;

41
usr.sbin/config/config.y
View File

@ -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; };
@ -968,18 +939,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.

3
usr.sbin/config/lang.l
View File

@ -66,10 +66,8 @@ struct kt {
#if MACHINE_I386
{ "drq", DRQ },
#endif MACHINE_I386
{ "dst", DST },
{ "dumps", DUMPS },
{ "flags", FLAGS },
{ "hz", HZ },
{ "ident", IDENT },
{ "interleave", INTERLEAVE },
#if MACHINE_I386
@ -107,7 +105,6 @@ struct kt {
#if MACHINE_I386
{ "tty", TTY },
#endif MACHINE_I386
{ "timezone", TIMEZONE },
{ "trace", TRACE },
{ "unit", UNIT },
{ "vector", VECTOR },

3
usr.sbin/config/mkmakefile.c
View File

@ -184,8 +184,7 @@ makefile()
maxusers = up->u_min;
} else if (maxusers > up->u_max)
printf("warning: maxusers > %d (%d)\n", up->u_max, maxusers);
fprintf(ofp, "PARAM=-DTIMEZONE=%d -DDST=%d -DMAXUSERS=%d\n",
zone, dst, maxusers);
fprintf(ofp, "PARAM=-DMAXUSERS=%d\n", maxusers);
if (loadaddress != -1) {
fprintf(ofp, "LOAD_ADDRESS=%X\n", loadaddress);
}