summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
0e25e94)
Allow passing of basename only, instead of the absolute path; letting
systemd-tmpfiles perform a path lookup for the proper fragment path in
the config directories.
This allows distributions to call: systemd-tmpfiles <program.conf> on
upgrade of a package, with respecting the possibly overriden (or even
masked) tmpfile.
static const char *arg_prefix = NULL;
static const char *arg_prefix = NULL;
+static const char *conf_file_dirs[] = {
+ "/etc/tmpfiles.d",
+ "/run/tmpfiles.d",
+ "/usr/local/lib/tmpfiles.d",
+ "/usr/lib/tmpfiles.d",
+ NULL
+};
+
#define MAX_DEPTH 256
static bool needs_glob(ItemType t) {
#define MAX_DEPTH 256
static bool needs_glob(ItemType t) {
+static char *resolve_fragment(const char *fragment, const char **search_paths) {
+ const char **p;
+ char *resolved_path;
+
+ if (is_path(fragment))
+ return strdup(fragment);
+
+ STRV_FOREACH(p, search_paths) {
+ resolved_path = join(*p, "/", fragment, NULL);
+ if (resolved_path == NULL) {
+ log_error("Out of memory");
+ return NULL;
+ }
+
+ if (access(resolved_path, F_OK) == 0)
+ return resolved_path;
+
+ free(resolved_path);
+ }
+
+ return NULL;
+}
+
int main(int argc, char *argv[]) {
int r;
Item *i;
int main(int argc, char *argv[]) {
int r;
Item *i;
if (optind < argc) {
int j;
if (optind < argc) {
int j;
- for (j = optind; j < argc; j++)
- if (read_config_file(argv[j], false) < 0)
+ for (j = optind; j < argc; j++) {
+ char *fragment = resolve_fragment(argv[j], conf_file_dirs);
+ if (read_config_file(fragment, false) < 0)
} else {
char **files, **f;
} else {
char **files, **f;
- r = conf_files_list(&files, ".conf",
- "/etc/tmpfiles.d",
- "/run/tmpfiles.d",
- "/usr/local/lib/tmpfiles.d",
- "/usr/lib/tmpfiles.d",
- NULL);
+ r = conf_files_list_strv(&files, ".conf",
+ (const char **)conf_file_dirs);
if (r < 0) {
log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));
r = EXIT_FAILURE;
if (r < 0) {
log_error("Failed to enumerate tmpfiles.d files: %s", strerror(-r));
r = EXIT_FAILURE;