diff options
author | peter <peter@FreeBSD.org> | 1999-11-09 07:20:22 +0000 |
---|---|---|
committer | peter <peter@FreeBSD.org> | 1999-11-09 07:20:22 +0000 |
commit | d21ff337ef6afcb755ed17f6ff18b87e1aae70b9 (patch) | |
tree | 6fbb16f3111ebb24e8552e3d95f48c9a77119882 /usr.sbin/config/config.y | |
parent | d4a804e4d3d89846a9fbb9ea620f73342535bd25 (diff) | |
download | FreeBSD-src-d21ff337ef6afcb755ed17f6ff18b87e1aae70b9.zip FreeBSD-src-d21ff337ef6afcb755ed17f6ff18b87e1aae70b9.tar.gz |
Re-support "tape" as an alias for device and clean up a bit more cruft
left over from the original system (d_dk was for preassigned iostat unit
numbers for disks)
Diffstat (limited to 'usr.sbin/config/config.y')
-rw-r--r-- | usr.sbin/config/config.y | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/usr.sbin/config/config.y b/usr.sbin/config/config.y index 5c6d1da..2217b59 100644 --- a/usr.sbin/config/config.y +++ b/usr.sbin/config/config.y @@ -32,6 +32,7 @@ %token PORT %token PSEUDO_DEVICE %token SEMICOLON +%token TAPE %token TARGET %token TTY %token UNIT @@ -309,7 +310,15 @@ Device_spec: DEVICE Dev_name Dev_info = { cur.d_type = DEVICE; } | DISK Dev_name Dev_info - = { cur.d_dk = 1; cur.d_type = DEVICE; } | + = { + warnx("line %d: Obsolete keyword 'disk' found - use 'device'", yyline); + cur.d_type = DEVICE; + } | + TAPE Dev_name Dev_info + = { + warnx("line %d: Obsolete keyword 'tape' found - use 'device'", yyline); + cur.d_type = DEVICE; + } | CONTROLLER Dev_name Dev_info = { cur.d_type = CONTROLLER; } | PSEUDO_DEVICE Init_dev Dev @@ -536,7 +545,7 @@ init_dev(dp) dp->d_conn = 0; dp->d_conflicts = 0; dp->d_disabled = 0; - dp->d_flags = dp->d_dk = 0; + dp->d_flags = 0; dp->d_slave = dp->d_lun = dp->d_target = dp->d_drive = dp->d_unit = \ dp->d_count = UNKNOWN; dp->d_port = (char *)0; |