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

machined: Move image discovery logic into src/shared, so that we can make use of it from nspawn

Browse source
This commit is contained in:
Lennart Poettering 2014-12-27 01:57:03 +01:00
parent 58a489c2b3
commit 003dffde2c
11 changed files with 87 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Makefile.am
View file

@ -899,6 +899,8 @@ libsystemd_shared_la_SOURCES = \
src/shared/btrfs-ctree.h \
src/shared/verbs.c \
src/shared/verbs.h \
src/shared/machine-image.c \
src/shared/machine-image.h \
src/shared/build.h
if HAVE_UTMP
@ -5039,11 +5041,10 @@ rootlibexec_PROGRAMS += \
libsystemd_machine_core_la_SOURCES = \
src/machine/machine.c \
src/machine/machine.h \
src/machine/image.c \
src/machine/image.h \
src/machine/machined-dbus.c \
src/machine/machine-dbus.c \
src/machine/image-dbus.c
src/machine/image-dbus.c \
src/machine/image-dbus.h
libsystemd_machine_core_la_LIBADD = \
libsystemd-label.la \

3
src/machine/image-dbus.c
View file

@ -22,7 +22,8 @@
#include "bus-label.h"
#include "bus-common-errors.h"
#include "strv.h"
#include "image.h"
#include "machine-image.h"
#include "image-dbus.h"
static int image_find_by_bus_path(const char *path, Image **ret) {
_cleanup_free_ char *e = NULL;

31
src/machine/image-dbus.h Normal file
View file

@ -0,0 +1,31 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2014 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "machined.h"
extern const sd_bus_vtable image_vtable[];
char *image_bus_path(const char *name);
int image_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
int image_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);

1
src/machine/machine-dbus.c
View file

@ -34,6 +34,7 @@
#include "path-util.h"
#include "bus-internal.h"
#include "machine.h"
#include "machine-dbus.h"
static int property_get_id(
sd_bus *bus,

41
src/machine/machine-dbus.h Normal file
View file

@ -0,0 +1,41 @@
/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
#pragma once
/***
This file is part of systemd.
Copyright 2013 Lennart Poettering
systemd is free software; you can redistribute it and/or modify it
under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
systemd is distributed in the hope that it will be useful, but
WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License
along with systemd; If not, see <http://www.gnu.org/licenses/>.
***/
#include "sd-bus.h"
#include "machine.h"
extern const sd_bus_vtable machine_vtable[];
char *machine_bus_path(Machine *s);
int machine_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
int bus_machine_method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_get_os_release(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_open_pty(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int machine_send_signal(Machine *m, bool new_machine);
int machine_send_create_reply(Machine *m, sd_bus_error *error);

3
src/machine/machine.c
View file

@ -32,9 +32,10 @@
#include "fileio.h"
#include "special.h"
#include "unit-name.h"
#include "machine.h"
#include "bus-util.h"
#include "bus-error.h"
#include "machine.h"
#include "machine-dbus.h"
Machine* machine_new(Manager *manager, const char *name) {
Machine *m;

16
src/machine/machine.h
View file

@ -94,22 +94,6 @@ int machine_kill(Machine *m, KillWho who, int signo);
MachineState machine_get_state(Machine *u);
extern const sd_bus_vtable machine_vtable[];
char *machine_bus_path(Machine *s);
int machine_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
int machine_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
int bus_machine_method_terminate(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_kill(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_get_addresses(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_get_os_release(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_open_pty(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int bus_machine_method_open_login(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error);
int machine_send_signal(Machine *m, bool new_machine);
int machine_send_create_reply(Machine *m, sd_bus_error *error);
const char* machine_class_to_string(MachineClass t) _const_;
MachineClass machine_class_from_string(const char *s) _pure_;

4
src/machine/machined-dbus.c
View file

@ -38,8 +38,10 @@
#include "bus-common-errors.h"
#include "time-util.h"
#include "cgroup-util.h"
#include "image.h"
#include "machine-image.h"
#include "image-dbus.h"
#include "machined.h"
#include "machine-dbus.h"
static int method_get_machine(sd_bus *bus, sd_bus_message *message, void *userdata, sd_bus_error *error) {
_cleanup_free_ char *p = NULL;

3
src/machine/machined.h
View file

@ -33,7 +33,8 @@
typedef struct Manager Manager;
#include "machine.h"
#include "image.h"
#include "machine-dbus.h"
#include "image-dbus.h"
struct Manager {
sd_event *event;

2
src/machine/image.c → src/shared/machine-image.c
View file

@ -25,7 +25,7 @@
#include "utf8.h"
#include "btrfs-util.h"
#include "path-util.h"
#include "image.h"
#include "machine-image.h"
static const char image_search_path[] =
"/var/lib/machines\0"

8
src/machine/image.h → src/shared/machine-image.h
View file

@ -23,7 +23,6 @@
#include "time-util.h"
#include "hashmap.h"
#include "machined.h"
typedef enum ImageType {
IMAGE_DIRECTORY,
@ -52,12 +51,5 @@ DEFINE_TRIVIAL_CLEANUP_FUNC(Hashmap*, image_hashmap_free);
int image_find(const char *name, Image **ret);
int image_discover(Hashmap *map);
extern const sd_bus_vtable image_vtable[];
char *image_bus_path(const char *name);
int image_object_find(sd_bus *bus, const char *path, const char *interface, void *userdata, void **found, sd_bus_error *error);
int image_node_enumerator(sd_bus *bus, const char *path, void *userdata, char ***nodes, sd_bus_error *error);
const char* image_type_to_string(ImageType t) _const_;
ImageType image_type_from_string(const char *s) _pure_;