hwdb: fix size lenovo x240 touchpad (#16871)

As discussed in https://gitlab.freedesktop.org/libinput/libinput/-/issues/521, it adds a narrower
match that only applies to X240. Other laptops that match `pvrThinkPad??40` are not affected:

$ systemd-hwdb query 'evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPadX240:*'
EVDEV_ABS_00=1232:5711:51
EVDEV_ABS_01=1159:4700:53
EVDEV_ABS_35=1232:5711:51
EVDEV_ABS_36=1159:4700:53
$ systemd-hwdb query 'evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPadX140:*'
EVDEV_ABS_00=::41
EVDEV_ABS_01=::37
EVDEV_ABS_35=::41
EVDEV_ABS_36=::37

hwdb.d/60-evdev.hwdb

@@ -399,6 +399,14 @@ evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPad??40?:*
  EVDEV_ABS_35=::41
  EVDEV_ABS_36=::37
 
+# Lenovo X240 series
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPadX240:*
+evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPadX240?:*
+ EVDEV_ABS_00=1232:5711:51
+ EVDEV_ABS_01=1159:4700:53
+ EVDEV_ABS_35=1232:5711:51
+ EVDEV_ABS_36=1159:4700:53
+
 # Lenovo ThinkPad X140e
 evdev:name:SynPS/2 Synaptics TouchPad:dmi:*svnLENOVO*:pvrThinkPadX140e*
  EVDEV_ABS_00=1176:5767:62

man/networkctl.xml

@@ -255,6 +255,7 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
        <varlistentry>
         <term>
           <command>delete</command>
+          <replaceable>DEVICE…</replaceable>
         </term>
         <listitem><para>Deletes virtual netdevs. Takes interface name or index number.</para></listitem>
       </varlistentry>
@@ -262,6 +263,7 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
        <varlistentry>
         <term>
           <command>up</command>
+          <replaceable>DEVICE…</replaceable>
         </term>
         <listitem><para>Bring devices up. Takes interface name or index number.</para></listitem>
       </varlistentry>
@@ -269,6 +271,7 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
        <varlistentry>
         <term>
           <command>down</command>
+          <replaceable>DEVICE…</replaceable>
         </term>
         <listitem><para>Bring devices down. Takes interface name or index number.</para></listitem>
       </varlistentry>
@@ -276,6 +279,7 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
        <varlistentry>
         <term>
           <command>renew</command>
+          <replaceable>DEVICE…</replaceable>
         </term>
         <listitem><para>Renew dynamic configurations e.g. addresses received from DHCP server.
         Takes interface name or index number.</para></listitem>
@@ -284,6 +288,7 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
       <varlistentry>
         <term>
           <command>forcerenew</command>
+          <replaceable>DEVICE…</replaceable>
         </term>
         <listitem><para>Send a FORCERENEW message to all connected clients, triggering DHCP reconfiguration.
         Takes interface name or index number.</para></listitem>
@@ -292,6 +297,7 @@ s - Service VLAN, m - Two-port MAC Relay (TPMR)
       <varlistentry>
         <term>
           <command>reconfigure</command>
+          <replaceable>DEVICE…</replaceable>
         </term>
         <listitem><para>Reconfigure network interfaces. Takes interface name or index number.</para></listitem>
       </varlistentry>

po/fr.po

@@ -3,19 +3,22 @@
 # French translations for systemd package
 # Traductions françaises du paquet systemd.
 #
+# Julien Humbert <julroy67@gmail.com>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-19 18:02+0200\n"
-"PO-Revision-Date: 2019-03-07 23:09+0100\n"
+"PO-Revision-Date: 2020-08-27 02:46+0000\n"
-"Last-Translator: Sylvain Plantefève <sylvain.plantefeve@gmail.com>\n"
+"Last-Translator: Julien Humbert <julroy67@gmail.com>\n"
-"Language-Team: French\n"
+"Language-Team: French <https://translate.fedoraproject.org/projects/systemd/"
+"master/fr/>\n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"X-Generator: Weblate 4.2.1\n"
 
 #: src/core/org.freedesktop.systemd1.policy.in:22
 msgid "Send passphrase back to system"
@@ -65,7 +68,7 @@ msgstr "Recharger l'état de systemd"
 
 #: src/core/org.freedesktop.systemd1.policy.in:65
 msgid "Authentication is required to reload the systemd state."
-msgstr "Authentification requise pour recharger l'état de systemd"
+msgstr "Authentification requise pour recharger l’état de systemd."
 
 #: src/home/org.freedesktop.home1.policy:13
 msgid "Create a home area"
@@ -170,7 +173,7 @@ msgstr "Importer une image de machine virtuelle (VM) ou de conteneur"
 msgid "Authentication is required to import a VM or container image"
 msgstr ""
 "Authentification requise pour importer une image de machine virtuelle (VM) "
-"ou de conteneur."
+"ou de conteneur"
 
 #: src/import/org.freedesktop.import1.policy:32
 msgid "Export a VM or container image"
@@ -180,7 +183,7 @@ msgstr "Exporter une image de machine virtuelle (VM) ou de conteneur"
 msgid "Authentication is required to export a VM or container image"
 msgstr ""
 "Authentification requise pour exporter une image de machine virtuelle (VM) "
-"ou de conteneur."
+"ou de conteneur"
 
 #: src/import/org.freedesktop.import1.policy:42
 msgid "Download a VM or container image"
@@ -189,8 +192,8 @@ msgstr "Télécharger une image de machine virtuelle (VM) ou de conteneur"
 #: src/import/org.freedesktop.import1.policy:43
 msgid "Authentication is required to download a VM or container image"
 msgstr ""
-"Authentification requise pour télécharger une image de machine virtuelle "
+"Authentification requise pour télécharger une image de machine virtuelle (VM)"
-"(VM) ou de conteneur."
+" ou de conteneur"
 
 #: src/locale/org.freedesktop.locale1.policy:22
 msgid "Set system locale"
@@ -600,7 +603,7 @@ msgstr "Définir un message wall"
 
 #: src/login/org.freedesktop.login1.policy:386
 msgid "Authentication is required to set a wall message"
-msgstr "Authentification requise pour définir un message wall."
+msgstr "Authentification requise pour définir un message wall"
 
 #: src/login/org.freedesktop.login1.policy:395
 msgid "Change Session"
@@ -766,7 +769,7 @@ msgstr "Activer/désactiver DNSSEC"
 #: src/network/org.freedesktop.network1.policy:100
 #: src/resolve/org.freedesktop.resolve1.policy:111
 msgid "Authentication is required to enable or disable DNSSEC."
-msgstr "Authentification requise pour activer ou désactiver DNSSEC"
+msgstr "Authentification requise pour activer ou désactiver DNSSEC."
 
 #: src/network/org.freedesktop.network1.policy:110
 #: src/resolve/org.freedesktop.resolve1.policy:121

po/sv.po

@@ -4,20 +4,22 @@
 # Sebastian Rasmussen <sebras@gmail.com>, 2015.
 # Andreas Henriksson <andreas@fatal.se>, 2016.
 # Josef Andersson <l10nl18nsweja@gmail.com>, 2015, 2017.
+# Göran Uddeborg <goeran@uddeborg.se>, 2020.
 msgid ""
 msgstr ""
 "Project-Id-Version: systemd master\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2020-08-19 18:02+0200\n"
-"PO-Revision-Date: 2017-03-19 21:18+0100\n"
+"PO-Revision-Date: 2020-08-27 02:46+0000\n"
-"Last-Translator: Josef Andersson <l10nl18nsweja@gmail.com>\n"
+"Last-Translator: Göran Uddeborg <goeran@uddeborg.se>\n"
-"Language-Team: Swedish\n"
+"Language-Team: Swedish <https://translate.fedoraproject.org/projects/systemd/"
+"master/sv/>\n"
 "Language: sv\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Poedit 1.8.9\n"
+"X-Generator: Weblate 4.2.1\n"
 
 #: src/core/org.freedesktop.systemd1.policy.in:22
 msgid "Send passphrase back to system"
@@ -609,7 +611,7 @@ msgstr "Logga in i en lokal behållare"
 
 #: src/machine/org.freedesktop.machine1.policy:23
 msgid "Authentication is required to log into a local container."
-msgstr "Autentisering krävs för att logga in i en lokal behållare"
+msgstr "Autentisering krävs för att logga in i en lokal behållare."
 
 #: src/machine/org.freedesktop.machine1.policy:32
 msgid "Log into the local host"
@@ -617,7 +619,7 @@ msgstr "Logga in på en lokal värd"
 
 #: src/machine/org.freedesktop.machine1.policy:33
 msgid "Authentication is required to log into the local host."
-msgstr "Autentisering krävs för att logga in på den lokala värden"
+msgstr "Autentisering krävs för att logga in på den lokala värden."
 
 #: src/machine/org.freedesktop.machine1.policy:42
 msgid "Acquire a shell in a local container"
@@ -645,7 +647,7 @@ msgstr "Förvärva en pseudo TTY i en lokal behållare"
 msgid ""
 "Authentication is required to acquire a pseudo TTY in a local container."
 msgstr ""
-"Autentisering krävs för att förvärva en pseudo TTY i en lokal behållare"
+"Autentisering krävs för att förvärva en pseudo TTY i en lokal behållare."
 
 #: src/machine/org.freedesktop.machine1.policy:74
 msgid "Acquire a pseudo TTY on the local host"

src/basic/missing_capability.h

@@ -26,3 +26,11 @@
 #undef  CAP_LAST_CAP
 #define CAP_LAST_CAP   CAP_BPF
 #endif
+
+/* 124ea650d3072b005457faed69909221c2905a1f (5.9) */
+#ifndef CAP_CHECKPOINT_RESTORE
+#define CAP_CHECKPOINT_RESTORE  40
+
+#undef  CAP_LAST_CAP
+#define CAP_LAST_CAP   CAP_CHECKPOINT_RESTORE
+#endif

src/core/execute.c

@@ -3127,8 +3127,10 @@ static int apply_mount_namespace(
 
         if (exec_context_has_credentials(context) && params->prefix[EXEC_DIRECTORY_RUNTIME]) {
                 creds_path = path_join(params->prefix[EXEC_DIRECTORY_RUNTIME], "credentials", u->id);
-                if (!creds_path)
+                if (!creds_path) {
-                        return -ENOMEM;
+                        r = -ENOMEM;
+                        goto finalize;
+                }
         }
 
         r = setup_namespace(root_dir, root_image, context->root_image_options,
@@ -3174,6 +3176,7 @@ static int apply_mount_namespace(
                 }
         }
 
+finalize:
         bind_mount_free_many(bind_mounts, n_bind_mounts);
         return r;
 }

src/journal/compress.c

@@ -927,11 +927,12 @@ int compress_stream_zstd(int fdf, int fdt, uint64_t max_bytes) {
                         break;
         }
 
-        log_debug(
+        if (in_bytes > 0)
-                "ZSTD compression finished (%" PRIu64 " -> %" PRIu64 " bytes, %.1f%%)",
+                log_debug("ZSTD compression finished (%" PRIu64 " -> %" PRIu64 " bytes, %.1f%%)",
-                in_bytes,
+                          in_bytes, max_bytes - left, (double) (max_bytes - left) / in_bytes * 100);
-                max_bytes - left,
+        else
-                (double) (max_bytes - left) / in_bytes * 100);
+                log_debug("ZSTD compression finished (%" PRIu64 " -> %" PRIu64 " bytes)",
+                          in_bytes, max_bytes - left);
 
         return 0;
 #else

src/network/networkctl.c

@@ -2794,7 +2794,7 @@ static int networkctl_main(int argc, char *argv[]) {
                 { "list",        VERB_ANY, VERB_ANY, VERB_DEFAULT, list_links          },
                 { "status",      VERB_ANY, VERB_ANY, 0,            link_status         },
                 { "lldp",        VERB_ANY, VERB_ANY, 0,            link_lldp_status    },
-                { "label",       VERB_ANY, VERB_ANY, 0,            list_address_labels },
+                { "label",       1,        1,        0,            list_address_labels },
                 { "delete",      2,        VERB_ANY, 0,            link_delete         },
                 { "up",          2,        VERB_ANY, 0,            link_up_down        },
                 { "down",        2,        VERB_ANY, 0,            link_up_down        },

src/network/networkd-dhcp6.c

@@ -992,7 +992,8 @@ static int dhcp6_update_address(
         addr->cinfo.ifa_valid = lifetime_valid;
 
         (void) in_addr_to_string(addr->family, &addr->in_addr, &buffer);
-        log_link_info(link, "DHCPv6 address %s/%u timeout preferred %d valid %d",
+        log_link_full(link, set_contains(link->dhcp6_addresses, addr) ? LOG_DEBUG : LOG_INFO, 0,
+                      "DHCPv6 address %s/%u timeout preferred %d valid %d",
                       strna(buffer), addr->prefixlen, lifetime_preferred, lifetime_valid);
 
         r = address_configure(addr, link, dhcp6_address_handler, true, &ret);

src/partition/test-repart.sh

@@ -1,6 +1,8 @@
 #!/usr/bin/env bash
 set -ex
 
+[[ -f /dev/loop-control ]] || exit 77
+
 repart=$1
 test -x $repart