From 82d71480b3c112fa91f04032225eda15dfe22e17 Mon Sep 17 00:00:00 2001 From: sjelinek Date: Tue, 13 Dec 2005 10:24:52 -0800 Subject: 6349487 libdiskmgt should bypass all calls in dm_inuse when NOINUSE_CHECK is set 6359855 gcc still doesn't like cmd/fs.d/switchout.c 6354408 libdiskmgt needs to handle sysevent failures in miniroot or failsafe environments better 4896568 *mount* message for remounting read-only is bogus Contributed by Shawn Walker. 4995011 mountfs error timeout is 60ms instead of 60s Contributed by Jeremy Teo. --- usr/src/cmd/format/checkdev.c | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'usr/src/cmd/format') diff --git a/usr/src/cmd/format/checkdev.c b/usr/src/cmd/format/checkdev.c index 8310abe09c..2ed9774b13 100644 --- a/usr/src/cmd/format/checkdev.c +++ b/usr/src/cmd/format/checkdev.c @@ -283,6 +283,16 @@ checkdevinuse(char *cur_disk_path, diskaddr_t start, diskaddr_t end, int print, char *usage; char *name; + /* + * If the user does not want to do in use checking, return immediately. + * Normally, this is handled in libdiskmgt. For format, there is more + * processing required, so we want to bypass the in use checking + * here. + */ + + if (NOINUSE_SET) + return (0); + /* * For format, we get basic 'in use' details from libdiskmgt. After * that we must do the appropriate checking to see if the 'in use' -- cgit v1.2.3