diff options
author | Lennart Poettering <lennart@poettering.net> | 2017-10-26 10:57:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-10-26 10:57:00 +0200 |
commit | 35682fd4a1cb17d088ec15cd724fc005cc226682 (patch) | |
tree | 5f8b2cc0f2385d2d4bfa92cac564b3b8e30210dc | |
parent | af163d70ae154fd20c8addec6549e938295cbbb7 (diff) | |
parent | 78344935fd21e1eedac962f305efc76ac69b5b19 (diff) | |
download | systemd-35682fd4a1cb17d088ec15cd724fc005cc226682.tar.gz |
Merge pull request #7127 from keszybz/sundry-tweaks
Various unrelated small patches
-rw-r--r-- | man/systemd-nspawn.xml | 11 | ||||
-rw-r--r-- | meson.build | 1 | ||||
-rw-r--r-- | src/basic/util.c | 15 | ||||
-rw-r--r-- | src/login/logind-user.c | 5 | ||||
-rw-r--r-- | src/rfkill/rfkill.c | 6 |
5 files changed, 19 insertions, 19 deletions
diff --git a/man/systemd-nspawn.xml b/man/systemd-nspawn.xml index 3951e32e8f..b741a1fff9 100644 --- a/man/systemd-nspawn.xml +++ b/man/systemd-nspawn.xml @@ -1075,14 +1075,17 @@ <example> <title>Build and boot a minimal Fedora distribution in a container</title> - <programlisting># dnf -y --releasever=25 --installroot=/srv/mycontainer \ + <programlisting># dnf -y --releasever=27 --installroot=/var/lib/machines/f27container \ --disablerepo='*' --enablerepo=fedora --enablerepo=updates install \ systemd passwd dnf fedora-release vim-minimal -# systemd-nspawn -bD /srv/mycontainer</programlisting> +# systemd-nspawn -bD /var/lib/machines/f27container</programlisting> <para>This installs a minimal Fedora distribution into the - directory <filename noindex='true'>/srv/mycontainer/</filename> - and then boots an OS in a namespace container in it.</para> + directory <filename noindex='true'>/var/lib/machines/f27container</filename> + and then boots an OS in a namespace container in it. Because the installation + is located underneath the standard <filename>/var/lib/machines/</filename> + directory, it is also possible to start the machine using + <command>systemd-nspawn -M f27container</command>.</para> </example> <example> diff --git a/meson.build b/meson.build index e394ee5eee..34eed35190 100644 --- a/meson.build +++ b/meson.build @@ -462,7 +462,6 @@ endif ##################################################################### sed = find_program('sed') -grep = find_program('grep') awk = find_program('awk') m4 = find_program('m4') stat = find_program('stat') diff --git a/src/basic/util.c b/src/basic/util.c index 687de40993..37fbfbf97f 100644 --- a/src/basic/util.c +++ b/src/basic/util.c @@ -177,15 +177,12 @@ int block_get_whole_disk(dev_t d, dev_t *ret) { } bool kexec_loaded(void) { - bool loaded = false; - char *s; - - if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) { - if (s[0] == '1') - loaded = true; - free(s); - } - return loaded; + _cleanup_free_ char *s = NULL; + + if (read_one_line_file("/sys/kernel/kexec_loaded", &s) < 0) + return false; + + return s[0] == '1'; } int prot_from_flags(int flags) { diff --git a/src/login/logind-user.c b/src/login/logind-user.c index dcf367e22d..a90db3b33c 100644 --- a/src/login/logind-user.c +++ b/src/login/logind-user.c @@ -425,12 +425,11 @@ static int user_start_service(User *u) { u->service, &error, &job); - if (r < 0) { + if (r < 0) /* we don't fail due to this, let's try to continue */ log_error_errno(r, "Failed to start user service, ignoring: %s", bus_error_message(&error, r)); - } else { + else u->service_job = job; - } return 0; } diff --git a/src/rfkill/rfkill.c b/src/rfkill/rfkill.c index 3aa468f40b..c14b5ea3ee 100644 --- a/src/rfkill/rfkill.c +++ b/src/rfkill/rfkill.c @@ -88,7 +88,8 @@ static int find_device( device = udev_device_new_from_subsystem_sysname(udev, "rfkill", sysname); if (!device) - return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, "Failed to open device: %m"); + return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, + "Failed to open device %s: %m", sysname); name = udev_device_get_sysattr_value(device, "name"); if (!name) { @@ -146,7 +147,8 @@ static int wait_for_initialized( /* Check again, maybe things changed */ d = udev_device_new_from_subsystem_sysname(udev, "rfkill", sysname); if (!d) - return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, "Failed to open device: %m"); + return log_full_errno(errno == ENOENT ? LOG_DEBUG : LOG_ERR, errno, + "Failed to open device %s: %m", sysname); if (udev_device_get_is_initialized(d) != 0) { *ret = d; |