chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
networkctl: remove unused variable
[elogind.git]
/
src
/
gpt-auto-generator
/
gpt-auto-generator.c
diff --git
a/src/gpt-auto-generator/gpt-auto-generator.c
b/src/gpt-auto-generator/gpt-auto-generator.c
index 19c5eea9de2fc24a5a97cb3589d77d08f20d39c7..32e9b78a1dc4e97ddb81aac01fb5929a28942408 100644
(file)
--- a/
src/gpt-auto-generator/gpt-auto-generator.c
+++ b/
src/gpt-auto-generator/gpt-auto-generator.c
@@
-68,10
+68,8
@@
static int add_swap(const char *path) {
return log_oom();
f = fopen(unit, "wxe");
return log_oom();
f = fopen(unit, "wxe");
- if (!f) {
- log_error("Failed to create unit file %s: %m", unit);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
@@
-83,25
+81,21
@@
static int add_swap(const char *path) {
path);
fflush(f);
path);
fflush(f);
- if (ferror(f)) {
- log_error("Failed to write unit file %s: %m", unit);
- return -errno;
- }
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write unit file %s: %m", unit);
lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
if (!lnk)
return log_oom();
mkdir_parents_label(lnk, 0755);
lnk = strjoin(arg_dest, "/" SPECIAL_SWAP_TARGET ".wants/", name, NULL);
if (!lnk)
return log_oom();
mkdir_parents_label(lnk, 0755);
- if (symlink(unit, lnk) < 0) {
- log_error("Failed to create symlink %s: %m", lnk);
- return -errno;
- }
+ if (symlink(unit, lnk) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
return 0;
}
return 0;
}
-static int add_cryptsetup(const char *id, const char *what, char **device) {
+static int add_cryptsetup(const char *id, const char *what,
bool rw,
char **device) {
_cleanup_free_ char *e = NULL, *n = NULL, *p = NULL, *d = NULL, *to = NULL;
_cleanup_fclose_ FILE *f = NULL;
char *from, *ret;
_cleanup_free_ char *e = NULL, *n = NULL, *p = NULL, *d = NULL, *to = NULL;
_cleanup_fclose_ FILE *f = NULL;
char *from, *ret;
@@
-124,14
+118,12
@@
static int add_cryptsetup(const char *id, const char *what, char **device) {
return log_oom();
p = strjoin(arg_dest, "/", n, NULL);
return log_oom();
p = strjoin(arg_dest, "/", n, NULL);
- if (!
n
)
+ if (!
p
)
return log_oom();
f = fopen(p, "wxe");
return log_oom();
f = fopen(p, "wxe");
- if (!f) {
- log_error("Failed to create unit file %s: %m", p);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to create unit file %s: %m", p);
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
@@
-144,22
+136,19
@@
static int add_cryptsetup(const char *id, const char *what, char **device) {
"Before=umount.target cryptsetup.target\n"
"After=%s\n"
"IgnoreOnIsolate=true\n"
"Before=umount.target cryptsetup.target\n"
"After=%s\n"
"IgnoreOnIsolate=true\n"
- "After=systemd-readahead-collect.service systemd-readahead-replay.service\n\n"
"[Service]\n"
"Type=oneshot\n"
"RemainAfterExit=yes\n"
"TimeoutSec=0\n" /* the binary handles timeouts anyway */
"[Service]\n"
"Type=oneshot\n"
"RemainAfterExit=yes\n"
"TimeoutSec=0\n" /* the binary handles timeouts anyway */
- "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s'\n"
+ "ExecStart=" SYSTEMD_CRYPTSETUP_PATH " attach '%s' '%s'
'' '%s'
\n"
"ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
d, d,
"ExecStop=" SYSTEMD_CRYPTSETUP_PATH " detach '%s'\n",
d, d,
- id, what,
+ id, what,
rw ? "" : "read-only",
id);
fflush(f);
id);
fflush(f);
- if (ferror(f)) {
- log_error("Failed to write file %s: %m", p);
- return -errno;
- }
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write file %s: %m", p);
from = strappenda("../", n);
from = strappenda("../", n);
@@
-168,10
+157,8
@@
static int add_cryptsetup(const char *id, const char *what, char **device) {
return log_oom();
mkdir_parents_label(to, 0755);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
free(to);
to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
free(to);
to = strjoin(arg_dest, "/cryptsetup.target.requires/", n, NULL);
@@
-179,10
+166,8
@@
static int add_cryptsetup(const char *id, const char *what, char **device) {
return log_oom();
mkdir_parents_label(to, 0755);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
free(to);
to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
free(to);
to = strjoin(arg_dest, "/dev-mapper-", e, ".device.requires/", n, NULL);
@@
-190,10
+175,8
@@
static int add_cryptsetup(const char *id, const char *what, char **device) {
return log_oom();
mkdir_parents_label(to, 0755);
return log_oom();
mkdir_parents_label(to, 0755);
- if (symlink(from, to) < 0) {
- log_error("Failed to create symlink %s: %m", to);
- return -errno;
- }
+ if (symlink(from, to) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", to);
free(p);
p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL);
free(p);
p = strjoin(arg_dest, "/dev-mapper-", e, ".device.d/50-job-timeout-sec-0.conf", NULL);
@@
-205,10
+188,8
@@
static int add_cryptsetup(const char *id, const char *what, char **device) {
"# Automatically generated by systemd-gpt-auto-generator\n\n"
"[Unit]\n"
"JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */
"# Automatically generated by systemd-gpt-auto-generator\n\n"
"[Unit]\n"
"JobTimeoutSec=0\n"); /* the binary handles timeouts anyway */
- if (r < 0) {
- log_error("Failed to write device drop-in: %s", strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to write device drop-in: %m");
ret = strappend("/dev/mapper/", id);
if (!ret)
ret = strappend("/dev/mapper/", id);
if (!ret)
@@
-223,7
+204,7
@@
static int add_mount(
const char *what,
const char *where,
const char *fstype,
const char *what,
const char *where,
const char *fstype,
-
const char *options
,
+
bool rw
,
const char *description,
const char *post) {
const char *description,
const char *post) {
@@
-240,7
+221,7
@@
static int add_mount(
if (streq_ptr(fstype, "crypto_LUKS")) {
if (streq_ptr(fstype, "crypto_LUKS")) {
- r = add_cryptsetup(id, what, &crypto_what);
+ r = add_cryptsetup(id, what,
rw,
&crypto_what);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-257,10
+238,8
@@
static int add_mount(
return log_oom();
f = fopen(p, "wxe");
return log_oom();
f = fopen(p, "wxe");
- if (!f) {
- log_error("Failed to create unit file %s: %m", unit);
- return -errno;
- }
+ if (!f)
+ return log_error_errno(errno, "Failed to create unit file %s: %m", unit);
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
@@
-286,14
+265,11
@@
static int add_mount(
if (fstype)
fprintf(f, "Type=%s\n", fstype);
if (fstype)
fprintf(f, "Type=%s\n", fstype);
- if (options)
- fprintf(f, "Options=%s\n", options);
+ fprintf(f, "Options=%s\n", rw ? "rw" : "ro");
fflush(f);
fflush(f);
- if (ferror(f)) {
- log_error("Failed to write unit file %s: %m", p);
- return -errno;
- }
+ if (ferror(f))
+ return log_error_errno(errno, "Failed to write unit file %s: %m", p);
if (post) {
lnk = strjoin(arg_dest, "/", post, ".requires/", unit, NULL);
if (post) {
lnk = strjoin(arg_dest, "/", post, ".requires/", unit, NULL);
@@
-301,10
+277,8
@@
static int add_mount(
return log_oom();
mkdir_parents_label(lnk, 0755);
return log_oom();
mkdir_parents_label(lnk, 0755);
- if (symlink(p, lnk) < 0) {
- log_error("Failed to create symlink %s: %m", lnk);
- return -errno;
- }
+ if (symlink(p, lnk) < 0)
+ return log_error_errno(errno, "Failed to create symlink %s: %m", lnk);
}
return 0;
}
return 0;
@@
-314,6
+288,7
@@
static int probe_and_add_mount(
const char *id,
const char *what,
const char *where,
const char *id,
const char *what,
const char *where,
+ bool rw,
const char *description,
const char *post) {
const char *description,
const char *post) {
@@
-340,7
+315,7
@@
static int probe_and_add_mount(
if (!b) {
if (errno == 0)
return log_oom();
if (!b) {
if (errno == 0)
return log_oom();
- log_error
(
"Failed to allocate prober: %m");
+ log_error
_errno(errno,
"Failed to allocate prober: %m");
return -errno;
}
return -errno;
}
@@
-354,7
+329,7
@@
static int probe_and_add_mount(
else if (r != 0) {
if (errno == 0)
errno = EIO;
else if (r != 0) {
if (errno == 0)
errno = EIO;
- log_error
(
"Failed to probe %s: %m", what);
+ log_error
_errno(errno,
"Failed to probe %s: %m", what);
return -errno;
}
return -errno;
}
@@
-365,7
+340,7
@@
static int probe_and_add_mount(
what,
where,
fstype,
what,
where,
fstype,
-
NULL
,
+
rw
,
description,
post);
}
description,
post);
}
@@
-381,6
+356,7
@@
static int enumerate_partitions(dev_t devnum) {
struct udev_device *parent = NULL;
const char *node, *pttype, *devtype;
int home_nr = -1, srv_nr = -1;
struct udev_device *parent = NULL;
const char *node, *pttype, *devtype;
int home_nr = -1, srv_nr = -1;
+ bool home_rw = true, srv_rw = true;
blkid_partlist pl;
int r, k;
dev_t pn;
blkid_partlist pl;
int r, k;
dev_t pn;
@@
-394,22
+370,30
@@
static int enumerate_partitions(dev_t devnum) {
return log_oom();
parent = udev_device_get_parent(d);
return log_oom();
parent = udev_device_get_parent(d);
- if (!parent)
+ if (!parent) {
+ log_debug("Not a partitioned device, ignoring.");
return 0;
return 0;
+ }
/* Does it have a devtype? */
devtype = udev_device_get_devtype(parent);
/* Does it have a devtype? */
devtype = udev_device_get_devtype(parent);
- if (!devtype)
+ if (!devtype) {
+ log_debug("Parent doesn't have a device type, ignoring.");
return 0;
return 0;
+ }
/* Is this a disk or a partition? We only care for disks... */
/* Is this a disk or a partition? We only care for disks... */
- if (!streq(devtype, "disk"))
+ if (!streq(devtype, "disk")) {
+ log_debug("Parent isn't a raw disk, ignoring.");
return 0;
return 0;
+ }
/* Does it have a device node? */
node = udev_device_get_devnode(parent);
/* Does it have a device node? */
node = udev_device_get_devnode(parent);
- if (!node)
+ if (!node) {
+ log_debug("Parent device does not have device node, ignoring.");
return 0;
return 0;
+ }
log_debug("Root device %s.", node);
log_debug("Root device %s.", node);
@@
-423,12
+407,10
@@
static int enumerate_partitions(dev_t devnum) {
if (errno == 0)
return log_oom();
if (errno == 0)
return log_oom();
- log_error
(
"Failed allocate prober: %m");
+ log_error
_errno(errno,
"Failed allocate prober: %m");
return -errno;
}
return -errno;
}
- blkid_probe_enable_superblocks(b, 1);
- blkid_probe_set_superblocks_flags(b, BLKID_SUBLKS_TYPE);
blkid_probe_enable_partitions(b, 1);
blkid_probe_set_partitions_flags(b, BLKID_PARTS_ENTRY_DETAILS);
blkid_probe_enable_partitions(b, 1);
blkid_probe_set_partitions_flags(b, BLKID_PARTS_ENTRY_DETAILS);
@@
-439,7
+421,7
@@
static int enumerate_partitions(dev_t devnum) {
else if (r != 0) {
if (errno == 0)
errno = EIO;
else if (r != 0) {
if (errno == 0)
errno = EIO;
- log_error
(
"Failed to probe %s: %m", node);
+ log_error
_errno(errno,
"Failed to probe %s: %m", node);
return -errno;
}
return -errno;
}
@@
-448,13
+430,15
@@
static int enumerate_partitions(dev_t devnum) {
if (r != 0) {
if (errno == 0)
errno = EIO;
if (r != 0) {
if (errno == 0)
errno = EIO;
- log_error
(
"Failed to determine partition table type of %s: %m", node);
+ log_error
_errno(errno,
"Failed to determine partition table type of %s: %m", node);
return -errno;
}
/* We only do this all for GPT... */
return -errno;
}
/* We only do this all for GPT... */
- if (!streq_ptr(pttype, "gpt"))
+ if (!streq_ptr(pttype, "gpt")) {
+ log_debug("Not a GPT partition table, ignoring.");
return 0;
return 0;
+ }
errno = 0;
pl = blkid_probe_get_partitions(b);
errno = 0;
pl = blkid_probe_get_partitions(b);
@@
-462,7
+446,7
@@
static int enumerate_partitions(dev_t devnum) {
if (errno == 0)
return log_oom();
if (errno == 0)
return log_oom();
- log_error
(
"Failed to list partitions of %s: %m", node);
+ log_error
_errno(errno,
"Failed to list partitions of %s: %m", node);
return -errno;
}
return -errno;
}
@@
-479,10
+463,8
@@
static int enumerate_partitions(dev_t devnum) {
return log_oom();
r = udev_enumerate_scan_devices(e);
return log_oom();
r = udev_enumerate_scan_devices(e);
- if (r < 0) {
- log_error("Failed to enumerate partitions on %s: %s", node, strerror(-r));
- return r;
- }
+ if (r < 0)
+ return log_error_errno(r, "Failed to enumerate partitions on %s: %m", node);
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
@@
-492,6
+474,7
@@
static int enumerate_partitions(dev_t devnum) {
blkid_partition pp;
dev_t qn;
int nr;
blkid_partition pp;
dev_t qn;
int nr;
+ unsigned long long flags;
q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
if (!q)
q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
if (!q)
@@
-515,6
+498,13
@@
static int enumerate_partitions(dev_t devnum) {
if (!pp)
continue;
if (!pp)
continue;
+ flags = blkid_partition_get_flags(pp);
+
+ /* Ignore partitions that are not marked for automatic
+ * mounting on discovery */
+ if (flags & GPT_FLAG_NO_AUTO)
+ continue;
+
nr = blkid_partition_get_partno(pp);
if (nr < 0)
continue;
nr = blkid_partition_get_partno(pp);
if (nr < 0)
continue;
@@
-528,6
+518,11
@@
static int enumerate_partitions(dev_t devnum) {
if (sd_id128_equal(type_id, GPT_SWAP)) {
if (sd_id128_equal(type_id, GPT_SWAP)) {
+ if (flags & GPT_FLAG_READ_ONLY) {
+ log_debug("%s marked as read-only swap partition, which is bogus, ignoring.", subnode);
+ continue;
+ }
+
k = add_swap(subnode);
if (k < 0)
r = k;
k = add_swap(subnode);
if (k < 0)
r = k;
@@
-539,6
+534,7
@@
static int enumerate_partitions(dev_t devnum) {
continue;
home_nr = nr;
continue;
home_nr = nr;
+ home_rw = !(flags & GPT_FLAG_READ_ONLY),
free(home);
home = strdup(subnode);
free(home);
home = strdup(subnode);
@@
-552,6
+548,7
@@
static int enumerate_partitions(dev_t devnum) {
continue;
srv_nr = nr;
continue;
srv_nr = nr;
+ srv_rw = !(flags & GPT_FLAG_READ_ONLY),
free(srv);
srv = strdup(node);
free(srv);
srv = strdup(node);
@@
-561,13
+558,13
@@
static int enumerate_partitions(dev_t devnum) {
}
if (home) {
}
if (home) {
- k = probe_and_add_mount("home", home, "/home", "Home Partition", SPECIAL_LOCAL_FS_TARGET);
+ k = probe_and_add_mount("home", home, "/home",
home_rw,
"Home Partition", SPECIAL_LOCAL_FS_TARGET);
if (k < 0)
r = k;
}
if (srv) {
if (k < 0)
r = k;
}
if (srv) {
- k = probe_and_add_mount("srv", srv, "/srv", "Server Data Partition", SPECIAL_LOCAL_FS_TARGET);
+ k = probe_and_add_mount("srv", srv, "/srv",
srv_rw,
"Server Data Partition", SPECIAL_LOCAL_FS_TARGET);
if (k < 0)
r = k;
}
if (k < 0)
r = k;
}
@@
-657,8
+654,8
@@
static int parse_proc_cmdline_item(const char *key, const char *value) {
r = parse_boolean(value);
if (r < 0)
log_warning("Failed to parse gpt-auto switch %s. Ignoring.", value);
r = parse_boolean(value);
if (r < 0)
log_warning("Failed to parse gpt-auto switch %s. Ignoring.", value);
-
- arg_enabled = r;
+ else
+
arg_enabled = r;
} else if (streq(key, "root") && value) {
} else if (streq(key, "root") && value) {
@@
-671,8
+668,6
@@
static int parse_proc_cmdline_item(const char *key, const char *value) {
arg_root_rw = true;
else if (streq(key, "ro") && !value)
arg_root_rw = false;
arg_root_rw = true;
else if (streq(key, "ro") && !value)
arg_root_rw = false;
- else if (startswith(key, "systemd.gpt-auto.") || startswith(key, "rd.systemd.gpt-auto."))
- log_warning("Unknown kernel switch %s. Ignoring.", key);
return 0;
}
return 0;
}
@@
-691,10
+686,8
@@
static int add_root_mount(void) {
if (r == -ENOENT) {
log_debug("EFI loader partition unknown, exiting.");
return 0;
if (r == -ENOENT) {
log_debug("EFI loader partition unknown, exiting.");
return 0;
- } else if (r < 0) {
- log_error("Failed to read ESP partition UUID: %s", strerror(-r));
- return r;
- }
+ } else if (r < 0)
+ return log_error_errno(r, "Failed to read ESP partition UUID: %m");
/* OK, we have an ESP partition, this is fantastic, so let's
* wait for a root device to show up. A udev rule will create
/* OK, we have an ESP partition, this is fantastic, so let's
* wait for a root device to show up. A udev rule will create
@@
-705,7
+698,7
@@
static int add_root_mount(void) {
"/dev/gpt-auto-root",
in_initrd() ? "/sysroot" : "/",
NULL,
"/dev/gpt-auto-root",
in_initrd() ? "/sysroot" : "/",
NULL,
- arg_root_rw
? "rw" : "ro"
,
+ arg_root_rw,
"Root Partition",
in_initrd() ? SPECIAL_INITRD_ROOT_FS_TARGET : SPECIAL_LOCAL_FS_TARGET);
#else
"Root Partition",
in_initrd() ? SPECIAL_INITRD_ROOT_FS_TARGET : SPECIAL_LOCAL_FS_TARGET);
#else
@@
-718,10
+711,9
@@
static int add_mounts(void) {
int r;
r = get_block_device("/", &devno);
int r;
r = get_block_device("/", &devno);
- if (r < 0) {
- log_error("Failed to determine block device of root file system: %s", strerror(-r));
- return r;
- } else if (r == 0) {
+ if (r < 0)
+ return log_error_errno(r, "Failed to determine block device of root file system: %m");
+ else if (r == 0) {
log_debug("Root file system not on a (single) block device.");
return 0;
}
log_debug("Root file system not on a (single) block device.");
return 0;
}
@@
-751,8
+743,9
@@
int main(int argc, char *argv[]) {
return EXIT_SUCCESS;
}
return EXIT_SUCCESS;
}
- if (parse_proc_cmdline(parse_proc_cmdline_item) < 0)
- return EXIT_FAILURE;
+ r = parse_proc_cmdline(parse_proc_cmdline_item);
+ if (r < 0)
+ log_warning_errno(r, "Failed to parse kernel command line, ignoring: %m");
if (!arg_enabled) {
log_debug("Disabled, exiting.");
if (!arg_enabled) {
log_debug("Disabled, exiting.");