chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
core: fix SetUnitProperties
[elogind.git]
/
src
/
shared
/
install.c
diff --git
a/src/shared/install.c
b/src/shared/install.c
index cfd4a5af8acad9f038ed4b2b4473cd74f93ee0d7..100ed69744ad4f8383b13bb666743f843b838854 100644
(file)
--- a/
src/shared/install.c
+++ b/
src/shared/install.c
@@
-38,6
+38,7
@@
#include "conf-files.h"
#include "specifier.h"
#include "install-printf.h"
#include "conf-files.h"
#include "specifier.h"
#include "install-printf.h"
+#include "special.h"
typedef struct {
Hashmap *will_install;
typedef struct {
Hashmap *will_install;
@@
-921,6
+922,7
@@
static int config_parse_also(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-956,6
+958,7
@@
static int config_parse_user(const char *unit,
const char *filename,
unsigned line,
const char *section,
const char *filename,
unsigned line,
const char *section,
+ unsigned section_line,
const char *lvalue,
int ltype,
const char *rvalue,
const char *lvalue,
int ltype,
const char *rvalue,
@@
-1560,7
+1563,8
@@
int unit_file_reenable(
int unit_file_set_default(
UnitFileScope scope,
const char *root_dir,
int unit_file_set_default(
UnitFileScope scope,
const char *root_dir,
- char *file,
+ const char *file,
+ bool force,
UnitFileChange **changes,
unsigned *n_changes) {
UnitFileChange **changes,
unsigned *n_changes) {
@@
-1573,6
+1577,7
@@
int unit_file_set_default(
assert(scope >= 0);
assert(scope < _UNIT_FILE_SCOPE_MAX);
assert(scope >= 0);
assert(scope < _UNIT_FILE_SCOPE_MAX);
+ assert(file);
if (unit_name_to_type(file) != UNIT_TARGET)
return -EINVAL;
if (unit_name_to_type(file) != UNIT_TARGET)
return -EINVAL;
@@
-1589,14
+1594,15
@@
int unit_file_set_default(
if (r < 0)
return r;
if (r < 0)
return r;
-
i = (InstallInfo*)hashmap_first(c.will_install
);
+
assert_se(i = hashmap_first(c.will_install)
);
r = unit_file_search(&c, i, &paths, root_dir, false);
if (r < 0)
return r;
r = unit_file_search(&c, i, &paths, root_dir, false);
if (r < 0)
return r;
- path = strappenda(config_path, "/default.target");
- r = create_symlink(i->path, path, true, changes, n_changes);
+ path = strappenda(config_path, "/" SPECIAL_DEFAULT_TARGET);
+
+ r = create_symlink(i->path, path, force, changes, n_changes);
if (r < 0)
return r;
if (r < 0)
return r;
@@
-1612,6
+1618,10
@@
int unit_file_get_default(
char **p;
int r;
char **p;
int r;
+ assert(scope >= 0);
+ assert(scope < _UNIT_FILE_SCOPE_MAX);
+ assert(name);
+
r = lookup_paths_init_from_scope(&paths, scope);
if (r < 0)
return r;
r = lookup_paths_init_from_scope(&paths, scope);
if (r < 0)
return r;
@@
-1621,9
+1631,9
@@
int unit_file_get_default(
char *n;
if (isempty(root_dir))
char *n;
if (isempty(root_dir))
- path = strappend(*p, "/
default.target"
);
+ path = strappend(*p, "/
" SPECIAL_DEFAULT_TARGET
);
else
else
- path = strjoin(root_dir, "/", *p, "/
default.target"
, NULL);
+ path = strjoin(root_dir, "/", *p, "/
" SPECIAL_DEFAULT_TARGET
, NULL);
if (!path)
return -ENOMEM;
if (!path)
return -ENOMEM;
@@
-1631,10
+1641,14
@@
int unit_file_get_default(
r = readlink_malloc(path, &tmp);
if (r == -ENOENT)
continue;
r = readlink_malloc(path, &tmp);
if (r == -ENOENT)
continue;
- if (r < 0)
+ else if (r == -EINVAL)
+ /* not a symlink */
+ n = strdup(SPECIAL_DEFAULT_TARGET);
+ else if (r < 0)
return r;
return r;
+ else
+ n = strdup(path_get_file_name(tmp));
- n = strdup(path_get_file_name(tmp));
if (!n)
return -ENOMEM;
if (!n)
return -ENOMEM;