chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ask-password: leave printing of final prompt colon to message
[elogind.git]
/
src
/
snapshot.c
diff --git
a/src/snapshot.c
b/src/snapshot.c
index ba72edc255dcad1bbe9b754d7a71791889ec6b0f..a23f2dba400e00d51254a371898388bd9ec7f687 100644
(file)
--- a/
src/snapshot.c
+++ b/
src/snapshot.c
@@
-1,4
+1,4
@@
-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8
; indent-tabs-mode: nil
-*-*/
/***
This file is part of systemd.
/***
This file is part of systemd.
@@
-25,6
+25,7
@@
#include "snapshot.h"
#include "unit-name.h"
#include "dbus-snapshot.h"
#include "snapshot.h"
#include "unit-name.h"
#include "dbus-snapshot.h"
+#include "bus-errors.h"
static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
[SNAPSHOT_DEAD] = UNIT_INACTIVE,
static const UnitActiveState state_translation_table[_SNAPSHOT_STATE_MAX] = {
[SNAPSHOT_DEAD] = UNIT_INACTIVE,
@@
-55,7
+56,7
@@
static int snapshot_load(Unit *u) {
/* Make sure that only snapshots created via snapshot_create()
* can be loaded */
/* Make sure that only snapshots created via snapshot_create()
* can be loaded */
- if (!s->by_snapshot_create)
+ if (!s->by_snapshot_create
&& s->meta.manager->n_deserializing <= 0
)
return -ENOENT;
u->meta.load_state = UNIT_LOADED;
return -ENOENT;
u->meta.load_state = UNIT_LOADED;
@@
-174,7
+175,7
@@
static const char *snapshot_sub_state_to_string(Unit *u) {
return snapshot_state_to_string(SNAPSHOT(u)->state);
}
return snapshot_state_to_string(SNAPSHOT(u)->state);
}
-int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
+int snapshot_create(Manager *m, const char *name, bool cleanup,
DBusError *e,
Snapshot **_s) {
Iterator i;
Unit *other, *u = NULL;
char *n = NULL;
Iterator i;
Unit *other, *u = NULL;
char *n = NULL;
@@
-185,14
+186,20
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
assert(_s);
if (name) {
assert(_s);
if (name) {
- if (!unit_name_is_valid(name))
+ if (!unit_name_is_valid(name, false)) {
+ dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name);
return -EINVAL;
return -EINVAL;
+ }
- if (unit_name_to_type(name) != UNIT_SNAPSHOT)
+ if (unit_name_to_type(name) != UNIT_SNAPSHOT) {
+ dbus_set_error(e, BUS_ERROR_UNIT_TYPE_MISMATCH, "Unit name %s lacks snapshot suffix.", name);
return -EINVAL;
return -EINVAL;
+ }
- if (manager_get_unit(m, name))
+ if (manager_get_unit(m, name)) {
+ dbus_set_error(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name);
return -EEXIST;
return -EEXIST;
+ }
} else {
} else {
@@
-209,7
+216,7
@@
int snapshot_create(Manager *m, const char *name, bool cleanup, Snapshot **_s) {
name = n;
}
name = n;
}
- r = manager_load_unit_prepare(m, name, NULL, &u);
+ r = manager_load_unit_prepare(m, name, NULL,
e,
&u);
free(n);
if (r < 0)
free(n);
if (r < 0)
@@
-285,5
+292,6
@@
const UnitVTable snapshot_vtable = {
.active_state = snapshot_active_state,
.sub_state_to_string = snapshot_sub_state_to_string,
.active_state = snapshot_active_state,
.sub_state_to_string = snapshot_sub_state_to_string,
+ .bus_interface = "org.freedesktop.systemd1.Snapshot",
.bus_message_handler = bus_snapshot_message_handler
};
.bus_message_handler = bus_snapshot_message_handler
};