picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #4861 from keszybz/dissect-tweaks 

A prettification of the dissect code, mkosi and TODO updates
This commit is contained in:
Lennart Poettering 2016-12-11 20:09:04 +01:00 committed by GitHub
parent cb8ac9646f 0b6b2df80d
commit 280b29ac84
4 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.mkosi/mkosi.fedora
View File

@ -63,6 +63,7 @@ BuildPackages=
libxslt
lz4-devel
make
diffutils
pam-devel
pkgconfig
python3-devel

4
TODO
View File

@ -618,6 +618,10 @@ Features:
- maybe make copying of /etc/resolv.conf optional, and skip it if --read-only
is used
* dissect
- refuse mounting over a mount point
- automatically discover .roothash files in dissect, similarly to nspawn
* machined:
- add an API so that libvirt-lxc can inform us about network interfaces being
removed or added to an existing machine

14
src/dissect/dissect.c
View File

@ -95,21 +95,25 @@ static int parse_argv(int argc, char *argv[]) {
arg_flags |= DISSECT_IMAGE_READ_ONLY;
break;
case ARG_DISCARD:
case ARG_DISCARD: {
DissectImageFlags flags;
if (streq(optarg, "disabled"))
arg_flags &= ~(DISSECT_IMAGE_DISCARD_ON_LOOP|DISSECT_IMAGE_DISCARD|DISSECT_IMAGE_DISCARD_ON_CRYPTO);
flags = 0;
else if (streq(optarg, "loop"))
arg_flags = (arg_flags & ~(DISSECT_IMAGE_DISCARD|DISSECT_IMAGE_DISCARD_ON_CRYPTO)) | DISSECT_IMAGE_DISCARD_ON_LOOP;
flags = DISSECT_IMAGE_DISCARD_ON_LOOP;
else if (streq(optarg, "all"))
arg_flags = (arg_flags & ~(DISSECT_IMAGE_DISCARD_ON_CRYPTO)) | DISSECT_IMAGE_DISCARD_ON_LOOP | DISSECT_IMAGE_DISCARD;
flags = DISSECT_IMAGE_DISCARD_ON_LOOP | DISSECT_IMAGE_DISCARD;
else if (streq(optarg, "crypt"))
arg_flags |= DISSECT_IMAGE_DISCARD_ON_LOOP | DISSECT_IMAGE_DISCARD | DISSECT_IMAGE_DISCARD_ON_CRYPTO;
flags = DISSECT_IMAGE_DISCARD_ANY;
else {
log_error("Unknown --discard= parameter: %s", optarg);
return -EINVAL;
}
arg_flags = (arg_flags & ~DISSECT_IMAGE_DISCARD_ANY) | flags;
break;
}
case ARG_ROOT_HASH: {
void *p;

5
src/shared/dissect-image.h
View File

@ -61,9 +61,12 @@ static inline int PARTITION_VERITY_OF(int p) {
typedef enum DissectImageFlags {
DISSECT_IMAGE_READ_ONLY = 1,
DISSECT_IMAGE_DISCARD_ON_LOOP = 2, /* Turn on "discard" if on loop device and file system supports it */
DISSECT_IMAGE_DISCARD_ON_LOOP = 2, /* Turn on "discard" if on a loop device and file system supports it */
DISSECT_IMAGE_DISCARD = 4, /* Turn on "discard" if file system supports it, on all block devices */
DISSECT_IMAGE_DISCARD_ON_CRYPTO = 8, /* Turn on "discard" also on crypto devices */
DISSECT_IMAGE_DISCARD_ANY = DISSECT_IMAGE_DISCARD_ON_LOOP |
DISSECT_IMAGE_DISCARD |
DISSECT_IMAGE_DISCARD_ON_CRYPTO,
} DissectImageFlags;
struct DissectedImage {