diff options
author | Lennart Poettering <lennart@poettering.net> | 2018-03-26 16:32:40 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2018-05-24 17:01:57 +0200 |
commit | d58ad743f98b3a88de961462fb7adedbf30f727d (patch) | |
tree | 0978f88d2e97ef6aacd032b0c6540c70906f5207 /src/basic/stat-util.c | |
parent | 080dfda85a9fc4bd471bc056a570d9eab411efa2 (diff) | |
download | systemd-d58ad743f98b3a88de961462fb7adedbf30f727d.tar.gz |
os-util: add helpers for finding /etc/os-release
Place this new helpers in a new source file os-util.[ch], and move the
existing and related call path_is_os_tree() to it as well.
Diffstat (limited to 'src/basic/stat-util.c')
-rw-r--r-- | src/basic/stat-util.c | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/basic/stat-util.c b/src/basic/stat-util.c index 61cc6f5738..1f0a75a0e8 100644 --- a/src/basic/stat-util.c +++ b/src/basic/stat-util.c @@ -132,32 +132,6 @@ int path_is_read_only_fs(const char *path) { return false; } -int path_is_os_tree(const char *path) { - int r; - - assert(path); - - /* Does the path exist at all? If not, generate an error immediately. This is useful so that a missing root dir - * always results in -ENOENT, and we can properly distuingish the case where the whole root doesn't exist from - * the case where just the os-release file is missing. */ - if (laccess(path, F_OK) < 0) - return -errno; - - /* We use /usr/lib/os-release as flag file if something is an OS */ - r = chase_symlinks("/usr/lib/os-release", path, CHASE_PREFIX_ROOT, NULL); - if (r == -ENOENT) { - - /* Also check for the old location in /etc, just in case. */ - r = chase_symlinks("/etc/os-release", path, CHASE_PREFIX_ROOT, NULL); - if (r == -ENOENT) - return 0; /* We got nothing */ - } - if (r < 0) - return r; - - return 1; -} - int files_same(const char *filea, const char *fileb, int flags) { struct stat a, b; |