diff options
author | joerg <joerg@FreeBSD.org> | 2002-01-18 22:42:51 +0000 |
---|---|---|
committer | joerg <joerg@FreeBSD.org> | 2002-01-18 22:42:51 +0000 |
commit | e217fe7a602f2ea7daa3257c52780298a91e83e1 (patch) | |
tree | b974d770b5957a2ed08a58d057bf58656790fb08 /sbin | |
parent | c164ff4992228f32c032b8da4b932320d1fd9572 (diff) | |
download | FreeBSD-src-e217fe7a602f2ea7daa3257c52780298a91e83e1.zip FreeBSD-src-e217fe7a602f2ea7daa3257c52780298a91e83e1.tar.gz |
By popular demand, also include the "devlist" subcommand into the set
of commands available in the boot floppy environment.
MFC after: 1 week
Diffstat (limited to 'sbin')
-rw-r--r-- | sbin/camcontrol/camcontrol.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/sbin/camcontrol/camcontrol.c b/sbin/camcontrol/camcontrol.c index 5ca2e5b..b3ebc97 100644 --- a/sbin/camcontrol/camcontrol.c +++ b/sbin/camcontrol/camcontrol.c @@ -125,7 +125,9 @@ struct camcontrol_opts option_table[] = { {"command", CAM_ARG_SCSI_CMD, scsicmd_opts}, {"defects", CAM_ARG_READ_DEFECTS, readdefect_opts}, {"defectlist", CAM_ARG_READ_DEFECTS, readdefect_opts}, +#endif /* MINIMALISTIC */ {"devlist", CAM_ARG_DEVTREE, NULL}, +#ifndef MINIMALISTIC {"periphlist", CAM_ARG_DEVLIST, NULL}, {"modepage", CAM_ARG_MODE_PAGE, "bdelm:P:"}, {"tags", CAM_ARG_TAG, "N:q"}, @@ -271,6 +273,7 @@ getdevlist(struct cam_device *device) return(error); } +#endif /* MINIMALISTIC */ static int getdevtree(void) @@ -435,6 +438,7 @@ getdevtree(void) return(error); } +#ifndef MINIMALISTIC static int testunitready(struct cam_device *device, int retry_count, int timeout, int quiet) @@ -3118,8 +3122,8 @@ usage(int verbose) { fprintf(verbose ? stdout : stderr, "usage: camcontrol <command> [device id][generic args][command args]\n" -#ifndef MINIMALISTIC " camcontrol devlist [-v]\n" +#ifndef MINIMALISTIC " camcontrol periphlist [dev_id][-n dev_name] [-u unit]\n" " camcontrol tur [dev_id][generic args]\n" " camcontrol inquiry [dev_id][generic args] [-D] [-S] [-R]\n" @@ -3442,9 +3446,11 @@ main(int argc, char **argv) case CAM_ARG_DEVLIST: error = getdevlist(cam_dev); break; +#endif /* MINIMALISTIC */ case CAM_ARG_DEVTREE: error = getdevtree(); break; +#ifndef MINIMALISTIC case CAM_ARG_TUR: error = testunitready(cam_dev, retry_count, timeout, 0); break; |