X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=blobdiff_plain;f=discover%2Fdevmapper.c;h=d3179f14e7fcc52c9eb71e487ac80250e44fbf05;hp=b3639320aecba713734d247fe2dc93948d9d5dd3;hb=b3d51f6ec5d077e6a2068fde0631074a7302b1da;hpb=754c0737db6b7337f1d3b40e6e52d9c3abec954f

diff --git a/discover/devmapper.c b/discover/devmapper.c
index b363932..d3179f1 100644
--- a/discover/devmapper.c
+++ b/discover/devmapper.c
@@ -6,21 +6,22 @@
 
 #include "libdevmapper.h"
 #include "devmapper.h"
+#include "platform.h"
 
 #define MERGE_INTERVAL_US	200000
 
 struct target {
-	long unsigned int	start_sector;
-	long unsigned int	end_sector;
-	char			*ttype;
-	char			*params;
+	uint64_t	start_sector;
+	uint64_t	end_sector;
+	char		*ttype;
+	char		*params;
 };
 
 /* Return the number of sectors on a block device. Zero represents an error */
-static unsigned int get_block_sectors(struct discover_device *device)
+static uint64_t get_block_sectors(struct discover_device *device)
 {
+	unsigned long long sectors;
 	const char *tmp;
-	long unsigned int sectors;
 
 	tmp = discover_device_get_param(device, "ID_PART_ENTRY_SIZE");
 	if (!tmp) {
@@ -30,27 +31,36 @@ static unsigned int get_block_sectors(struct discover_device *device)
 	}
 
 	errno = 0;
-	sectors = strtoul(tmp, NULL, 0);
+	sectors = strtoull(tmp, NULL, 0);
 	if (errno) {
 		pb_debug("Error reading sector count for %s: %s\n",
 		       device->device_path, strerror(errno));
 		sectors = 0;
 	}
 
-	return sectors;
+	return (uint64_t)sectors;
 }
 
-/* Petitboot's libdm isn't compiled with --enable-udev_sync, so we set
- * empty cookie and flags unconditionally */
+/*
+ * The system's libdm may or may not have udev sync support. Tell libdm
+ * to manage the creation of device nodes itself rather than waiting on udev
+ * to do it
+ */
 static inline int set_cookie(struct dm_task *task, uint32_t *cookie)
 {
+	uint16_t udev_rules = 0;
 	*cookie = 0;
-	return dm_task_set_cookie(task, cookie, 0);
+
+	dm_udev_set_sync_support(0);
+	udev_rules |= DM_UDEV_DISABLE_DM_RULES_FLAG |
+		DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG;
+
+	return dm_task_set_cookie(task, cookie, udev_rules);
 }
 
 static bool snapshot_merge_complete(const char *dm_name)
 {
-	long long unsigned int sectors, meta_sectors;
+	uint64_t sectors, meta_sectors;
 	char *params = NULL,  *target_type = NULL;
 	uint64_t start, length;
 	struct dm_task *task;
@@ -87,14 +97,16 @@ static bool snapshot_merge_complete(const char *dm_name)
 
 	/* Merge is complete when metadata sectors are the only sectors
 	 * allocated - see Documentation/device-mapper/snapshot.txt */
-	n = sscanf(params, "%llu/%*u %llu", &sectors, &meta_sectors);
+	n = sscanf(params, "%" SCNu64 "/%*u %" SCNu64,
+			&sectors, &meta_sectors);
 	if (n != 2) {
 		pb_log("%s unexpected status: '%s'\n", dm_name, params);
 		goto out;
 	}
 	result = sectors == meta_sectors;
 
-	pb_debug("%s merging; %llu sectors, %llu metadata sectors\n",
+	pb_debug("%s merging; %" PRIu64 " sectors, %" PRIu64
+			" metadata sectors\n",
 		 dm_name, sectors, meta_sectors);
 
 out:
@@ -311,6 +323,9 @@ int devmapper_init_snapshot(struct device_handler *handler,
 {
 	struct ramdisk_device *ramdisk;
 
+	if (config_get()->disable_snapshots)
+		return 0;
+
 	ramdisk = device_handler_get_ramdisk(handler);
 	if (!ramdisk) {
 		pb_log("No ramdisk available for snapshot %s\n",