From 83da2a90ae9b8200da464698fd59d08ccdeb6952 Mon Sep 17 00:00:00 2001 From: Poul-Henning Kamp Date: Fri, 9 Mar 2001 20:05:06 +0000 Subject: [PATCH] 1) If mdconfig isn't given an action argument, it assumes detach. 2) Running `mdconfig -l` without any attached devices results in mdconfig printing "md0" to standard output. Submitted by: dd [1] [1] no, not "dd(1)" but "Dima Dorfman" --- sbin/mdconfig/mdconfig.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/sbin/mdconfig/mdconfig.c b/sbin/mdconfig/mdconfig.c index 231133f205b..6ce0e139429 100644 --- a/sbin/mdconfig/mdconfig.c +++ b/sbin/mdconfig/mdconfig.c @@ -164,15 +164,16 @@ main(int argc, char **argv) i = ioctl(fd, MDIOCATTACH, &mdio); if (i < 0) err(1, "ioctl(/dev/%s)", MDCTL_NAME); - } else { + if (mdio.md_options & MD_AUTOUNIT) + printf("%s%d\n", MD_NAME, mdio.md_unit); + } else if (action == DETACH) { if (mdio.md_options & MD_AUTOUNIT) usage(); i = ioctl(fd, MDIOCDETACH, &mdio); if (i < 0) err(1, "ioctl(/dev/%s)", MDCTL_NAME); - } - if (mdio.md_options & MD_AUTOUNIT) - printf("%s%d\n", MD_NAME, mdio.md_unit); + } else + usage(); close (fd); return (0); }