diff options
| author | sjelinek <none@none> | 2005-10-27 09:01:18 -0700 |
|---|---|---|
| committer | sjelinek <none@none> | 2005-10-27 09:01:18 -0700 |
| commit | 3e1bd7a2aaeb6188caef90679b98088cfef1edc6 (patch) | |
| tree | f96d6ce4a25ea39514dd8b1fd2a23978cabc5055 /usr/src/cmd/format/main.c | |
| parent | 108322fb1c3ed341aba9c80c9774df0ed9e35768 (diff) | |
| download | illumos-joyent-3e1bd7a2aaeb6188caef90679b98088cfef1edc6.tar.gz | |
PSARC 2004/776 device checking for fs utilities
PSARC 2005/461 Device in use checking environment variables
5084421 libdiskmgt needs to detect in use ZFS data
5085739 remove workaround for bug 4725434
6194015 Device in use checking for Solaris utilities-PSARC/2004/776
6261853 libdiskmgt does not work correctly in all cases on amd64
6268374 libdiskmgt allocates incorrect size for readdir_r() dirent argument
6291309 PSARC/2005/461 - libdiskmgt should enable bypassing of inuse checking
6301815 PSARC/2005/461-Need Sun private libdiskmgt flag for use during install to disable sysevent starting
--HG--
rename : usr/src/cmd/format/checkmount.c => usr/src/cmd/format/checkdev.c
rename : usr/src/cmd/format/checkmount.h => usr/src/cmd/format/checkdev.h
Diffstat (limited to 'usr/src/cmd/format/main.c')
| -rw-r--r-- | usr/src/cmd/format/main.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/usr/src/cmd/format/main.c b/usr/src/cmd/format/main.c index 242fc7bb6d..79735841a5 100644 --- a/usr/src/cmd/format/main.c +++ b/usr/src/cmd/format/main.c @@ -25,7 +25,6 @@ */ #pragma ident "%Z%%M% %I% %E% SMI" - /* * This file contains the main entry point of the program and other * routines relating to the general flow. @@ -54,7 +53,7 @@ #include "menu_command.h" #include "menu_partition.h" #include "prompts.h" -#include "checkmount.h" +#include "checkdev.h" #include "label.h" extern struct menu_item menu_command[]; @@ -541,6 +540,13 @@ Continue")) err_print("Warning: Current Disk has mounted partitions.\n"); /* + * If any part of this device is also part of an SVM, VxVM or + * Live Upgrade device, print a warning. + */ + (void) checkdevinuse(cur_disk->disk_name, (diskaddr_t)-1, + (diskaddr_t)-1, 1, 0); + + /* * Get the Solaris Fdisk Partition information */ (void) copy_solaris_part(&cur_disk->fdisk_part); |