shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-01-10 05:18:17 +03:00
Code

Merge pull request #7127 from keszybz/sundry-tweaks

Browse Source 
Various unrelated small patches
This commit is contained in:
Lennart Poettering 2017-10-26 10:57:00 +02:00 committed by GitHub
commit 35682fd4a1
5 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
man/systemd-nspawn.xml
View File

@ -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>

1
meson.build
View File

@ -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')

13
src/basic/util.c
View File

@ -177,15 +177,12 @@ int block_get_whole_disk(dev_t d, dev_t *ret) {
}
bool kexec_loaded(void) {
bool loaded = false;
char *s;
_cleanup_free_ char *s = NULL;
if (read_one_line_file("/sys/kernel/kexec_loaded", &s) >= 0) {
if (s[0] == '1')
loaded = true;
free(s);
}
return loaded;
if (read_one_line_file("/sys/kernel/kexec_loaded", &s) < 0)
return false;
return s[0] == '1';
}
int prot_from_flags(int flags) {

5
src/login/logind-user.c
View File

@ -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;
}

6
src/rfkill/rfkill.c
View File

@ -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;