X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=daemon%2Fdevsparts.c;h=32d2fa82cfc8d7025dca3bde065367ec10645b54;hb=ca2b02887e268256ef6c66d6032571d3da70ff9c;hp=b0d79569ef57e16447a30894d1a08919f9b1a971;hpb=8e570870f577ff0c3db074f88924633b559af5d4;p=libguestfs.git

diff --git a/daemon/devsparts.c b/daemon/devsparts.c
index b0d7956..32d2fa8 100644
--- a/daemon/devsparts.c
+++ b/daemon/devsparts.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
@@ -45,7 +45,9 @@ do_list_devices (void)
   }
 
   while ((d = readdir (dir)) != NULL) {
-    if (strncmp (d->d_name, "sd", 2) == 0) {
+    if (strncmp (d->d_name, "sd", 2) == 0 ||
+	strncmp (d->d_name, "hd", 2) == 0 ||
+	strncmp (d->d_name, "vd", 2) == 0) {
       snprintf (buf, sizeof buf, "/dev/%s", d->d_name);
       if (add_string (&r, &size, &alloc, buf) == -1) {
 	closedir (dir);
@@ -85,7 +87,9 @@ do_list_partitions (void)
   }
 
   while ((d = readdir (dir)) != NULL) {
-    if (strncmp (d->d_name, "sd", 2) == 0) {
+    if (strncmp (d->d_name, "sd", 2) == 0 ||
+	strncmp (d->d_name, "hd", 2) == 0 ||
+	strncmp (d->d_name, "vd", 2) == 0) {
       strncpy (devname, d->d_name, sizeof devname);
       devname[sizeof devname - 1] = '\0';
 
@@ -131,3 +135,22 @@ do_list_partitions (void)
   sort_strings (r, size-1);
   return r;
 }
+
+int
+do_mkfs (char *fstype, char *device)
+{
+  char *err;
+  int r;
+
+  IS_DEVICE (device, -1);
+
+  r = command (NULL, &err, "/sbin/mkfs", "-t", fstype, device, NULL);
+  if (r == -1) {
+    reply_with_error ("mkfs: %s", err);
+    free (err);
+    return -1;
+  }
+
+  free (err);
+  return 0;
+}