chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
bus: make driverd code more similar to other daemons, and make it exit on idle among...
[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 5c0e455338f4c4b1a42cc2b07c1553612bfef09b..017c35dcd6414014745169e708296ee32946527f 100644
(file)
--- a/
src/gpt-auto-generator/gpt-auto-generator.c
+++ b/
src/gpt-auto-generator/gpt-auto-generator.c
@@
-24,7
+24,7
@@
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/statfs.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include <sys/statfs.h>
-#include <blkid.h>
+#include <blkid
/blkid
.h>
#ifdef HAVE_LINUX_BTRFS_H
#include <linux/btrfs.h>
#ifdef HAVE_LINUX_BTRFS_H
#include <linux/btrfs.h>
@@
-36,8
+36,10
@@
#include "missing.h"
#include "sd-id128.h"
#include "libudev.h"
#include "missing.h"
#include "sd-id128.h"
#include "libudev.h"
+#include "udev-util.h"
#include "special.h"
#include "unit-name.h"
#include "special.h"
#include "unit-name.h"
+#include "virt.h"
/* TODO:
*
/* TODO:
*
@@
-47,26
+49,21
@@
*
*/
*
*/
+#define GPT_SWAP SD_ID128_MAKE(06,57,fd,6d,a4,ab,43,c4,84,e5,09,33,c8,4b,4f,4f)
+#define GPT_HOME SD_ID128_MAKE(93,3a,c7,e1,2e,b4,4f,13,b8,44,0e,14,e2,ae,f9,15)
+
static const char *arg_dest = "/tmp";
static const char *arg_dest = "/tmp";
-static inline void blkid_free_probep(blkid_probe *b) {
- if (*b)
- blkid_free_probe(*b);
-}
+DEFINE_TRIVIAL_CLEANUP_FUNC(blkid_probe, blkid_free_probe);
#define _cleanup_blkid_freep_probe_ _cleanup_(blkid_free_probep)
#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;
+static int verify_gpt_partition(const char *node, sd_id128_t *type, unsigned *nr, char **fstype) {
_cleanup_blkid_freep_probe_ blkid_probe b = NULL;
const char *v;
int r;
_cleanup_blkid_freep_probe_ blkid_probe b = NULL;
const char *v;
int r;
- r = asprintf(&t, "/dev/block/%u:%u", major(dev), minor(dev));
- if (r < 0)
- return -ENOMEM;
-
errno = 0;
errno = 0;
- b = blkid_new_probe_from_filename(
t
);
+ b = blkid_new_probe_from_filename(
node
);
if (!b)
return errno != 0 ? -errno : -ENOMEM;
if (!b)
return errno != 0 ? -errno : -ENOMEM;
@@
-117,13
+114,13
@@
static int verify_gpt_partition(dev_t dev, sd_id128_t *type, unsigned *nr, char
if (fstype) {
if (fstype) {
- char *fst;
-
errno = 0;
r = blkid_probe_lookup_value(b, "TYPE", &v, NULL);
if (r != 0)
*fstype = NULL;
else {
errno = 0;
r = blkid_probe_lookup_value(b, "TYPE", &v, NULL);
if (r != 0)
*fstype = NULL;
else {
+ char *fst;
+
fst = strdup(v);
if (!fst)
return -ENOMEM;
fst = strdup(v);
if (!fst)
return -ENOMEM;
@@
-185,7
+182,7
@@
static int add_swap(const char *path, const char *fstype) {
}
static int add_home(const char *path, const char *fstype) {
}
static int add_home(const char *path, const char *fstype) {
- _cleanup_free_ char *unit = NULL, *lnk = NULL;
+ _cleanup_free_ char *unit = NULL, *lnk = NULL
, *fsck = NULL
;
_cleanup_fclose_ FILE *f = NULL;
if (dir_is_empty("/home") <= 0)
_cleanup_fclose_ FILE *f = NULL;
if (dir_is_empty("/home") <= 0)
@@
-203,19
+200,23
@@
static int add_home(const char *path, const char *fstype) {
return -errno;
}
return -errno;
}
+ fsck = unit_name_from_path_instance("systemd-fsck", path, ".service");
+ if (!fsck)
+ return log_oom();
+
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
"[Unit]\n"
"DefaultDependencies=no\n"
fprintf(f,
"# Automatically generated by systemd-gpt-auto-generator\n\n"
"[Unit]\n"
"DefaultDependencies=no\n"
- "After=" SPECIAL_LOCAL_FS_PRE_TARGET "\n"
+ "Requires=%s\n"
+ "After=" SPECIAL_LOCAL_FS_PRE_TARGET " %s\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_LOCAL_FS_TARGET "\n\n"
"[Mount]\n"
"What=%s\n"
"Where=/home\n"
"Conflicts=" SPECIAL_UMOUNT_TARGET "\n"
"Before=" SPECIAL_UMOUNT_TARGET " " SPECIAL_LOCAL_FS_TARGET "\n\n"
"[Mount]\n"
"What=%s\n"
"Where=/home\n"
- "Type=%s\n"
- "FsckPassNo=2\n",
- path, fstype);
+ "Type=%s\n",
+ fsck, fsck, path, fstype);
fflush(f);
if (ferror(f)) {
fflush(f);
if (ferror(f)) {
@@
-227,7
+228,6
@@
static int add_home(const char *path, const char *fstype) {
if (!lnk)
return log_oom();
if (!lnk)
return log_oom();
-
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink %s: %m", lnk);
mkdir_parents_label(lnk, 0755);
if (symlink(unit, lnk) < 0) {
log_error("Failed to create symlink %s: %m", lnk);
@@
-237,106
+237,81
@@
static int add_home(const char *path, const char *fstype) {
return 0;
}
return 0;
}
-static int enumerate_partitions(dev_t dev) {
- struct udev
*udev
;
- struct udev_enumerate *e = NULL;
-
struct udev_device *parent = NULL,
*d = NULL;
+static int enumerate_partitions(
struct udev *udev,
dev_t dev) {
+ struct udev
_device *parent = NULL
;
+
_cleanup_udev_enumerate_unref_
struct udev_enumerate *e = NULL;
+
_cleanup_udev_device_unref_ struct udev_device
*d = NULL;
struct udev_list_entry *first, *item;
unsigned home_nr = (unsigned) -1;
_cleanup_free_ char *home = NULL, *home_fstype = NULL;
int r;
struct udev_list_entry *first, *item;
unsigned home_nr = (unsigned) -1;
_cleanup_free_ char *home = NULL, *home_fstype = NULL;
int r;
- udev = udev_new();
- if (!udev)
- return log_oom();
-
e = udev_enumerate_new(udev);
e = udev_enumerate_new(udev);
- if (!e) {
- r = log_oom();
- goto finish;
- }
+ if (!e)
+ return log_oom();
d = udev_device_new_from_devnum(udev, 'b', dev);
d = udev_device_new_from_devnum(udev, 'b', dev);
- if (!d) {
- r = log_oom();
- goto finish;
- }
+ if (!d)
+ return log_oom();
parent = udev_device_get_parent(d);
parent = udev_device_get_parent(d);
- if (!parent) {
- r = log_oom();
- goto finish;
- }
+ if (!parent)
+ return log_oom();
r = udev_enumerate_add_match_parent(e, parent);
r = udev_enumerate_add_match_parent(e, parent);
- if (r < 0) {
- r = log_oom();
- goto finish;
- }
+ if (r < 0)
+ return log_oom();
r = udev_enumerate_add_match_subsystem(e, "block");
r = udev_enumerate_add_match_subsystem(e, "block");
- if (r < 0) {
- r = log_oom();
- goto finish;
- }
+ if (r < 0)
+ return log_oom();
r = udev_enumerate_scan_devices(e);
if (r < 0) {
log_error("Failed to enumerate partitions on /dev/block/%u:%u: %s",
major(dev), minor(dev), strerror(-r));
r = udev_enumerate_scan_devices(e);
if (r < 0) {
log_error("Failed to enumerate partitions on /dev/block/%u:%u: %s",
major(dev), minor(dev), strerror(-r));
-
goto finish
;
+
return r
;
}
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
_cleanup_free_ char *fstype = NULL;
const char *node = NULL;
}
first = udev_enumerate_get_list_entry(e);
udev_list_entry_foreach(item, first) {
_cleanup_free_ char *fstype = NULL;
const char *node = NULL;
- struct udev_device *q;
+
_cleanup_udev_device_unref_
struct udev_device *q;
sd_id128_t type_id;
unsigned nr;
sd_id128_t type_id;
unsigned nr;
- dev_t sub;
q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
q = udev_device_new_from_syspath(udev, udev_list_entry_get_name(item));
- if (!q) {
- r = log_oom();
- goto finish;
- }
+ if (!q)
+ return log_oom();
if (udev_device_get_devnum(q) == udev_device_get_devnum(d))
if (udev_device_get_devnum(q) == udev_device_get_devnum(d))
-
goto skip
;
+
continue
;
if (udev_device_get_devnum(q) == udev_device_get_devnum(parent))
if (udev_device_get_devnum(q) == udev_device_get_devnum(parent))
-
goto skip
;
+
continue
;
node = udev_device_get_devnode(q);
node = udev_device_get_devnode(q);
- if (!node) {
- r = log_oom();
- goto finish;
- }
-
- sub = udev_device_get_devnum(q);
+ if (!node)
+ return log_oom();
- r = verify_gpt_partition(
sub
, &type_id, &nr, &fstype);
+ r = verify_gpt_partition(
node
, &type_id, &nr, &fstype);
if (r < 0) {
if (r < 0) {
- log_error("Failed to verify GPT partition /dev/block/%u:%u: %s",
- major(sub), minor(sub), strerror(-r));
- udev_device_unref(q);
- goto finish;
+ log_error("Failed to verify GPT partition %s: %s",
+ node, strerror(-r));
+ return r;
}
if (r == 0)
}
if (r == 0)
-
goto skip
;
+
continue
;
- if (sd_id128_equal(type_id,
SD_ID128_MAKE(06,57,fd,6d,a4,ab,43,c4,84,e5,09,33,c8,4b,4f,4f)
))
+ if (sd_id128_equal(type_id,
GPT_SWAP
))
add_swap(node, fstype);
add_swap(node, fstype);
- else if (sd_id128_equal(type_id, SD_ID128_MAKE(93,3a,c7,e1,2e,b4,4f,13,b8,44,0e,14,e2,ae,f9,15))) {
-
+ else if (sd_id128_equal(type_id, GPT_HOME)) {
if (!home || nr < home_nr) {
free(home);
home = strdup(node);
if (!home || nr < home_nr) {
free(home);
home = strdup(node);
- if (!home) {
- r = log_oom();
- goto finish;
- }
+ if (!home)
+ return log_oom();
home_nr = nr;
home_nr = nr;
@@
-345,29
+320,16
@@
static int enumerate_partitions(dev_t dev) {
fstype = NULL;
}
}
fstype = NULL;
}
}
-
- skip:
- udev_device_unref(q);
}
if (home && home_fstype)
add_home(home, home_fstype);
}
if (home && home_fstype)
add_home(home, home_fstype);
-finish:
- if (d)
- udev_device_unref(d);
-
- if (e)
- udev_enumerate_unref(e);
-
- if (udev)
- udev_unref(udev);
-
return r;
}
static int get_btrfs_block_device(const char *path, dev_t *dev) {
return r;
}
static int get_btrfs_block_device(const char *path, dev_t *dev) {
- struct btrfs_ioctl_fs_info_args fsi;
+ struct btrfs_ioctl_fs_info_args fsi
= {}
;
_cleanup_close_ int fd = -1;
uint64_t id;
_cleanup_close_ int fd = -1;
uint64_t id;
@@
-378,7
+340,6
@@
static int get_btrfs_block_device(const char *path, dev_t *dev) {
if (fd < 0)
return -errno;
if (fd < 0)
return -errno;
- zero(fsi);
if (ioctl(fd, BTRFS_IOC_FS_INFO, &fsi) < 0)
return -errno;
if (ioctl(fd, BTRFS_IOC_FS_INFO, &fsi) < 0)
return -errno;
@@
-387,12
+348,11
@@
static int get_btrfs_block_device(const char *path, dev_t *dev) {
return 0;
for (id = 1; id <= fsi.max_id; id++) {
return 0;
for (id = 1; id <= fsi.max_id; id++) {
- struct btrfs_ioctl_dev_info_args di;
+ struct btrfs_ioctl_dev_info_args di = {
+ .devid = id,
+ };
struct stat st;
struct stat st;
- zero(di);
- di.devid = id;
-
if (ioctl(fd, BTRFS_IOC_DEV_INFO, &di) < 0) {
if (errno == ENODEV)
continue;
if (ioctl(fd, BTRFS_IOC_DEV_INFO, &di) < 0) {
if (errno == ENODEV)
continue;
@@
-434,19
+394,43
@@
static int get_block_device(const char *path, dev_t *dev) {
if (statfs("/", &sfs) < 0)
return -errno;
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 get_btrfs_block_device(path, dev);
return 0;
}
+static int devno_to_devnode(struct udev *udev, dev_t devno, char **ret) {
+ _cleanup_udev_device_unref_ struct udev_device *d;
+ const char *t;
+ char *n;
+
+ d = udev_device_new_from_devnum(udev, 'b', devno);
+ if (!d)
+ return log_oom();
+
+ t = udev_device_get_devnode(d);
+ if (!t)
+ return -ENODEV;
+
+ n = strdup(t);
+ if (!n)
+ return -ENOMEM;
+
+ *ret = n;
+ return 0;
+}
+
int main(int argc, char *argv[]) {
int main(int argc, char *argv[]) {
- dev_t dev;
- int r;
+ _cleanup_free_ char *node = NULL;
+ _cleanup_udev_unref_ struct udev *udev = NULL;
+ dev_t devno;
+ int r = 0;
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
if (argc > 1 && argc != 4) {
log_error("This program takes three or no arguments.");
- return EXIT_FAILURE;
+ r = -EINVAL;
+ goto finish;
}
if (argc > 1)
}
if (argc > 1)
@@
-458,31
+442,50
@@
int main(int argc, char *argv[]) {
umask(0022);
umask(0022);
- if (in_initrd())
- return EXIT_SUCCESS;
+ if (in_initrd()) {
+ log_debug("In initrd, exiting.");
+ goto finish;
+ }
+
+ if (detect_container(NULL) > 0) {
+ log_debug("In a container, exiting.");
+ goto finish;
+ }
- r = get_block_device("/", &dev);
+ r = get_block_device("/", &dev
no
);
if (r < 0) {
log_error("Failed to determine block device of root file system: %s", strerror(-r));
if (r < 0) {
log_error("Failed to determine block device of root file system: %s", strerror(-r));
-
return EXIT_FAILURE
;
+
goto finish
;
}
if (r == 0) {
log_debug("Root file system not on a (single) block device.");
}
if (r == 0) {
log_debug("Root file system not on a (single) block device.");
- return EXIT_SUCCESS;
+ goto finish;
+ }
+
+ udev = udev_new();
+ if (!udev) {
+ r = log_oom();
+ goto finish;
+ }
+
+ r = devno_to_devnode(udev, devno, &node);
+ if (r < 0) {
+ log_error("Failed to determine block device node from major/minor: %s", strerror(-r));
+ goto finish;
}
}
- log_debug("Root device
/dev/block/%u:%u.", major(dev), minor(dev)
);
+ log_debug("Root device
%s.", node
);
- r = verify_gpt_partition(
dev
, NULL, NULL, NULL);
+ r = verify_gpt_partition(
node
, NULL, NULL, NULL);
if (r < 0) {
if (r < 0) {
- log_error("Failed to verify GPT partition /dev/block/%u:%u: %s",
- major(dev), minor(dev), strerror(-r));
- return EXIT_FAILURE;
+ log_error("Failed to verify GPT partition %s: %s", node, strerror(-r));
+ goto finish;
}
if (r == 0)
}
if (r == 0)
-
return EXIT_SUCCESS
;
+
goto finish
;
- r = enumerate_partitions(
dev
);
+ r = enumerate_partitions(
udev, devno
);
+finish:
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
}