summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README7
-rw-r--r--hwdb/60-keyboard.hwdb2
-rw-r--r--src/cryptsetup/cryptsetup-generator.c2
3 files changed, 3 insertions, 8 deletions
diff --git a/README b/README
index 62fd248775..b9a89f5cd1 100644
--- a/README
+++ b/README
@@ -161,7 +161,6 @@ REQUIREMENTS:
gperf
python (optional)
python-lxml (optional, but required to build the indices)
- sphinx (optional)
The build system is initialized with ./autogen.sh. A tar ball
can be created with:
@@ -173,12 +172,6 @@ REQUIREMENTS:
under all circumstances. In fact, systemd-hostnamed will warn
if nss-myhostname is not installed.
- To build HTML documentation for python-systemd using sphinx,
- please first install systemd (using 'make install'), and then
- invoke sphinx-build with 'make sphinx-<target>', with <target>
- being 'html' or 'latexpdf'. If using DESTDIR for installation,
- pass the same DESTDIR to 'make sphinx-html' invocation.
-
USERS AND GROUPS:
Default udev rules use the following standard system group
names, which need to be resolvable by getgrnam() at any time,
diff --git a/hwdb/60-keyboard.hwdb b/hwdb/60-keyboard.hwdb
index 65e939262a..3e49449ae9 100644
--- a/hwdb/60-keyboard.hwdb
+++ b/hwdb/60-keyboard.hwdb
@@ -273,6 +273,8 @@ evdev:atkbd:dmi:bvn*:bvr*:bd*:svnDell*:pnXPS12-9Q33*:pvr*
# Dell Latitude microphone mute
evdev:name:Dell WMI hotkeys:dmi:bvn*:bvr*:bd*:svnDell*:pnLatitude*
+# Dell Precision microphone mute
+evdev:name:Dell WMI hotkeys:dmi:bvn*:bvr*:bd*:svnDell*:pnPrecision*
KEYBOARD_KEY_150=f20 # Mic mute toggle, should be micmute
###########################################################
diff --git a/src/cryptsetup/cryptsetup-generator.c b/src/cryptsetup/cryptsetup-generator.c
index 6fad8ad80c..ab91afec4d 100644
--- a/src/cryptsetup/cryptsetup-generator.c
+++ b/src/cryptsetup/cryptsetup-generator.c
@@ -330,7 +330,7 @@ static int parse_proc_cmdline_item(const char *key, const char *value) {
free(d->keyfile);
d->keyfile = uuid_value;
uuid_value = NULL;
- } else if (free_and_strdup(&arg_default_keyfile, value))
+ } else if (free_and_strdup(&arg_default_keyfile, value) < 0)
return log_oom();
} else if (STR_IN_SET(key, "luks.name", "rd.luks.name") && value) {