Author: brucec
Date: Tue Nov 16 07:51:35 2010
New Revision: 215388
URL: http://svn.freebsd.org/changeset/base/215388
Log:
MFC r214073:
Stop disallowing device nodes to be passed to camcontrol(8) since libcam
already allows both device names and nodes to be specified.
Modified:
stable/8/sbin/camcontrol/camcontrol.8
stable/8/sbin/camcontrol/camcontrol.c
Directory Properties:
stable/8/sbin/camcontrol/ (props changed)
Modified: stable/8/sbin/camcontrol/camcontrol.8
==============================================================================
--- stable/8/sbin/camcontrol/camcontrol.8 Tue Nov 16 07:47:43 2010
(r215387)
+++ stable/8/sbin/camcontrol/camcontrol.8 Tue Nov 16 07:51:35 2010
(r215388)
@@ -207,9 +207,6 @@ A device identifier can take one of thre
.Bl -tag -width 14n
.It deviceUNIT
Specify a device name and unit number combination, like "da5" or "cd3".
-Note that character device node names (e.g.\& /dev/da0) are
-.Em not
-allowed here.
.It bus:target
Specify a bus number and target id.
The bus number can be determined from
Modified: stable/8/sbin/camcontrol/camcontrol.c
==============================================================================
--- stable/8/sbin/camcontrol/camcontrol.c Tue Nov 16 07:47:43 2010
(r215387)
+++ stable/8/sbin/camcontrol/camcontrol.c Tue Nov 16 07:51:35 2010
(r215388)
@@ -4607,15 +4607,7 @@ main(int argc, char **argv)
char name[30];
int rv;
- /*
- * First catch people who try to do things like:
- * camcontrol tur /dev/da0
- * camcontrol doesn't take device nodes as arguments.
- */
- if (argv[2][0] == '/') {
- warnx("%s is not a valid device identifier", argv[2]);
- errx(1, "please read the camcontrol(8) man page");
- } else if (isdigit(argv[2][0])) {
+ if (isdigit(argv[2][0])) {
/* device specified as bus:target[:lun] */
rv = parse_btl(argv[2], &bus, &target, &lun, &arglist);
if (rv < 2)
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
