#include <unistd.h>
#include <stdlib.h>
#include <fcntl.h>
-#include <linux/btrfs.h>
#include <sys/ioctl.h>
#include <sys/statfs.h>
#include <blkid.h>
+#ifdef HAVE_LINUX_BTRFS_H
+#include <linux/btrfs.h>
+#endif
+
#include "path-util.h"
#include "util.h"
#include "mkdir.h"
static const char *arg_dest = "/tmp";
+static inline void blkid_free_probep(blkid_probe *b) {
+ if (*b)
+ blkid_free_probe(*b);
+}
+#define _cleanup_blkid_freep_probe_ _cleanup_(blkid_free_probep)
+
static int verify_gpt_partition(dev_t dev, sd_id128_t *type, unsigned *nr, char **fstype) {
_cleanup_free_ char *t = NULL;
- blkid_probe b = NULL;
+ _cleanup_blkid_freep_probe_ blkid_probe b = NULL;
const char *v;
int r;
errno = 0;
b = blkid_new_probe_from_filename(t);
- if (!b) {
- if (errno != 0)
- return -errno;
-
- return -ENOMEM;
- }
+ if (!b)
+ return errno != 0 ? -errno : -ENOMEM;
blkid_probe_enable_superblocks(b, 1);
blkid_probe_set_superblocks_flags(b, BLKID_SUBLKS_TYPE);
errno = 0;
r = blkid_do_safeprobe(b);
- if (r == -2) {
- r = -ENODEV;
- goto finish;
- } else if (r == 1) {
- r = -ENODEV;
- goto finish;
- } else if (r != 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
+ if (r == -2)
+ return -ENODEV;
+ else if (r == 1)
+ return -ENODEV;
+ else if (r != 0)
+ return errno ? -errno : -EIO;
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_SCHEME", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
+ if (r != 0)
+ /* return 0 if we're not on GPT */
+ return errno ? -errno : 0;
- if (strcmp(v, "gpt") != 0) {
- r = 0;
- goto finish;
- }
+ if (strcmp(v, "gpt") != 0)
+ return 0;
if (type) {
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_TYPE", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
+ if (r != 0)
+ return errno ? -errno : -EIO;
r = sd_id128_from_string(v, type);
if (r < 0)
if (nr) {
errno = 0;
r = blkid_probe_lookup_value(b, "PART_ENTRY_NUMBER", &v, NULL);
- if (r != 0) {
- r = errno ? -errno : -EIO;
- goto finish;
- }
+ if (r != 0)
+ return errno ? -errno : -EIO;
r = safe_atou(v, nr);
if (r < 0)
*fstype = NULL;
else {
fst = strdup(v);
- if (!fst) {
- r = -ENOMEM;
- goto finish;
- }
+ if (!fst)
+ return -ENOMEM;
*fstype = fst;
}
}
return 1;
-
-finish:
- if (b)
- blkid_free_probe(b);
-
- return r;
}
static int add_swap(const char *path, const char *fstype) {
"DefaultDependencies=no\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_SWAP_TARGET "\n\n"
- "[Mount]\n"
+ "[Swap]\n"
"What=%s\n",
path);
r = udev_enumerate_scan_devices(e);
if (r < 0) {
- log_error("Failed to enumerate partitions: %s", strerror(-r));
+ log_error("Failed to enumerate partitions on /dev/block/%u:%u: %s",
+ major(dev), minor(dev), strerror(-r));
goto finish;
}
struct udev_device *q;
sd_id128_t type_id;
unsigned nr;
+ dev_t sub;
q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
if (!q) {
goto finish;
}
- r = verify_gpt_partition(udev_device_get_devnum(q), &type_id, &nr, &fstype);
+ sub = udev_device_get_devnum(q);
+
+ r = verify_gpt_partition(sub, &type_id, &nr, &fstype);
if (r < 0) {
- log_error("Failed to verify GPT partition: %s", strerror(-r));
+ log_error("Failed to verify GPT partition /dev/block/%u:%u: %s",
+ major(sub), minor(sub), strerror(-r));
udev_device_unref(q);
goto finish;
}
if (statfs("/", &sfs) < 0)
return -errno;
- if (F_TYPE_CMP(sfs.f_type, BTRFS_SUPER_MAGIC))
+ if (F_TYPE_EQUAL(sfs.f_type, BTRFS_SUPER_MAGIC))
return get_btrfs_block_device(path, dev);
return 0;
return EXIT_SUCCESS;
}
- log_debug("Root device %u:%u.", major(dev), minor(dev));
+ log_debug("Root device /dev/block/%u:%u.", major(dev), minor(dev));
r = verify_gpt_partition(dev, NULL, NULL, NULL);
if (r < 0) {
- log_error("Failed to verify GPT partition: %s", strerror(-r));
+ log_error("Failed to verify GPT partition /dev/block/%u:%u: %s",
+ major(dev), minor(dev), strerror(-r));
return EXIT_FAILURE;
}
if (r == 0)