summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuel Thibault <samuel.thibault@ens-lyon.org>2010-06-18 16:18:34 +0200
committerSamuel Thibault <samuel.thibault@ens-lyon.org>2010-06-18 16:18:34 +0200
commitc3f57e636d9456cce0e4274f5eb1f9fe44e4ffb9 (patch)
tree73eabb67fad79fef6dfa3d6152f41ced0333e239
parent592317250d5b75ed4cf225ac9387871329b81755 (diff)
Fix parted support
* libstore/Makefile (store-types): Add part. * libstore/part.c: Do not include <parted/device_gnu.h> (PED_SECTOR_SIZE): Define to PED_SECTOR_SIZE_DEFAULT if undefined. (store_part_create): Do not check value returned by ped_disk_destroy.
-rw-r--r--libstore/Makefile1
-rw-r--r--libstore/part.c7
2 files changed, 6 insertions, 2 deletions
diff --git a/libstore/Makefile b/libstore/Makefile
index f407ce61..2733119b 100644
--- a/libstore/Makefile
+++ b/libstore/Makefile
@@ -40,6 +40,7 @@ store-types = \
module \
mvol \
nbd \
+ part \
remap \
task \
zero
diff --git a/libstore/part.c b/libstore/part.c
index a1ddc5c0..439340be 100644
--- a/libstore/part.c
+++ b/libstore/part.c
@@ -25,11 +25,14 @@
#include <cthreads.h>
#include <parted/parted.h>
-#include <parted/device_gnu.h>
+/*#include <parted/device_gnu.h>*/
#include <string.h>
#include <error.h>
#define NEED_PARTED_VERSION "1.5.4"
+#ifndef PED_SECTOR_SIZE
+#define PED_SECTOR_SIZE PED_SECTOR_SIZE_DEFAULT
+#endif
/* Return a new store in STORE which contains a remap store of partition
PART from the contents of SOURCE; SOURCE is consumed. */
@@ -141,7 +144,7 @@ store_part_create (struct store *source, int index, int flags,
out_with_disk:
assert (ped_device_close (dev) != 0);
- assert (ped_disk_destroy (disk));
+ ped_disk_destroy (disk);
out_with_dev:
ped_device_destroy (dev);
out: