diff options
| author | Karel Zak | 2016-07-07 15:02:20 +0200 |
|---|---|---|
| committer | Karel Zak | 2016-07-07 15:02:20 +0200 |
| commit | 6e51ab0c5cabe63ee1b5b7577ed91b46358a5eab (patch) | |
| tree | af45aa39789dc7fc134f8342df86d494ec079252 /disk-utils/cfdisk.c | |
| parent | libblkid: ignore extended partition at zero offset (diff) | |
| download | kernel-qcow2-util-linux-6e51ab0c5cabe63ee1b5b7577ed91b46358a5eab.tar.gz kernel-qcow2-util-linux-6e51ab0c5cabe63ee1b5b7577ed91b46358a5eab.tar.xz kernel-qcow2-util-linux-6e51ab0c5cabe63ee1b5b7577ed91b46358a5eab.zip | |
cfisk: add /dev/vda as another default disk
And use array for all default alternative disks.
Reported-by: Thierry Vignaud <thierry.vignaud@gmail.com>
Signed-off-by: Karel Zak <kzak@redhat.com>
Diffstat (limited to 'disk-utils/cfdisk.c')
| -rw-r--r-- | disk-utils/cfdisk.c | 36 |
1 files changed, 23 insertions, 13 deletions
diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index c0a4c72a2..495741fe3 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -60,16 +60,19 @@ #include "debug.h" #include "list.h" +static const char *default_disks[] = { #ifdef __GNU__ -# define DEFAULT_DEVICE "/dev/hd0" -# define ALTERNATE_DEVICE "/dev/sd0" + "/dev/hd0", + "/dev/sd0", #elif defined(__FreeBSD__) -# define DEFAULT_DEVICE "/dev/ad0" -# define ALTERNATE_DEVICE "/dev/da0" + "/dev/ad0", + "/dev/da0", #else -# define DEFAULT_DEVICE "/dev/sda" -# define ALTERNATE_DEVICE "/dev/hda" + "/dev/sda", + "/dev/vda", + "/dev/hda", #endif +}; #define ARROW_CURSOR_STRING ">> " #define ARROW_CURSOR_DUMMY " " @@ -2544,7 +2547,7 @@ static void __attribute__ ((__noreturn__)) usage(FILE *out) int main(int argc, char *argv[]) { - const char *diskpath; + const char *diskpath = NULL; int rc, c, colormode = UL_COLORMODE_UNDEF; struct cfdisk _cf = { .lines_idx = 0 }, *cf = &_cf; @@ -2593,18 +2596,25 @@ int main(int argc, char *argv[]) fdisk_set_ask(cf->cxt, ask_callback, (void *) cf); - if (optind == argc) - diskpath = access(DEFAULT_DEVICE, F_OK) == 0 ? - DEFAULT_DEVICE : ALTERNATE_DEVICE; - else + if (optind == argc) { + size_t i; + + for (i = 0; i < ARRAY_SIZE(default_disks); i++) { + if (access(default_disks[i], F_OK) == 0) { + diskpath = default_disks[i]; + break; + } + } + if (!diskpath) + diskpath = default_disks[0]; /* default, used for "cannot open" */ + } else diskpath = argv[optind]; rc = fdisk_assign_device(cf->cxt, diskpath, 0); if (rc == -EACCES) rc = fdisk_assign_device(cf->cxt, diskpath, 1); if (rc != 0) - err(EXIT_FAILURE, _("cannot open %s"), - optind == argc ? DEFAULT_DEVICE : diskpath); + err(EXIT_FAILURE, _("cannot open %s"), diskpath); /* Don't use err(), warn() from this point */ ui_init(cf); |