X-Git-Url: http://git.annexia.org/?p=libguestfs.git;a=blobdiff_plain;f=daemon%2Fblockdev.c;h=3df1807dc53d84ff02114613107b6a7dfd4efc5a;hp=094ad5e6fac8ec927ed5e420e92348d7092973be;hb=21c42e9fabf6cea3d564e338a314479ef120502a;hpb=e038597ebd1e43c83a8ddde21c4f1898eb7a9a98 diff --git a/daemon/blockdev.c b/daemon/blockdev.c index 094ad5e..3df1807 100644 --- a/daemon/blockdev.c +++ b/daemon/blockdev.c @@ -1,5 +1,5 @@ /* libguestfs - the guestfsd daemon - * Copyright (C) 2009 Red Hat Inc. + * Copyright (C) 2009 Red Hat Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -38,7 +38,7 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints) int64_t rv; char *out, *err; const char *argv[] = { - "/sbin/blockdev", + "blockdev", switc, NULL, NULL, @@ -46,8 +46,6 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints) }; char buf[64]; - IS_DEVICE (device, -1); - if (extraarg > 0) { snprintf (buf, sizeof buf, "%d", extraarg); argv[2] = buf; @@ -68,7 +66,7 @@ call_blockdev (const char *device, const char *switc, int extraarg, int prints) if (prints) { if (sscanf (out, "%" SCNi64, &rv) != 1) { - reply_with_error ("%s: expected output, but got nothing"); + reply_with_error ("%s: expected output, but got nothing", argv[0]); free (out); return -1; } @@ -113,7 +111,7 @@ int do_blockdev_setbsz (const char *device, int blocksize) { if (blocksize <= 0 /* || blocksize >= what? */) { - reply_with_error ("blockdev_setbsz: blocksize must be > 0"); + reply_with_error ("blocksize must be > 0"); return -1; } return (int) call_blockdev (device, "--setbsz", blocksize, 0);