summaryrefslogtreecommitdiff
path: root/src/gpt-auto-generator
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-03-10 20:35:52 +0100
committerLennart Poettering <lennart@poettering.net>2014-03-10 20:35:52 +0100
commit1b9e5b126359a2a2ec37de1f94f046093abc74b8 (patch)
treee2183ca0b1cb09c1d3e789ffd68e25220cf451cd /src/gpt-auto-generator
parent79fbcd8869f5d2d0236f7272bf45ba6b3d4abbea (diff)
nspawn: add --image= switch to boot GPT disk images that follow the Discoverable Partitions Specification
Diffstat (limited to 'src/gpt-auto-generator')
-rw-r--r--src/gpt-auto-generator/gpt-auto-generator.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gpt-auto-generator/gpt-auto-generator.c b/src/gpt-auto-generator/gpt-auto-generator.c
index 67d0f2a5b9..be91977de9 100644
--- a/src/gpt-auto-generator/gpt-auto-generator.c
+++ b/src/gpt-auto-generator/gpt-auto-generator.c
@@ -44,15 +44,13 @@
#include "gpt.h"
#include "fileio.h"
#include "efivars.h"
+#include "blkid-util.h"
static const char *arg_dest = "/tmp";
static bool arg_enabled = true;
static bool arg_root_enabled = true;
static bool arg_root_rw = false;
-DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe);
-#define _cleanup_blkid_free_probe_ _cleanup_(blkid_free_probep)
-
static int add_swap(const char *path) {
_cleanup_free_ char *name = NULL, *unit = NULL, *lnk = NULL;
_cleanup_fclose_ FILE *f = NULL;
@@ -464,7 +462,7 @@ static int enumerate_partitions(dev_t devnum) {
if (errno == 0)
return log_oom();
- log_error("Failed to list of partitions of %s: %m", node);
+ log_error("Failed to list partitions of %s: %m", node);
return -errno;
}