From df9c3708e5fcd5b28edbff26d81487146c8fa279 Mon Sep 17 00:00:00 2001 From: Thierry Vignaud <thierry.vignaud@gmail.com> Date: Tue, 5 Jul 2016 18:11:03 +0200 Subject: [PATCH] cfdisk: default to /dev/vda in virt enviroments this way, cfdisk defaults to a nice default disk whether the machine has /dev/[hsv]da --- disk-utils/cfdisk.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/disk-utils/cfdisk.c b/disk-utils/cfdisk.c index c0a4c72..b869626 100644 --- a/disk-utils/cfdisk.c +++ b/disk-utils/cfdisk.c @@ -69,6 +69,7 @@ #else # define DEFAULT_DEVICE "/dev/sda" # define ALTERNATE_DEVICE "/dev/hda" +# define ALTERNATE_DEVICE2 "/dev/vda" #endif #define ARROW_CURSOR_STRING ">> " @@ -2595,7 +2596,13 @@ int main(int argc, char *argv[]) if (optind == argc) diskpath = access(DEFAULT_DEVICE, F_OK) == 0 ? - DEFAULT_DEVICE : ALTERNATE_DEVICE; + DEFAULT_DEVICE : +#ifdef ALTERNATE_DEVICE2 + access(ALTERNATE_DEVICE2, F_OK) == 0 ? + ALTERNATE_DEVICE2 : +#endif + ALTERNATE_DEVICE; + else diskpath = argv[optind]; -- 2.9.0