man/networkd.conf.xml

@@ -62,24 +62,12 @@
         If <varname>SpeedMeter=no</varname>, the value is ignored. Defaults to 10sec.</para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><varname>ManageForeignRoutingPolicyRules=</varname></term>
-        <listitem><para>A boolean. When true, <command>systemd-networkd</command> will remove rules
-        that are not configured in .network files (except for rules with protocol
-        <literal>kernel</literal>). When false, it will not remove any foreign rules, keeping them even
-        if they are not configured in a .network file. Defaults to yes.
-        </para></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><varname>ManageForeignRoutes=</varname></term>
-        <listitem><para>A boolean. When true, <command>systemd-networkd</command> will remove routes
+        <listitem><para>A boolean. When true, <command>systemd-networkd</command> will store any routes
-        that are not configured in .network files (except for routes with protocol
+        configured by other tools in its memory. When false, <command>systemd-networkd</command> will
-        <literal>kernel</literal>, <literal>dhcp</literal> when <varname>KeepConfiguration=</varname>
+        not manage the foreign routes, thus they are kept even if <varname>KeepConfiguration=</varname>
-        is true or <literal>dhcp</literal>, and <literal>static</literal> when
+        is false. Defaults to yes.</para></listitem>
-        <varname>KeepConfiguration=</varname> is true or <literal>static</literal>). When false, it will
-        not remove any foreign routes, keeping them even if they are not configured in a .network file.
-        Defaults to yes.</para></listitem>
       </varlistentry>
 
       <varlistentry>

man/systemd-networkd-wait-online.service.xml

@@ -85,34 +85,6 @@
         </para></listitem>
       </varlistentry>
 
-      <varlistentry>
-        <term><option>-4</option></term>
-        <term><option>--ipv4</option></term>
-
-        <listitem><para>Waiting for an IPv4 address of each network interface to be configured. If this
-        option is specified with <option>--any</option>, then
-        <command>systemd-networkd-wait-online</command> exits with success when at least one interface
-        becomes online and has an IPv4 address. The option is applied only for the operational state
-        <literal>degraded</literal> or above. If neither <option>--ipv4</option> nor
-        <option>--ipv6</option> is specified, then the value from
-        <varname>RequiredFamilyForOnline=</varname> in the corresponding <filename>.network</filename>
-        file is used if present.</para></listitem>
-      </varlistentry>
-
-      <varlistentry>
-        <term><option>-6</option></term>
-        <term><option>--ipv6</option></term>
-
-        <listitem><para>Waiting for an IPv6 address of each network interface to be configured. If this
-        option is specified with <option>--any</option>, then
-        <command>systemd-networkd-wait-online</command> exits with success when at least one interface
-        becomes online and has an IPv6 address. The option is applied only for the operational state
-        <literal>degraded</literal> or above. If neither <option>--ipv4</option> nor
-        <option>--ipv6</option> is specified, then the value from
-        <varname>RequiredFamilyForOnline=</varname> in the corresponding <filename>.network</filename>
-        file is used if present.</para></listitem>
-      </varlistentry>
-
       <varlistentry>
         <term><option>--any</option></term>
 

man/systemd.network.xml

@@ -229,18 +229,6 @@
           if <literal>RequiredForOnline=no</literal>.</para>
         </listitem>
       </varlistentry>
-      <varlistentry>
-        <term><varname>RequiredFamilyForOnline=</varname></term>
-        <listitem>
-          <para>Specifies an address family. When specified,
-          <command>systemd-networkd-wait-online</command> waits for at least one routable or link-local
-          IP address in the family should be configured on the link. Takes one of
-          <literal>ipv4</literal>, <literal>ipv6</literal>, <literal>both</literal>, or
-          <literal>any</literal>. Defaults to <literal>any</literal>. Note that this will be used only
-          when <varname>RequiredForOnline=</varname> is true, or its minimum operational state is
-          <literal>degraded</literal> or above. Otherwise, it will be ignored.</para>
-        </listitem>
-      </varlistentry>
       <varlistentry>
         <term><varname>ActivationPolicy=</varname></term>
         <listitem>

src/basic/device-nodes.c

@@ -8,12 +8,15 @@
 #include "utf8.h"
 
 int allow_listed_char_for_devnode(char c, const char *white) {
-        return
+
-                (c >= '0' && c <= '9') ||
+        if ((c >= '0' && c <= '9') ||
             (c >= 'A' && c <= 'Z') ||
             (c >= 'a' && c <= 'z') ||
-                strchr("#+-.:=@_", c) ||
+            strchr("#+-.:=@_", c) != NULL ||
-                (white && strchr(white, c));
+            (white != NULL && strchr(white, c) != NULL))
+                return 1;
+
+        return 0;
 }
 
 int encode_devnode_name(const char *str, char *str_enc, size_t len) {

src/libsystemd/sd-network/network-util.c

@@ -56,15 +56,6 @@ static const char* const link_carrier_state_table[_LINK_CARRIER_STATE_MAX] = {
 
 DEFINE_STRING_TABLE_LOOKUP(link_carrier_state, LinkCarrierState);
 
-static const char* const link_required_address_family_table[_ADDRESS_FAMILY_MAX] = {
-        [ADDRESS_FAMILY_NO]   = "any",
-        [ADDRESS_FAMILY_IPV4] = "ipv4",
-        [ADDRESS_FAMILY_IPV6] = "ipv6",
-        [ADDRESS_FAMILY_YES]  = "both",
-};
-
-DEFINE_STRING_TABLE_LOOKUP(link_required_address_family, AddressFamily);
-
 static const char* const link_address_state_table[_LINK_ADDRESS_STATE_MAX] = {
         [LINK_ADDRESS_STATE_OFF]      = "off",
         [LINK_ADDRESS_STATE_DEGRADED] = "degraded",

src/libsystemd/sd-network/network-util.h

@@ -11,16 +11,6 @@
 
 bool network_is_online(void);
 
-typedef enum AddressFamily {
-        /* This is a bitmask, though it usually doesn't feel that way! */
-        ADDRESS_FAMILY_NO             = 0,
-        ADDRESS_FAMILY_IPV4           = 1 << 0,
-        ADDRESS_FAMILY_IPV6           = 1 << 1,
-        ADDRESS_FAMILY_YES            = ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6,
-        _ADDRESS_FAMILY_MAX,
-        _ADDRESS_FAMILY_INVALID = -EINVAL,
-} AddressFamily;
-
 typedef enum LinkOperationalState {
         LINK_OPERSTATE_MISSING,
         LINK_OPERSTATE_OFF,
@@ -60,9 +50,6 @@ LinkOperationalState link_operstate_from_string(const char *s) _pure_;
 const char* link_carrier_state_to_string(LinkCarrierState s) _const_;
 LinkCarrierState link_carrier_state_from_string(const char *s) _pure_;
 
-const char* link_required_address_family_to_string(AddressFamily s) _const_;
-AddressFamily link_required_address_family_from_string(const char *s) _pure_;
-
 const char* link_address_state_to_string(LinkAddressState s) _const_;
 LinkAddressState link_address_state_from_string(const char *s) _pure_;
 

src/libsystemd/sd-network/sd-network.c

@@ -48,14 +48,6 @@ _public_ int sd_network_get_address_state(char **state) {
         return network_get_string("ADDRESS_STATE", state);
 }
 
-_public_ int sd_network_get_ipv4_address_state(char **state) {
-        return network_get_string("IPV4_ADDRESS_STATE", state);
-}
-
-_public_ int sd_network_get_ipv6_address_state(char **state) {
-        return network_get_string("IPV6_ADDRESS_STATE", state);
-}
-
 static int network_get_strv(const char *key, char ***ret) {
         _cleanup_strv_free_ char **a = NULL;
         _cleanup_free_ char *s = NULL;
@@ -168,26 +160,6 @@ _public_ int sd_network_link_get_operational_state(int ifindex, char **state) {
         return network_link_get_string(ifindex, "OPER_STATE", state);
 }
 
-_public_ int sd_network_link_get_required_family_for_online(int ifindex, char **state) {
-        _cleanup_free_ char *s = NULL;
-        int r;
-
-        assert_return(state, -EINVAL);
-
-        r = network_link_get_string(ifindex, "REQUIRED_FAMILY_FOR_ONLINE", &s);
-        if (r < 0) {
-                if (r != -ENODATA)
-                        return r;
-
-                s = strdup("any");
-                if (!s)
-                        return -ENOMEM;
-        }
-
-        *state = TAKE_PTR(s);
-        return 0;
-}
-
 _public_ int sd_network_link_get_carrier_state(int ifindex, char **state) {
         return network_link_get_string(ifindex, "CARRIER_STATE", state);
 }
@@ -196,14 +168,6 @@ _public_ int sd_network_link_get_address_state(int ifindex, char **state) {
         return network_link_get_string(ifindex, "ADDRESS_STATE", state);
 }
 
-_public_ int sd_network_link_get_ipv4_address_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "IPV4_ADDRESS_STATE", state);
-}
-
-_public_ int sd_network_link_get_ipv6_address_state(int ifindex, char **state) {
-        return network_link_get_string(ifindex, "IPV6_ADDRESS_STATE", state);
-}
-
 _public_ int sd_network_link_get_dhcp6_client_iaid_string(int ifindex, char **iaid) {
         return network_link_get_string(ifindex, "DHCP6_CLIENT_IAID", iaid);
 }

src/network/networkd-gperf.gperf

@@ -22,7 +22,6 @@ struct ConfigPerfItem;
 %%
 Network.SpeedMeter,            config_parse_bool,                      0,          offsetof(Manager, use_speed_meter)
 Network.SpeedMeterIntervalSec, config_parse_sec,                       0,          offsetof(Manager, speed_meter_interval_usec)
-Network.ManageForeignRoutingPolicyRules, config_parse_bool,                      0,          offsetof(Manager, manage_foreign_rules)
 Network.ManageForeignRoutes,   config_parse_bool,                      0,          offsetof(Manager, manage_foreign_routes)
 Network.RouteTable,            config_parse_route_table_names,         0,          0
 DHCP.DUIDType,                 config_parse_duid_type,                 0,          offsetof(Manager, duid)

src/network/networkd-link-bus.c

@@ -684,8 +684,6 @@ const sd_bus_vtable link_vtable[] = {
         SD_BUS_PROPERTY("OperationalState", "s", property_get_operational_state, offsetof(Link, operstate), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("CarrierState", "s", property_get_carrier_state, offsetof(Link, carrier_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("AddressState", "s", property_get_address_state, offsetof(Link, address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
-        SD_BUS_PROPERTY("IPv4AddressState", "s", property_get_address_state, offsetof(Link, ipv4_address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
-        SD_BUS_PROPERTY("IPv6AddressState", "s", property_get_address_state, offsetof(Link, ipv6_address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("AdministrativeState", "s", property_get_administrative_state, offsetof(Link, state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("BitRates", "(tt)", property_get_bit_rates, 0, 0),
 

src/network/networkd-link.c

@@ -4,7 +4,6 @@
 #include <linux/if.h>
 #include <linux/if_arp.h>
 #include <linux/if_link.h>
-#include <sys/socket.h>
 #include <unistd.h>
 
 #include "alloc-util.h"
@@ -164,25 +163,12 @@ static void link_update_master_operstate(Link *link, NetDev *netdev) {
         link_update_operstate(master, true);
 }
 
-static LinkAddressState address_state_from_scope(uint8_t scope) {
-        if (scope < RT_SCOPE_SITE)
-                /* universally accessible addresses found */
-                return LINK_ADDRESS_STATE_ROUTABLE;
-
-        if (scope < RT_SCOPE_HOST)
-                /* only link or site local addresses found */
-                return LINK_ADDRESS_STATE_DEGRADED;
-
-        /* no useful addresses found */
-        return LINK_ADDRESS_STATE_OFF;
-}
-
 void link_update_operstate(Link *link, bool also_update_master) {
         LinkOperationalState operstate;
         LinkCarrierState carrier_state;
-        LinkAddressState ipv4_address_state, ipv6_address_state, address_state;
+        LinkAddressState address_state;
         _cleanup_strv_free_ char **p = NULL;
-        uint8_t ipv4_scope = RT_SCOPE_NOWHERE, ipv6_scope = RT_SCOPE_NOWHERE, scope;
+        uint8_t scope = RT_SCOPE_NOWHERE;
         bool changed = false;
         Address *address;
 
@@ -215,11 +201,8 @@ void link_update_operstate(Link *link, bool also_update_master) {
                 if (!address_is_ready(address))
                         continue;
 
-                if (address->family == AF_INET && address->scope < ipv4_scope)
+                if (address->scope < scope)
-                        ipv4_scope = address->scope;
+                        scope = address->scope;
-
-                if (address->family == AF_INET6 && address->scope < ipv6_scope)
-                        ipv6_scope = address->scope;
         }
 
         /* for operstate we also take foreign addresses into account */
@@ -227,18 +210,19 @@ void link_update_operstate(Link *link, bool also_update_master) {
                 if (!address_is_ready(address))
                         continue;
 
-                if (address->family == AF_INET && address->scope < ipv4_scope)
+                if (address->scope < scope)
-                        ipv4_scope = address->scope;
+                        scope = address->scope;
-
-                if (address->family == AF_INET6 && address->scope < ipv6_scope)
-                        ipv6_scope = address->scope;
         }
 
-        ipv4_address_state = address_state_from_scope(ipv4_scope);
+        if (scope < RT_SCOPE_SITE)
-        ipv6_address_state = address_state_from_scope(ipv6_scope);
+                /* universally accessible addresses found */
-
+                address_state = LINK_ADDRESS_STATE_ROUTABLE;
-        scope = MIN(ipv4_scope, ipv6_scope);
+        else if (scope < RT_SCOPE_HOST)
-        address_state = address_state_from_scope(scope);
+                /* only link or site local addresses found */
+                address_state = LINK_ADDRESS_STATE_DEGRADED;
+        else
+                /* no useful addresses found */
+                address_state = LINK_ADDRESS_STATE_OFF;
 
         /* Mapping of address and carrier state vs operational state
          *                                                     carrier state
@@ -272,20 +256,6 @@ void link_update_operstate(Link *link, bool also_update_master) {
                         log_oom();
         }
 
-        if (link->ipv4_address_state != ipv4_address_state) {
-                link->ipv4_address_state = ipv4_address_state;
-                changed = true;
-                if (strv_extend(&p, "IPv4AddressState") < 0)
-                        log_oom();
-        }
-
-        if (link->ipv6_address_state != ipv6_address_state) {
-                link->ipv6_address_state = ipv6_address_state;
-                changed = true;
-                if (strv_extend(&p, "IPv6AddressState") < 0)
-                        log_oom();
-        }
-
         if (link->operstate != operstate) {
                 link->operstate = operstate;
                 changed = true;

src/network/networkd-link.h

@@ -75,8 +75,6 @@ typedef struct Link {
         LinkOperationalState operstate;
         LinkCarrierState carrier_state;
         LinkAddressState address_state;
-        LinkAddressState ipv4_address_state;
-        LinkAddressState ipv6_address_state;
 
         unsigned address_messages;
         unsigned address_remove_messages;

src/network/networkd-manager-bus.c

@@ -235,8 +235,6 @@ const sd_bus_vtable manager_vtable[] = {
         SD_BUS_PROPERTY("OperationalState", "s", property_get_operational_state, offsetof(Manager, operational_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("CarrierState", "s", property_get_carrier_state, offsetof(Manager, carrier_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
         SD_BUS_PROPERTY("AddressState", "s", property_get_address_state, offsetof(Manager, address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
-        SD_BUS_PROPERTY("IPv4AddressState", "s", property_get_address_state, offsetof(Manager, ipv4_address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
-        SD_BUS_PROPERTY("IPv6AddressState", "s", property_get_address_state, offsetof(Manager, ipv6_address_state), SD_BUS_VTABLE_PROPERTY_EMITS_CHANGE),
 
         SD_BUS_METHOD_WITH_ARGS("ListLinks",
                                 SD_BUS_NO_ARGS,

src/network/networkd-manager.c

@@ -380,7 +380,6 @@ int manager_new(Manager **ret) {
         *m = (Manager) {
                 .speed_meter_interval_usec = SPEED_METER_DEFAULT_TIME_INTERVAL,
                 .manage_foreign_routes = true,
-                .manage_foreign_rules = true,
                 .ethtool_fd = -1,
         };
 
@@ -656,9 +655,6 @@ static int manager_enumerate_rules(Manager *m) {
         assert(m);
         assert(m->rtnl);
 
-        if (!m->manage_foreign_rules)
-                return 0;
-
         r = sd_rtnl_message_new_routing_policy_rule(m->rtnl, &req, RTM_GETRULE, 0);
         if (r < 0)
                 return r;

src/network/networkd-manager.h

@@ -32,7 +32,6 @@ struct Manager {
         bool dirty;
         bool restarting;
         bool manage_foreign_routes;
-        bool manage_foreign_rules;
 
         Set *dirty_links;
 
@@ -40,8 +39,6 @@ struct Manager {
         LinkOperationalState operational_state;
         LinkCarrierState carrier_state;
         LinkAddressState address_state;
-        LinkAddressState ipv4_address_state;
-        LinkAddressState ipv6_address_state;
 
         Hashmap *links;
         Hashmap *netdevs;

src/network/networkd-network-gperf.gperf

@@ -67,7 +67,6 @@ Link.Promiscuous,                            config_parse_tristate,
 Link.Unmanaged,                              config_parse_bool,                                        0,                             offsetof(Network, unmanaged)
 Link.ActivationPolicy,                       config_parse_activation_policy,                           0,                             offsetof(Network, activation_policy)
 Link.RequiredForOnline,                      config_parse_required_for_online,                         0,                             0
-Link.RequiredFamilyForOnline,                config_parse_required_family_for_online,                  0,                             offsetof(Network, required_family_for_online)
 SR-IOV.VirtualFunction,                      config_parse_sr_iov_uint32,                               0,                             0
 SR-IOV.VLANId,                               config_parse_sr_iov_uint32,                               0,                             0
 SR-IOV.QualityOfService,                     config_parse_sr_iov_uint32,                               0,                             0

src/network/networkd-network.c

@@ -1196,9 +1196,6 @@ int config_parse_required_for_online(
         return 0;
 }
 
-DEFINE_CONFIG_PARSE_ENUM(config_parse_required_family_for_online, link_required_address_family, AddressFamily,
-                         "Failed to parse RequiredFamilyForOnline= setting");
-
 DEFINE_CONFIG_PARSE_ENUM(config_parse_keep_configuration, keep_configuration, KeepConfiguration,
                          "Failed to parse KeepConfiguration= setting");
 

src/network/networkd-network.h

@@ -104,7 +104,6 @@ struct Network {
         bool unmanaged;
         bool required_for_online; /* Is this network required to be considered online? */
         LinkOperationalStateRange required_operstate_for_online;
-        AddressFamily required_family_for_online;
         ActivationPolicy activation_policy;
 
         /* misc settings */
@@ -349,7 +348,6 @@ CONFIG_PARSER_PROTOTYPE(config_parse_timezone);
 CONFIG_PARSER_PROTOTYPE(config_parse_dnssec_negative_trust_anchors);
 CONFIG_PARSER_PROTOTYPE(config_parse_ntp);
 CONFIG_PARSER_PROTOTYPE(config_parse_required_for_online);
-CONFIG_PARSER_PROTOTYPE(config_parse_required_family_for_online);
 CONFIG_PARSER_PROTOTYPE(config_parse_keep_configuration);
 CONFIG_PARSER_PROTOTYPE(config_parse_ipv6_link_local_address_gen_mode);
 CONFIG_PARSER_PROTOTYPE(config_parse_activation_policy);

src/network/networkd-routing-policy-rule.c

@@ -977,8 +977,6 @@ int manager_rtnl_process_rule(sd_netlink *rtnl, sd_netlink_message *message, Man
         case RTM_NEWRULE:
                 if (rule)
                         log_routing_policy_rule_debug(tmp, tmp->family, "Received remembered", NULL, m);
-                else if (!m->manage_foreign_routes)
-                        log_routing_policy_rule_debug(tmp, tmp->family, "Ignoring received foreign", NULL, m);
                 else {
                         log_routing_policy_rule_debug(tmp, tmp->family, "Remembering foreign", NULL, m);
                         r = routing_policy_rule_consume_foreign(m, TAKE_PTR(tmp));

src/network/networkd-state-file.c

@@ -105,11 +105,10 @@ static int ordered_set_put_in4_addrv(
 
 int manager_save(Manager *m) {
         _cleanup_ordered_set_free_ OrderedSet *dns = NULL, *ntp = NULL, *sip = NULL, *search_domains = NULL, *route_domains = NULL;
-        const char *operstate_str, *carrier_state_str, *address_state_str, *ipv4_address_state_str, *ipv6_address_state_str;
+        const char *operstate_str, *carrier_state_str, *address_state_str;
         LinkOperationalState operstate = LINK_OPERSTATE_OFF;
         LinkCarrierState carrier_state = LINK_CARRIER_STATE_OFF;
-        LinkAddressState ipv4_address_state = LINK_ADDRESS_STATE_OFF, ipv6_address_state = LINK_ADDRESS_STATE_OFF,
+        LinkAddressState address_state = LINK_ADDRESS_STATE_OFF;
-                address_state = LINK_ADDRESS_STATE_OFF;
         _cleanup_(unlink_and_freep) char *temp_path = NULL;
         _cleanup_strv_free_ char **p = NULL;
         _cleanup_fclose_ FILE *f = NULL;
@@ -134,12 +133,6 @@ int manager_save(Manager *m) {
                 if (link->address_state > address_state)
                         address_state = link->address_state;
 
-                if (link->ipv4_address_state > ipv4_address_state)
-                        ipv4_address_state = link->ipv4_address_state;
-
-                if (link->ipv6_address_state > ipv6_address_state)
-                        ipv6_address_state = link->ipv6_address_state;
-
                 if (!link->network)
                         continue;
 
@@ -233,12 +226,6 @@ int manager_save(Manager *m) {
         address_state_str = link_address_state_to_string(address_state);
         assert(address_state_str);
 
-        ipv4_address_state_str = link_address_state_to_string(ipv4_address_state);
-        assert(ipv4_address_state_str);
-
-        ipv6_address_state_str = link_address_state_to_string(ipv6_address_state);
-        assert(ipv6_address_state_str);
-
         r = fopen_temporary(m->state_file, &f, &temp_path);
         if (r < 0)
                 return r;
@@ -249,10 +236,8 @@ int manager_save(Manager *m) {
                 "# This is private data. Do not parse.\n"
                 "OPER_STATE=%s\n"
                 "CARRIER_STATE=%s\n"
-                "ADDRESS_STATE=%s\n"
+                "ADDRESS_STATE=%s\n",
-                "IPV4_ADDRESS_STATE=%s\n"
+                operstate_str, carrier_state_str, address_state_str);
-                "IPV6_ADDRESS_STATE=%s\n",
-                operstate_str, carrier_state_str, address_state_str, ipv4_address_state_str, ipv6_address_state_str);
 
         ordered_set_print(f, "DNS=", dns);
         ordered_set_print(f, "NTP=", ntp);
@@ -288,18 +273,6 @@ int manager_save(Manager *m) {
                         log_oom();
         }
 
-        if (m->ipv4_address_state != ipv4_address_state) {
-                m->ipv4_address_state = ipv4_address_state;
-                if (strv_extend(&p, "IPv4AddressState") < 0)
-                        log_oom();
-        }
-
-        if (m->ipv6_address_state != ipv6_address_state) {
-                m->ipv6_address_state = ipv6_address_state;
-                if (strv_extend(&p, "IPv6AddressState") < 0)
-                        log_oom();
-        }
-
         if (p) {
                 r = manager_send_changed_strv(m, p);
                 if (r < 0)
@@ -403,7 +376,7 @@ static void serialize_addresses(
 }
 
 int link_save(Link *link) {
-        const char *admin_state, *oper_state, *carrier_state, *address_state, *ipv4_address_state, *ipv6_address_state;
+        const char *admin_state, *oper_state, *carrier_state, *address_state;
         _cleanup_(unlink_and_freep) char *temp_path = NULL;
         _cleanup_fclose_ FILE *f = NULL;
         int r;
@@ -430,12 +403,6 @@ int link_save(Link *link) {
         address_state = link_address_state_to_string(link->address_state);
         assert(address_state);
 
-        ipv4_address_state = link_address_state_to_string(link->ipv4_address_state);
-        assert(ipv4_address_state);
-
-        ipv6_address_state = link_address_state_to_string(link->ipv6_address_state);
-        assert(ipv6_address_state);
-
         r = fopen_temporary(link->state_file, &f, &temp_path);
         if (r < 0)
                 return r;
@@ -447,10 +414,8 @@ int link_save(Link *link) {
                 "ADMIN_STATE=%s\n"
                 "OPER_STATE=%s\n"
                 "CARRIER_STATE=%s\n"
-                "ADDRESS_STATE=%s\n"
+                "ADDRESS_STATE=%s\n",
-                "IPV4_ADDRESS_STATE=%s\n"
+                admin_state, oper_state, carrier_state, address_state);
-                "IPV6_ADDRESS_STATE=%s\n",
-                admin_state, oper_state, carrier_state, address_state, ipv4_address_state, ipv6_address_state);
 
         if (link->network) {
                 char **dhcp6_domains = NULL, **dhcp_domains = NULL;
@@ -466,9 +431,6 @@ int link_save(Link *link) {
                         st.max != LINK_OPERSTATE_RANGE_DEFAULT.max ? ":" : "",
                         st.max != LINK_OPERSTATE_RANGE_DEFAULT.max ? strempty(link_operstate_to_string(st.max)) : "");
 
-                fprintf(f, "REQUIRED_FAMILY_FOR_ONLINE=%s\n",
-                        link_required_address_family_to_string(link->network->required_family_for_online));
-
                 fprintf(f, "ACTIVATION_POLICY=%s\n",
                         activation_policy_to_string(link->network->activation_policy));
 

src/network/networkd-util.h

@@ -8,9 +8,18 @@
 #include "hashmap.h"
 #include "log.h"
 #include "macro.h"
-#include "network-util.h"
 #include "string-util.h"
 
+typedef enum AddressFamily {
+        /* This is a bitmask, though it usually doesn't feel that way! */
+        ADDRESS_FAMILY_NO             = 0,
+        ADDRESS_FAMILY_IPV4           = 1 << 0,
+        ADDRESS_FAMILY_IPV6           = 1 << 1,
+        ADDRESS_FAMILY_YES            = ADDRESS_FAMILY_IPV4 | ADDRESS_FAMILY_IPV6,
+        _ADDRESS_FAMILY_MAX,
+        _ADDRESS_FAMILY_INVALID = -EINVAL,
+} AddressFamily;
+
 typedef struct NetworkConfigSection {
         unsigned line;
         bool invalid;

src/network/networkd.conf

@@ -15,9 +15,7 @@
 [Network]
 #SpeedMeter=no
 #SpeedMeterIntervalSec=10sec
-#ManageForeignRoutingPolicyRules=yes
 #ManageForeignRoutes=yes
-#RouteTable=
 
 [DHCP]
 #DUIDType=vendor

src/network/wait-online/link.c

@@ -97,8 +97,7 @@ int link_update_rtnl(Link *l, sd_netlink_message *m) {
 }
 
 int link_update_monitor(Link *l) {
-        _cleanup_free_ char *operstate = NULL, *required_operstate = NULL, *required_family = NULL,
+        _cleanup_free_ char *operstate = NULL, *required_operstate = NULL, *state = NULL;
-                *ipv4_address_state = NULL, *ipv6_address_state = NULL, *state = NULL;
         int r, ret = 0;
 
         assert(l);
@@ -136,47 +135,6 @@ int link_update_monitor(Link *l) {
                         l->operational_state = s;
         }
 
-        r = sd_network_link_get_required_family_for_online(l->ifindex, &required_family);
-        if (r < 0)
-                ret = log_link_debug_errno(l, r, "Failed to get required address family, ignoring: %m");
-        else if (isempty(required_family))
-                l->required_family = ADDRESS_FAMILY_NO;
-        else {
-                AddressFamily f;
-
-                f = link_required_address_family_from_string(required_family);
-                if (f < 0)
-                        ret = log_link_debug_errno(l, f, "Failed to parse required address family, ignoring: %m");
-                else
-                        l->required_family = f;
-        }
-
-        r = sd_network_link_get_ipv4_address_state(l->ifindex, &ipv4_address_state);
-        if (r < 0)
-                ret = log_link_debug_errno(l, r, "Failed to get IPv4 address state, ignoring: %m");
-        else {
-                LinkAddressState s;
-
-                s = link_address_state_from_string(ipv4_address_state);
-                if (s < 0)
-                        ret = log_link_debug_errno(l, s, "Failed to parse IPv4 address state, ignoring: %m");
-                else
-                        l->ipv4_address_state = s;
-        }
-
-        r = sd_network_link_get_ipv6_address_state(l->ifindex, &ipv6_address_state);
-        if (r < 0)
-                ret = log_link_debug_errno(l, r, "Failed to get IPv6 address state, ignoring: %m");
-        else {
-                LinkAddressState s;
-
-                s = link_address_state_from_string(ipv6_address_state);
-                if (s < 0)
-                        ret = log_link_debug_errno(l, s, "Failed to parse IPv6 address state, ignoring: %m");
-                else
-                        l->ipv6_address_state = s;
-        }
-
         r = sd_network_link_get_setup_state(l->ifindex, &state);
         if (r < 0)
                 ret = log_link_debug_errno(l, r, "Failed to get setup state, ignoring: %m");

src/network/wait-online/link.h

@@ -19,9 +19,6 @@ struct Link {
         bool required_for_online;
         LinkOperationalStateRange required_operstate;
         LinkOperationalState operational_state;
-        AddressFamily required_family;
-        LinkAddressState ipv4_address_state;
-        LinkAddressState ipv6_address_state;
         char *state;
 };
 

src/network/wait-online/manager.c

@@ -32,13 +32,6 @@ static bool manager_ignore_link(Manager *m, Link *link) {
 }
 
 static int manager_link_is_online(Manager *m, Link *l, LinkOperationalStateRange s) {
-        AddressFamily required_family;
-        bool needs_ipv4;
-        bool needs_ipv6;
-
-        assert(m);
-        assert(l);
-
         /* This returns the following:
          * -EAGAIN: not processed by udev or networkd
          *       0: operstate is not enough
@@ -67,35 +60,7 @@ static int manager_link_is_online(Manager *m, Link *l, LinkOperationalStateRange
                 return 0;
         }
 
-        required_family = m->required_family > 0 ? m->required_family : l->required_family;
-        needs_ipv4 = required_family & ADDRESS_FAMILY_IPV4;
-        needs_ipv6 = required_family & ADDRESS_FAMILY_IPV6;
-
-        if (s.min >= LINK_OPERSTATE_DEGRADED) {
-                if (needs_ipv4 && l->ipv4_address_state < LINK_ADDRESS_STATE_DEGRADED)
-                        goto ipv4_not_ready;
-
-                if (needs_ipv6 && l->ipv6_address_state < LINK_ADDRESS_STATE_DEGRADED)
-                        goto ipv6_not_ready;
-        }
-
-        if (s.min >= LINK_OPERSTATE_ROUTABLE) {
-                if (needs_ipv4 && l->ipv4_address_state < LINK_ADDRESS_STATE_ROUTABLE)
-                        goto ipv4_not_ready;
-
-                if (needs_ipv6 && l->ipv6_address_state < LINK_ADDRESS_STATE_ROUTABLE)
-                        goto ipv6_not_ready;
-        }
-
         return 1;
-
-ipv4_not_ready:
-        log_link_debug(l, "No routable or link-local IPv4 address is configured.");
-        return 0;
-
-ipv6_not_ready:
-        log_link_debug(l, "No routable or link-local IPv6 address is configured.");
-        return 0;
 }
 
 bool manager_configured(Manager *m) {
@@ -333,7 +298,6 @@ static int manager_network_monitor_listen(Manager *m) {
 
 int manager_new(Manager **ret, Hashmap *interfaces, char **ignore,
                 LinkOperationalStateRange required_operstate,
-                AddressFamily required_family,
                 bool any, usec_t timeout) {
         _cleanup_(manager_freep) Manager *m = NULL;
         int r;
@@ -348,7 +312,6 @@ int manager_new(Manager **ret, Hashmap *interfaces, char **ignore,
                 .interfaces = interfaces,
                 .ignore = ignore,
                 .required_operstate = required_operstate,
-                .required_family = required_family,
                 .any = any,
         };
 

src/network/wait-online/manager.h

@@ -21,7 +21,6 @@ struct Manager {
         char **ignore;
 
         LinkOperationalStateRange required_operstate;
-        AddressFamily required_family;
         bool any;
 
         sd_netlink *rtnl;
@@ -36,7 +35,6 @@ struct Manager {
 Manager* manager_free(Manager *m);
 int manager_new(Manager **ret, Hashmap *interfaces, char **ignore,
                 LinkOperationalStateRange required_operstate,
-                AddressFamily required_family,
                 bool any, usec_t timeout);
 
 DEFINE_TRIVIAL_CLEANUP_FUNC(Manager*, manager_free);

src/network/wait-online/wait-online.c

@@ -19,7 +19,6 @@ static usec_t arg_timeout = 120 * USEC_PER_SEC;
 static Hashmap *arg_interfaces = NULL;
 static char **arg_ignore = NULL;
 static LinkOperationalStateRange arg_required_operstate = { _LINK_OPERSTATE_INVALID, _LINK_OPERSTATE_INVALID };
-static AddressFamily arg_required_family = ADDRESS_FAMILY_NO;
 static bool arg_any = false;
 
 STATIC_DESTRUCTOR_REGISTER(arg_interfaces, hashmap_free_free_freep);
@@ -43,8 +42,6 @@ static int help(void) {
                "     --ignore=INTERFACE     Don't take these interfaces into account\n"
                "  -o --operational-state=MIN_OPERSTATE[:MAX_OPERSTATE]\n"
                "                            Required operational state\n"
-               "  -4 --ipv4                 Requires at least one IPv4 address\n"
-               "  -6 --ipv6                 Requires at least one IPv6 address\n"
                "     --any                  Wait until at least one of the interfaces is online\n"
                "     --timeout=SECS         Maximum time to wait for network connectivity\n"
                "\nSee the %s for details.\n",
@@ -114,8 +111,6 @@ static int parse_argv(int argc, char *argv[]) {
                 { "interface",         required_argument, NULL, 'i'         },
                 { "ignore",            required_argument, NULL, ARG_IGNORE  },
                 { "operational-state", required_argument, NULL, 'o'         },
-                { "ipv4",              no_argument,       NULL, '4'         },
-                { "ipv6",              no_argument,       NULL, '6'         },
                 { "any",               no_argument,       NULL, ARG_ANY     },
                 { "timeout",           required_argument, NULL, ARG_TIMEOUT },
                 {}
@@ -126,7 +121,7 @@ static int parse_argv(int argc, char *argv[]) {
         assert(argc >= 0);
         assert(argv);
 
-        while ((c = getopt_long(argc, argv, "hi:qo:46", options, NULL)) >= 0)
+        while ((c = getopt_long(argc, argv, "hi:qo:", options, NULL)) >= 0)
 
                 switch (c) {
 
@@ -164,15 +159,6 @@ static int parse_argv(int argc, char *argv[]) {
 
                         break;
                 }
-
-                case '4':
-                        arg_required_family |= ADDRESS_FAMILY_IPV4;
-                        break;
-
-                case '6':
-                        arg_required_family |= ADDRESS_FAMILY_IPV6;
-                        break;
-
                 case ARG_ANY:
                         arg_any = true;
                         break;
@@ -211,7 +197,7 @@ static int run(int argc, char *argv[]) {
 
         assert_se(sigprocmask_many(SIG_BLOCK, NULL, SIGTERM, SIGINT, -1) >= 0);
 
-        r = manager_new(&m, arg_interfaces, arg_ignore, arg_required_operstate, arg_required_family, arg_any, arg_timeout);
+        r = manager_new(&m, arg_interfaces, arg_ignore, arg_required_operstate, arg_any, arg_timeout);
         if (r < 0)
                 return log_error_errno(r, "Could not create manager: %m");
 

src/systemd/sd-network.h

@@ -51,8 +51,6 @@ _SD_BEGIN_DECLARATIONS;
 int sd_network_get_operational_state(char **state);
 int sd_network_get_carrier_state(char **state);
 int sd_network_get_address_state(char **state);
-int sd_network_get_ipv4_address_state(char **state);
-int sd_network_get_ipv6_address_state(char **state);
 
 /* Get DNS entries for all links. These are string representations of
  * IP addresses */
@@ -94,11 +92,8 @@ int sd_network_link_get_setup_state(int ifindex, char **state);
  */
 int sd_network_link_get_operational_state(int ifindex, char **state);
 int sd_network_link_get_required_operstate_for_online(int ifindex, char **state);
-int sd_network_link_get_required_family_for_online(int ifindex, char **state);
 int sd_network_link_get_carrier_state(int ifindex, char **state);
 int sd_network_link_get_address_state(int ifindex, char **state);
-int sd_network_link_get_ipv4_address_state(int ifindex, char **state);
-int sd_network_link_get_ipv6_address_state(int ifindex, char **state);
 
 /* Indicates whether the network is relevant to being online.
  * Possible return codes:

test/TEST-50-DISSECT/test.sh

@@ -23,7 +23,6 @@ test_append_files() {
         install_dmevent
         generate_module_dependencies
         inst_binary losetup
-        inst_binary wc
         install_verity_minimal
     )
 }

test/fuzz/fuzz-network-parser/directives.network

@@ -32,7 +32,6 @@ PermanentMACAddress=
 [Link]
 ActivationPolicy=
 RequiredForOnline=
-RequiredFamilyForOnline=
 ARP=
 AllMulticast=
 Unmanaged=

test/fuzz/fuzz-unit-file/directives-all.service

@@ -545,7 +545,6 @@ RemoteChecksumRx=
 RemoteChecksumTx=
 ReorderHeader=
 RequestBroadcast=
-RequiredFamilyForOnline=
 RequiredForOnline=
 ResendIGMP=
 RootDistanceMaxSec=

test/test-network/conf/dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network

@@ -1,9 +0,0 @@
-[Match]
-Name=veth99
-
-[NetworkEmulator]
-DelaySec=9
-
-[Network]
-DHCP=ipv4
-IPv6AcceptRA=true

test/test-network/conf/dhcp-server-with-ipv6-prefix.network

@@ -1,11 +0,0 @@
-[Match]
-Name=veth-peer
-
-[Network]
-Address=192.168.5.1/24
-IPv6AcceptRA=no
-DHCPServer=yes
-IPv6SendRA=yes
-
-[IPv6Prefix]
-Prefix=2002:da8:1:0::/64

test/test-network/conf/ipv6-prefix-with-delay.network

@@ -1,12 +0,0 @@
-[Match]
-Name=veth-peer
-
-[NetworkEmulator]
-DelaySec=15
-
-[Network]
-IPv6AcceptRA=no
-IPv6SendRA=yes
-
-[IPv6Prefix]
-Prefix=2002:da8:1:0::/64

test/test-network/conf/ipv6ra-prefix-client-with-static-ipv4-address.network

@@ -1,6 +0,0 @@
-[Match]
-Name=veth99
-
-[Network]
-IPv6AcceptRA=true
-Address=192.168.5.1/24

test/test-network/conf/state-file-tests.network

@@ -3,7 +3,6 @@ Name=dummy98
 
 [Link]
 RequiredForOnline=routable
-RequiredFamilyForOnline=both
 
 [Network]
 IPv6AcceptRA=no
@@ -15,4 +14,3 @@ MulticastDNS=yes
 DNSSEC=no
 Address=192.168.10.10/24
 Address=192.168.12.12/24
-Address=2002:da8:1:0:1034:56ff:fe78:9abc/64

test/test-network/systemd-networkd-tests.py

@@ -555,7 +555,7 @@ class Utilities():
             self.fail(f'Timed out waiting for {link} to reach state {operstate}/{setup_state}')
         return False
 
-    def wait_online(self, links_with_operstate, timeout='20s', bool_any=False, ipv4=False, ipv6=False, setup_state='configured', setup_timeout=5):
+    def wait_online(self, links_with_operstate, timeout='20s', bool_any=False, setup_state='configured', setup_timeout=5):
         """Wait for the link(s) to reach the specified operstate and/or setup state.
 
         This is similar to wait_operstate() but can be used for multiple links,
@@ -569,9 +569,6 @@ class Utilities():
         Set 'bool_any' to True to wait for any (instead of all) of the given links.
         If this is set, no setup_state checks are done.
 
-        Set 'ipv4' or 'ipv6' to True to wait for IPv4 address or IPv6 address, respectively, of each of the given links.
-        This is applied only for the operational state 'degraded' or above.
-
         Note that this function waits for the link(s) to reach *or exceed* the given operstate.
         However, the setup_state, if specified, must be matched *exactly*.
 
@@ -581,10 +578,6 @@ class Utilities():
         args = wait_online_cmd + [f'--timeout={timeout}'] + [f'--interface={link}' for link in links_with_operstate]
         if bool_any:
             args += ['--any']
-        if ipv4:
-            args += ['--ipv4']
-        if ipv6:
-            args += ['--ipv6']
         try:
             check_output(*args, env=env)
         except subprocess.CalledProcessError:
@@ -1788,7 +1781,6 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
         'gretun97',
         'ip6gretun97',
         'test1',
-        'veth-peer',
         'veth99',
         'vrf99',
     ]
@@ -1850,10 +1842,6 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
         '25-vrf.netdev',
         '25-vrf.network',
         '26-link-local-addressing-ipv6.network',
-        'dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network',
-        'dhcp-server-with-ipv6-prefix.network',
-        'ipv6ra-prefix-client-with-static-ipv4-address.network',
-        'ipv6-prefix-with-delay.network',
         'routing-policy-rule-dummy98.network',
         'routing-policy-rule-test1.network',
         'routing-policy-rule-reconfigure1.network',
@@ -3111,22 +3099,6 @@ class NetworkdNetworkTests(unittest.TestCase, Utilities):
 
         call('rmmod netdevsim', stderr=subprocess.DEVNULL)
 
-    def test_wait_online_ipv4(self):
-        copy_unit_to_networkd_unit_path('25-veth.netdev', 'dhcp-server-with-ipv6-prefix.network', 'dhcp-client-ipv4-ipv6ra-prefix-client-with-delay.network')
-        start_networkd()
-
-        self.wait_online(['veth99:routable'], ipv4=True)
-
-        self.wait_address('veth99', r'192.168.5.[0-9]+', ipv='-4', timeout_sec=1)
-
-    def test_wait_online_ipv6(self):
-        copy_unit_to_networkd_unit_path('25-veth.netdev', 'ipv6-prefix-with-delay.network', 'ipv6ra-prefix-client-with-static-ipv4-address.network')
-        start_networkd()
-
-        self.wait_online(['veth99:routable'], ipv6=True)
-
-        self.wait_address('veth99', r'2002:da8:1:0:1034:56ff:fe78:9abc', ipv='-6', timeout_sec=1)
-
 class NetworkdStateFileTests(unittest.TestCase, Utilities):
     links = [
         'dummy98',
@@ -3163,13 +3135,10 @@ class NetworkdStateFileTests(unittest.TestCase, Utilities):
 
         with open(path) as f:
             data = f.read()
-            self.assertRegex(data, r'IPV4_ADDRESS_STATE=routable')
-            self.assertRegex(data, r'IPV6_ADDRESS_STATE=routable')
             self.assertRegex(data, r'ADMIN_STATE=configured')
             self.assertRegex(data, r'OPER_STATE=routable')
             self.assertRegex(data, r'REQUIRED_FOR_ONLINE=yes')
             self.assertRegex(data, r'REQUIRED_OPER_STATE_FOR_ONLINE=routable')
-            self.assertRegex(data, r'REQUIRED_FAMILY_FOR_ONLINE=both')
             self.assertRegex(data, r'ACTIVATION_POLICY=up')
             self.assertRegex(data, r'NETWORK_FILE=/run/systemd/network/state-file-tests.network')
             self.assertRegex(data, r'DNS=10.10.10.10#aaa.com 10.10.10.11:1111#bbb.com \[1111:2222::3333\]:1234#ccc.com')

test/units/testsuite-02.sh

@@ -1,13 +1,13 @@
 #!/usr/bin/env bash
-set -eux
+#set -ex
-set -o pipefail
+#set -o pipefail
 
 NPROC=$(nproc)
 MAX_QUEUE_SIZE=${NPROC:-2}
-mapfile -t TEST_LIST < <(find /usr/lib/systemd/tests/ -maxdepth 1 -type f -name "test-*")
+IFS=$'\n' TEST_LIST=($(ls /usr/lib/systemd/tests/test-*))
 
 # reset state
-rm -fv /failed-tests /skipped-tests /skipped
+rm /failed-tests /skipped-tests /skipped
 
 # Check & report test results
 # Arguments:
@@ -54,9 +54,10 @@ for task in "${TEST_LIST[@]}"; do
     # until one of the tasks finishes, so we can replace it.
     while [[ ${#running[@]} -ge $MAX_QUEUE_SIZE ]]; do
         for key in "${!running[@]}"; do
-            if ! kill -0 "${running[$key]}" &>/dev/null; then
+            if ! kill -0 ${running[$key]} &>/dev/null; then
                 # Task has finished, report its result and drop it from the queue
-                wait "${running[$key]}" && ec=0 || ec=$?
+                wait ${running[$key]}
+                ec=$?
                 report_result "$key" $ec
                 unset running["$key"]
                 # Break from inner for loop and outer while loop to skip

test/units/testsuite-03.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
-set -o pipefail
 
 # Test merging of a --job-mode=ignore-dependencies job into a previously
 # installed job.
@@ -18,7 +17,7 @@ grep 'hello\.service.*waiting' /root/list-jobs.txt
 START_SEC=$(date -u '+%s')
 systemctl start --job-mode=ignore-dependencies hello
 END_SEC=$(date -u '+%s')
-ELAPSED=$((END_SEC-START_SEC))
+ELAPSED=$(($END_SEC-$START_SEC))
 
 test "$ELAPSED" -lt 3
 
@@ -76,14 +75,14 @@ EOF
 START_SEC=$(date -u '+%s')
 systemctl start --wait wait2.service
 END_SEC=$(date -u '+%s')
-ELAPSED=$((END_SEC-START_SEC))
+ELAPSED=$(($END_SEC-$START_SEC))
 [[ "$ELAPSED" -ge 2 ]] && [[ "$ELAPSED" -le 4 ]] || exit 1
 
 # wait5fail fails, so systemctl should fail
 START_SEC=$(date -u '+%s')
 systemctl start --wait wait2.service wait5fail.service && { echo 'unexpected success'; exit 1; }
 END_SEC=$(date -u '+%s')
-ELAPSED=$((END_SEC-START_SEC))
+ELAPSED=$(($END_SEC-$START_SEC))
 [[ "$ELAPSED" -ge 5 ]] && [[ "$ELAPSED" -le 7 ]] || exit 1
 
 # Test time-limited scopes
@@ -92,7 +91,7 @@ set +e
 systemd-run --scope --property=RuntimeMaxSec=3s sleep 10
 RESULT=$?
 END_SEC=$(date -u '+%s')
-ELAPSED=$((END_SEC-START_SEC))
+ELAPSED=$(($END_SEC-$START_SEC))
 [[ "$ELAPSED" -ge 3 ]] && [[ "$ELAPSED" -le 5 ]] || exit 1
 [[ "$RESULT" -ne 0 ]] || exit 1
 

test/units/testsuite-04.sh

@@ -1,19 +1,20 @@
 #!/usr/bin/env bash
-set -eux
+set -x
+set -e
 set -o pipefail
 
 # Test stdout stream
 
 # Skip empty lines
 ID=$(journalctl --new-id128 | sed -n 2p)
-: >/expected
+>/expected
 printf $'\n\n\n' | systemd-cat -t "$ID" --level-prefix false
 journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
 cmp /expected /output
 
 ID=$(journalctl --new-id128 | sed -n 2p)
-: >/expected
+>/expected
 printf $'<5>\n<6>\n<7>\n' | systemd-cat -t "$ID" --level-prefix true
 journalctl --sync
 journalctl -b -o cat -t "$ID" >/output
@@ -54,7 +55,7 @@ ID=$(journalctl --new-id128 | sed -n 2p)
 printf $'foo' | systemd-cat -t "$ID" --level-prefix false
 journalctl --sync
 journalctl -b -o export --output-fields=MESSAGE,FOO --output-fields=PRIORITY,MESSAGE -t "$ID" >/output
-[[ $(grep -c . /output) -eq 6 ]]
+[[ `grep -c . /output` -eq 6 ]]
 grep -q '^__CURSOR=' /output
 grep -q '^MESSAGE=foo$' /output
 grep -q '^PRIORITY=6$' /output
@@ -82,7 +83,7 @@ journalctl --sync
 # We can drop this grep when https://github.com/systemd/systemd/issues/13937
 # has a fix.
 journalctl -b -o export -t "$ID" --output-fields=_PID | grep '^_PID=' >/output
-[[ $(grep -c . /output) -eq 2 ]]
+[[ `grep -c . /output` -eq 2 ]]
 grep -q "^_PID=$PID" /output
 grep -vq "^_PID=$PID" /output
 

test/units/testsuite-05.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eux
+set -x
+set -e
 set -o pipefail
 
 P=/run/systemd/system.conf.d
@@ -18,9 +19,7 @@ systemctl daemon-reload
 [[ "$(systemctl show -P LimitNOFILESoft testsuite-05.service)" = "10000" ]]
 [[ "$(systemctl show -P LimitNOFILE testsuite-05.service)" = "16384" ]]
 
-# shellcheck disable=SC2016
 systemd-run --wait -t bash -c '[[ "$(ulimit -n -S)" = "10000" ]]'
-# shellcheck disable=SC2016
 systemd-run --wait -t bash -c '[[ "$(ulimit -n -H)" = "16384" ]]'
 
 touch /testok

test/units/testsuite-06.sh

@@ -1,5 +1,6 @@
 #!/usr/bin/env bash
-set -eux
+set -x
+set -e
 set -o pipefail
 
 echo 1 >/sys/fs/selinux/enforce || {

test/units/testsuite-07.sh

@@ -1,31 +1,31 @@
 #!/usr/bin/env bash
-set -eux
+set -x
-set -o pipefail
+set -e
 
-: >/failed
+>/failed
 
-cat >/lib/systemd/system/my.service <<EOF
+cat <<'EOL' >/lib/systemd/system/my.service
 [Service]
 Type=oneshot
 ExecStart=/bin/echo Timer runs me
-EOF
+EOL
 
-cat >/lib/systemd/system/my.timer <<EOF
+cat <<'EOL' >/lib/systemd/system/my.timer
 [Timer]
 OnBootSec=10s
 OnUnitInactiveSec=1h
-EOF
+EOL
 
 systemctl unmask my.timer
 
 systemctl start my.timer
 
 mkdir -p /etc/systemd/system/my.timer.d/
-cat >/etc/systemd/system/my.timer.d/override.conf <<EOF
+cat <<'EOL' >/etc/systemd/system/my.timer.d/override.conf
 [Timer]
 OnBootSec=10s
 OnUnitInactiveSec=1h
-EOF
+EOL
 
 systemctl daemon-reload
 

test/units/testsuite-11.sh

@@ -1,8 +1,7 @@
 #!/usr/bin/env bash
-set -eux
+set -x
-set -o pipefail
 
-systemctl --no-block start fail-on-restart.service
+systemctl start fail-on-restart.service
 active_state=$(systemctl show --value --property ActiveState fail-on-restart.service)
 while [[ "$active_state" == "activating" || "$active_state" == "active" ]]; do
     sleep 1

test/units/testsuite-12.sh

@@ -1,9 +1,10 @@
 #!/usr/bin/env bash
-set -eux
+set -x
+set -e
 set -o pipefail
 
 U=/run/systemd/system/test12.socket
-cat >$U <<EOF
+cat <<'EOF' >$U
 [Unit]
 Description=Test 12 socket
 [Socket]
@@ -13,7 +14,7 @@ SocketGroup=adm
 SocketMode=0660
 EOF
 
-cat >/run/systemd/system/test12@.service <<EOF
+cat <<'EOF' >/run/systemd/system/test12@.service
 [Unit]
 Description=Test service
 [Service]

test/units/testsuite-13.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2016
+set -x
-set -eux
+set -e
+set -u
 set -o pipefail
 
 export SYSTEMD_LOG_LEVEL=debug
@@ -30,10 +31,10 @@ if unshare -U sh -c :; then
     is_user_ns_supported=yes
 fi
 
-SUSE_OPTS=()
+SUSE_OPTS=""
 ID_LIKE=$(awk -F= '$1=="ID_LIKE" { print $2 ;}' /etc/os-release)
 if [[ "$ID_LIKE" = *"suse"* ]]; then
-    SUSE_OPTS+=(--bind /lib64 --bind /usr/lib64)
+    SUSE_OPTS="--bind /lib64 --bind /usr/lib64 "
 fi
 
 function check_bind_tmp_path {
@@ -41,8 +42,8 @@ function check_bind_tmp_path {
     local _root="/var/lib/machines/testsuite-13.bind-tmp-path"
     rm -rf "$_root"
     /usr/lib/systemd/tests/testdata/create-busybox-container "$_root"
-    : >/tmp/bind
+    >/tmp/bind
-    systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" --bind=/tmp/bind /bin/sh -c 'test -e /tmp/bind'
+    systemd-nspawn $SUSE_OPTS--register=no -D "$_root" --bind=/tmp/bind /bin/sh -c 'test -e /tmp/bind'
 }
 
 function check_norbind {
@@ -54,15 +55,15 @@ function check_norbind {
     mount -t tmpfs tmpfs /tmp/binddir/subdir
     echo -n "inner" >/tmp/binddir/subdir/file
     /usr/lib/systemd/tests/testdata/create-busybox-container "$_root"
-    systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" --bind=/tmp/binddir:/mnt:norbind /bin/sh -c 'CONTENT=$(cat /mnt/subdir/file); if [[ $CONTENT != "outer" ]]; then echo "*** unexpected content: $CONTENT"; return 1; fi'
+    systemd-nspawn $SUSE_OPTS--register=no -D "$_root" --bind=/tmp/binddir:/mnt:norbind /bin/sh -c 'CONTENT=$(cat /mnt/subdir/file); if [[ $CONTENT != "outer" ]]; then echo "*** unexpected content: $CONTENT"; return 1; fi'
 }
 
 function check_notification_socket {
     # https://github.com/systemd/systemd/issues/4944
     local _cmd='echo a | $(busybox which nc) -U -u -w 1 /run/host/notify'
     # /testsuite-13.nc-container is prepared by test.sh
-    systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D /testsuite-13.nc-container /bin/sh -x -c "$_cmd"
+    systemd-nspawn $SUSE_OPTS--register=no -D /testsuite-13.nc-container /bin/sh -x -c "$_cmd"
-    systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D /testsuite-13.nc-container -U /bin/sh -x -c "$_cmd"
+    systemd-nspawn $SUSE_OPTS--register=no -D /testsuite-13.nc-container -U /bin/sh -x -c "$_cmd"
 }
 
 function check_os_release {
@@ -76,15 +77,15 @@ if echo test >>/run/host/os-release; then exit 1; fi
 '
 
     local _os_release_source="/etc/os-release"
-    if [[ ! -r "${_os_release_source}" ]]; then
+    if [ ! -r "${_os_release_source}" ]; then
         _os_release_source="/usr/lib/os-release"
-    elif [[ -L "${_os_release_source}" ]] && rm /etc/os-release; then
+    elif [ -L "${_os_release_source}" ] && rm /etc/os-release; then
         # Ensure that /etc always wins if available
         cp /usr/lib/os-release /etc
         echo MARKER=1 >>/etc/os-release
     fi
 
-    systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D /testsuite-13.nc-container --bind="${_os_release_source}":/tmp/os-release /bin/sh -x -e -c "$_cmd"
+    systemd-nspawn $SUSE_OPTS--register=no -D /testsuite-13.nc-container --bind="${_os_release_source}":/tmp/os-release /bin/sh -x -e -c "$_cmd"
 
     if grep -q MARKER /etc/os-release; then
         rm /etc/os-release
@@ -95,10 +96,10 @@ if echo test >>/run/host/os-release; then exit 1; fi
 function check_machinectl_bind {
     local _cmd='for i in $(seq 1 20); do if test -f /tmp/marker; then exit 0; fi; sleep 0.5; done; exit 1;'
 
-    cat >/run/systemd/system/nspawn_machinectl_bind.service <<EOF
+    cat <<EOF >/run/systemd/system/nspawn_machinectl_bind.service
 [Service]
 Type=notify
-ExecStart=systemd-nspawn ${SUSE_OPTS[@]} -D /testsuite-13.nc-container --notify-ready=no /bin/sh -x -e -c "$_cmd"
+ExecStart=systemd-nspawn $SUSE_OPTS -D /testsuite-13.nc-container --notify-ready=no /bin/sh -x -e -c "$_cmd"
 EOF
 
     systemctl start nspawn_machinectl_bind.service
@@ -112,7 +113,7 @@ EOF
         sleep 0.1
     done
 
-    return "$(systemctl show -P ExecMainStatus nspawn_machinectl_bind.service)"
+    return $(systemctl show -P ExecMainStatus nspawn_machinectl_bind.service)
 }
 
 function run {
@@ -128,54 +129,65 @@ function run {
     local _root="/var/lib/machines/testsuite-13.unified-$1-cgns-$2-api-vfs-writable-$3"
     rm -rf "$_root"
     /usr/lib/systemd/tests/testdata/create-busybox-container "$_root"
-    SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" -b
+    SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" -b
-    SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" --private-network -b
+    SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" --private-network -b
 
-    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" -U -b; then
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" -U -b; then
         [[ "$is_user_ns_supported" = "yes" && "$3" = "network" ]] && return 1
     else
         [[ "$is_user_ns_supported" = "no" && "$3" = "network" ]] && return 1
     fi
 
-    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" --private-network -U -b; then
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" --private-network -U -b; then
         [[ "$is_user_ns_supported" = "yes" && "$3" = "yes" ]] && return 1
     else
         [[ "$is_user_ns_supported" = "no" && "$3" = "yes" ]] && return 1
     fi
 
     local _netns_opt="--network-namespace-path=/proc/self/ns/net"
-    local _net_opts=(
-        "--network-bridge=lo"
-        "--network-interface=lo"
-        "--network-ipvlan=lo"
-        "--network-macvlan=lo"
-        "--network-veth"
-        "--network-veth-extra=lo"
-        "--network-zone=zone"
-    )
 
     # --network-namespace-path and network-related options cannot be used together
-    for netopt in "${_net_opts[@]}"; do
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --network-interface=lo -b; then
-        echo "$_netns_opt in combination with $netopt should fail"
+        return 1
-        if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" -b "$_netns_opt" "$netopt"; then
+    fi
-            echo >&2 "unexpected pass"
+
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --network-macvlan=lo -b; then
+        return 1
+    fi
+
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --network-ipvlan=lo -b; then
+        return 1
+    fi
+
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --network-veth -b; then
+        return 1
+    fi
+
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --network-veth-extra=lo -b; then
+        return 1
+    fi
+
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --network-bridge=lo -b; then
+        return 1
+    fi
+
+    if SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --network-zone=zone -b; then
         return 1
     fi
-    done
 
     # allow combination of --network-namespace-path and --private-network
-    if ! SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" -b "$_netns_opt" --private-network; then
+    if ! SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" --private-network -b; then
         return 1
     fi
 
     # test --network-namespace-path works with a network namespace created by "ip netns"
     ip netns add nspawn_test
     _netns_opt="--network-namespace-path=/run/netns/nspawn_test"
-    SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn "${SUSE_OPTS[@]}" --register=no -D "$_root" "$_netns_opt" /bin/ip a | grep -v -E '^1: lo.*UP'
+    SYSTEMD_NSPAWN_UNIFIED_HIERARCHY="$1" SYSTEMD_NSPAWN_USE_CGNS="$2" SYSTEMD_NSPAWN_API_VFS_WRITABLE="$3" systemd-nspawn $SUSE_OPTS--register=no -D "$_root" "$_netns_opt" /bin/ip a | grep -v -E '^1: lo.*UP'
     local r=$?
     ip netns del nspawn_test
 
-    if [[ $r -ne 0 ]]; then
+    if [ $r -ne 0 ]; then
         return 1
     fi
 

test/units/testsuite-14.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
-set -eux
+set -e
-set -o pipefail
+set -x
 
 function setup_root {
     local _root="$1"
@@ -21,18 +21,18 @@ r="$(pwd)/overwrite-broken-machine-id"
 setup_root "$r"
 systemd-machine-id-setup --print --root "$r"
 echo abc >>"$r/etc/machine-id"
-id="$(systemd-machine-id-setup --print --root "$r")"
+id=$(systemd-machine-id-setup --print --root "$r")
-echo "$id" >expected
+echo $id >expected
 check expected "$r/etc/machine-id"
 
-r="$PWD/transient-machine-id"
+r="$(pwd)/transient-machine-id"
 setup_root "$r"
 systemd-machine-id-setup --print --root "$r"
 echo abc >>"$r/etc/machine-id"
 mount -o remount,ro "$r"
 mount -t tmpfs tmpfs "$r/run"
-transient_id="$(systemd-machine-id-setup --print --root "$r")"
+transient_id=$(systemd-machine-id-setup --print --root "$r")
 mount -o remount,rw "$r"
-commited_id="$(systemd-machine-id-setup --print --commit --root "$r")"
+commited_id=$(systemd-machine-id-setup --print --commit --root "$r")
 [[ "$transient_id" = "$commited_id" ]]
 check "$r/etc/machine-id" "$r/run/machine-id"

test/units/testsuite-15.sh

@@ -1,55 +1,53 @@
 #! /bin/bash
-set -eux
+set -e
-set -o pipefail
+set -x
 
 _clear_service () {
-    local SERVICE_NAME="${1:?_clear_service: missing argument}"
+    systemctl stop $1.service 2>/dev/null || :
-    systemctl stop "$SERVICE_NAME.service" 2>/dev/null || :
+    rm -f  /{etc,run,usr/lib}/systemd/system/$1.service
-    rm -f  /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME".service
+    rm -fr /{etc,run,usr/lib}/systemd/system/$1.service.d
-    rm -fr /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME".service.d
+    rm -fr /{etc,run,usr/lib}/systemd/system/$1.service.{wants,requires}
-    rm -fr /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME".service.{wants,requires}
+    if [[ $1 == *@ ]]; then
-    if [[ $SERVICE_NAME == *@ ]]; then
+        systemctl stop $1*.service 2>/dev/null || :
-        systemctl stop "$SERVICE_NAME"*.service 2>/dev/null || :
+        rm -f  /{etc,run,usr/lib}/systemd/system/$1*.service
-        rm -f  /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME"*.service
+        rm -fr /{etc,run,usr/lib}/systemd/system/$1*.service.d
-        rm -fr /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME"*.service.d
+        rm -fr /{etc,run,usr/lib}/systemd/system/$1*.service.{wants,requires}
-        rm -fr /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME"*.service.{wants,requires}
     fi
 }
 
 clear_services () {
-    for u in "$@"; do
+    for u in $*; do
-        _clear_service "$u"
+        _clear_service $u
     done
     systemctl daemon-reload
 }
 
 create_service () {
-    local SERVICE_NAME="${1:?create_service: missing argument}"
+    clear_services $1
-    clear_services "$SERVICE_NAME"
 
-    cat >/etc/systemd/system/"$SERVICE_NAME".service <<EOF
+    cat >/etc/systemd/system/$1.service<<EOF
 [Unit]
-Description=$SERVICE_NAME unit
+Description=$1 unit
 
 [Service]
 ExecStart=/bin/sleep 100000
 EOF
-    mkdir -p /{etc,run,usr/lib}/systemd/system/"$SERVICE_NAME".service.d
+    mkdir -p /{etc,run,usr/lib}/systemd/system/$1.service.d
-    mkdir -p /etc/systemd/system/"$SERVICE_NAME".service.{wants,requires}
+    mkdir -p /etc/systemd/system/$1.service.{wants,requires}
-    mkdir -p /run/systemd/system/"$SERVICE_NAME".service.{wants,requires}
+    mkdir -p /run/systemd/system/$1.service.{wants,requires}
-    mkdir -p /usr/lib/systemd/system/"$SERVICE_NAME".service.{wants,requires}
+    mkdir -p /usr/lib/systemd/system/$1.service.{wants,requires}
 }
 
 create_services () {
-    for u in "$@"; do
+    for u in $*; do
-        create_service "$u"
+        create_service $u
     done
 }
 
 check_ok () {
     [ $# -eq 3 ] || return
 
-    x="$(systemctl show --value -p "$2" "$1")"
+    x="$(systemctl show --value -p $2 $1)"
     case "$x" in
         *$3*) return 0 ;;
         *)    return 1 ;;

test/units/testsuite-16.sh

@@ -1,24 +1,25 @@
 #!/usr/bin/env bash
-set -eux
+set -v -x
-set -o pipefail
 
 rm -f /test.log
 
-TESTLOG=/test.log.XXXXXXXX
+TL=/test.log.XXXXXXXX
 
 function wait_for()
 {
-    local service="${1:-wait_for: missing service argument}"
+    service=${1}
-    local result="${2:-success}"
+    result=${2:-success}
-    local time="${3:-45}"
+    time=${3:-45}
 
-    while [[ ! -f /${service}.terminated && ! -f /${service}.success && $time -gt 0 ]]; do
+    while [[ ! -f /${service}.terminated && ! -f /${service}.success && $time -gt 0  ]]
+    do
         sleep 1
-        time=$((time - 1))
+        time=$(( $time - 1 ))
     done
 
-    if [[ ! -f /${service}.${result} ]]; then
+    if [[ ! -f /${service}.${result} ]]
-        journalctl -u "${service/_/-}.service" >>"$TESTLOG"
+    then
+        journalctl -u ${service/_/-}.service >> "${TL}"
     fi
 }
 
@@ -43,11 +44,12 @@ wait_for fail_start startfail
 wait_for fail_stop stopfail
 wait_for fail_runtime runtimefail
 
-if [[ -f "$TESTLOG" ]]; then
+if [[ -f "${TL}" ]]
+then
     # no mv
-    cp "$TESTLOG" /test.log
+    cp "${TL}" /test.log
     exit 1
-fi
+else
-
     touch /testok
     exit 0
+fi

test/units/testsuite-17.03.sh

@@ -27,7 +27,7 @@ run_test() {
 
     echo add >/sys/class/net/lo/uevent
 
-    for _ in {1..20}; do
+    for n in {1..20}; do
         sleep 5
         if coredumpctl --since "$since" --no-legend --no-pager | grep /bin/udevadm ; then
             return 0

test/units/testsuite-17.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-set -eux
+set -x
-set -o pipefail
+set -e
 
-: >/failed
+>/failed
 
-for t in "${0%.sh}".*.sh; do
+for t in ${0%.sh}.*.sh; do
-    echo "Running $t"; ./"$t"
+    echo "Running $t"; ./$t
 done
 
 touch /testok

test/units/testsuite-18.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-run --wait -p FailureAction=poweroff true

test/units/testsuite-19.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 if grep -q cgroup2 /proc/filesystems ; then

test/units/testsuite-20.sh

@@ -1,11 +1,11 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
 systemd-analyze log-target console
 
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
 
 # Start a test process inside of our own cgroup
 sleep infinity &
@@ -14,45 +14,45 @@ disown
 
 # Start a test process outside of our own cgroup
 systemd-run -p DynamicUser=1 --unit=test20-sleep.service /bin/sleep infinity
-EXTERNALPID="$(systemctl show -P MainPID test20-sleep.service)"
+EXTERNALPID=`systemctl show -P MainPID test20-sleep.service`
 
 # Update our own main PID to the external test PID, this should work
-systemd-notify MAINPID="$EXTERNALPID"
+systemd-notify MAINPID=$EXTERNALPID
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq "$EXTERNALPID"
+test `systemctl show -P MainPID testsuite-20.service` -eq $EXTERNALPID
 
 # Update our own main PID to the internal test PID, this should work, too
 systemd-notify MAINPID=$INTERNALPID
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq "$INTERNALPID"
+test `systemctl show -P MainPID testsuite-20.service` -eq $INTERNALPID
 
 # Update it back to our own PID, this should also work
 systemd-notify MAINPID=$$
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
 
 # Try to set it to PID 1, which it should ignore, because that's the manager
 systemd-notify MAINPID=1
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
 
 # Try to set it to PID 0, which is invalid and should be ignored
 systemd-notify MAINPID=0
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
 
 # Try to set it to a valid but non-existing PID, which should be ignored. (Note
 # that we set the PID to a value well above any known /proc/sys/kernel/pid_max,
 # which means we can be pretty sure it doesn't exist by coincidence)
 systemd-notify MAINPID=1073741824
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
 
 # Change it again to the external PID, without privileges this time. This should be ignored, because the PID is from outside of our cgroup and we lack privileges.
-systemd-notify --uid=1000 MAINPID="$EXTERNALPID"
+systemd-notify --uid=1000 MAINPID=$EXTERNALPID
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
 
 # Change it again to the internal PID, without privileges this time. This should work, as the process is on our cgroup, and that's enough even if we lack privileges.
-systemd-notify --uid=1000 MAINPID="$INTERNALPID"
+systemd-notify --uid=1000 MAINPID=$INTERNALPID
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq "$INTERNALPID"
+test `systemctl show -P MainPID testsuite-20.service` -eq $INTERNALPID
 
 # Update it back to our own PID, this should also work
 systemd-notify --uid=1000 MAINPID=$$
-test "$(systemctl show -P MainPID testsuite-20.service)" -eq $$
+test `systemctl show -P MainPID testsuite-20.service` -eq $$
 
 cat >/tmp/test20-mainpid.sh <<EOF
 #!/usr/bin/env bash
@@ -76,7 +76,7 @@ EOF
 chmod +x /tmp/test20-mainpid.sh
 
 systemd-run --unit=test20-mainpidsh.service -p StandardOutput=tty -p StandardError=tty -p Type=forking -p RuntimeDirectory=mainpidsh -p PIDFile=/run/mainpidsh/pid /tmp/test20-mainpid.sh
-test "$(systemctl show -P MainPID test20-mainpidsh.service)" -eq "$(cat /run/mainpidsh/pid)"
+test `systemctl show -P MainPID test20-mainpidsh.service` -eq `cat /run/mainpidsh/pid`
 
 cat >/tmp/test20-mainpid2.sh <<EOF
 #!/usr/bin/env bash
@@ -101,7 +101,7 @@ EOF
 chmod +x /tmp/test20-mainpid2.sh
 
 systemd-run --unit=test20-mainpidsh2.service -p StandardOutput=tty -p StandardError=tty -p Type=forking -p RuntimeDirectory=mainpidsh2 -p PIDFile=/run/mainpidsh2/pid /tmp/test20-mainpid2.sh
-test "$(systemctl show -P MainPID test20-mainpidsh2.service)" -eq "$(cat /run/mainpidsh2/pid)"
+test `systemctl show -P MainPID test20-mainpidsh2.service` -eq `cat /run/mainpidsh2/pid`
 
 cat >/dev/shm/test20-mainpid3.sh <<EOF
 #!/usr/bin/env bash
@@ -140,7 +140,7 @@ systemd-run --unit=test20-mainpidsh3.service \
     && { echo 'unexpected success'; exit 1; }
 
 # Test that this failed due to timeout, and not some other error
-test "$(systemctl show -P Result test20-mainpidsh3.service)" = timeout
+test $(systemctl show -P Result test20-mainpidsh3.service) = timeout
 
 systemd-analyze log-level info
 

test/units/testsuite-22.01.sh

@@ -4,8 +4,7 @@
 # https://github.com/systemd/systemd/pull/6682.
 #
 
-set -eux
+set -e
-set -o pipefail
 
 rm -fr /tmp/test
 

test/units/testsuite-22.02.sh

@@ -3,8 +3,8 @@
 # Basic tests for types creating directories
 #
 
-set -eux
+set -e
-set -o pipefail
+set -x
 
 rm -fr /tmp/{C,d,D,e}
 mkdir  /tmp/{C,d,D,e}
@@ -21,10 +21,10 @@ d     /tmp/d/2    0755 daemon daemon - -
 EOF
 
 test -d /tmp/d/1
-test "$(stat -c %U:%G:%a /tmp/d/1)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/d/1) = "daemon:daemon:755"
 
 test -d /tmp/d/2
-test "$(stat -c %U:%G:%a /tmp/d/2)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/d/2) = "daemon:daemon:755"
 
 #
 # 'D'
@@ -39,10 +39,10 @@ D     /tmp/D/2    0755 daemon daemon - -
 EOF
 
 test -d /tmp/D/1
-test "$(stat -c %U:%G:%a /tmp/D/1)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/D/1) = "daemon:daemon:755"
 
 test -d /tmp/D/2
-test "$(stat -c %U:%G:%a /tmp/D/2)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/D/2) = "daemon:daemon:755"
 
 systemd-tmpfiles --remove - <<EOF
 D     /tmp/D/2    0755 daemon daemon - -
@@ -66,12 +66,12 @@ EOF
 test ! -d /tmp/e/1
 
 test -d /tmp/e/2
-test "$(stat -c %U:%G:%a /tmp/e/2)" = "root:root:777"
+test $(stat -c %U:%G:%a /tmp/e/2) = "root:root:777"
 
 test -d /tmp/e/2/d1
-test "$(stat -c %U:%G:%a /tmp/e/2/d1)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/e/2/d1) = "daemon:daemon:755"
 test -d /tmp/e/2/d2
-test "$(stat -c %U:%G:%a /tmp/e/2/d2)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/e/2/d2) = "daemon:daemon:755"
 
 # 'e' operates on directories only
 mkdir -p /tmp/e/3/{d1,d2}
@@ -87,12 +87,12 @@ EOF
 # the directories should have been processed although systemd-tmpfiles failed
 # previously due to the presence of a file.
 test -d /tmp/e/3/d1
-test "$(stat -c %U:%G:%a /tmp/e/3/d1)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/e/3/d1) = "daemon:daemon:755"
 test -d /tmp/e/3/d2
-test "$(stat -c %U:%G:%a /tmp/e/3/d2)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/e/3/d2) = "daemon:daemon:755"
 
 test -f /tmp/e/3/f1
-test "$(stat -c %U:%G:%a /tmp/e/3/f1)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/e/3/f1) = "root:root:644"
 
 #
 # 'C'
@@ -111,12 +111,12 @@ C     /tmp/C/2    0755 daemon daemon - /tmp/C/2-origin
 EOF
 
 test -d /tmp/C/1
-test "$(stat -c %U:%G:%a /tmp/C/1/f1)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/C/1/f1) = "daemon:daemon:755"
 test -d /tmp/C/2
-test "$(stat -c %U:%G:%a /tmp/C/2/f1)" = "daemon:daemon:755"
+test $(stat -c %U:%G:%a /tmp/C/2/f1) = "daemon:daemon:755"
 
 systemd-tmpfiles --create - <<EOF
 C     /tmp/C/3    0755 daemon daemon - /tmp/C/3-origin
 EOF
 
-test "$(stat -c %U:%G:%a /tmp/C/3/f1)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/C/3/f1) = "root:root:644"

test/units/testsuite-22.03.sh

@@ -3,8 +3,8 @@
 # Basic tests for types creating/writing files
 #
 
-set -eux
+set -e
-set -o pipefail
+set -x
 
 rm -fr /tmp/{f,F,w}
 mkdir  /tmp/{f,F,w}
@@ -20,9 +20,9 @@ EOF
 
 ### '1' should exist and be empty
 test -f /tmp/f/1; test ! -s /tmp/f/1
-test "$(stat -c %U:%G:%a /tmp/f/1)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/f/1) = "root:root:644"
 
-test "$(stat -c %U:%G:%a /tmp/f/2)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/f/2) = "root:root:644"
 test "$(< /tmp/f/2)" = "This string should be written"
 
 ### The perms are supposed to be updated even if the file already exists.
@@ -32,7 +32,7 @@ EOF
 
 # file should be empty
 test ! -s /tmp/f/1
-test "$(stat -c %U:%G:%a /tmp/f/1)" = "daemon:daemon:666"
+test $(stat -c %U:%G:%a /tmp/f/1) = "daemon:daemon:666"
 
 ### But we shouldn't try to set perms on an existing file which is not a
 ### regular one.
@@ -44,7 +44,7 @@ f     /tmp/f/fifo    0666 daemon daemon - This string should not be written
 EOF
 
 test -p /tmp/f/fifo
-test "$(stat -c %U:%G:%a /tmp/f/fifo)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/f/fifo) = "root:root:644"
 
 ### 'f' should not follow symlinks.
 ln -s missing /tmp/f/dangling
@@ -55,7 +55,7 @@ f     /tmp/f/dangling    0644 daemon daemon - -
 f     /tmp/f/symlink     0644 daemon daemon - -
 EOF
 test ! -e /tmp/f/missing
-test "$(stat -c %U:%G:%a /tmp/file-owned-by-root)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/file-owned-by-root) = "root:root:644"
 
 ### Handle read-only filesystem gracefully: we shouldn't fail if the target
 ### already exists and have the correct perms.
@@ -75,7 +75,7 @@ test -f /tmp/f/ro-fs/foo; test ! -s /tmp/f/ro-fs/foo
 systemd-tmpfiles --create - <<EOF && { echo 'unexpected success'; exit 1; }
 f     /tmp/f/ro-fs/foo    0666 - - - -
 EOF
-test "$(stat -c %U:%G:%a /tmp/f/fifo)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/f/fifo) = "root:root:644"
 
 systemd-tmpfiles --create - <<EOF && { echo 'unexpected success'; exit 1; }
 f     /tmp/f/ro-fs/bar    0644 - - - -
@@ -109,9 +109,9 @@ test -f /tmp/F/created; test ! -s /tmp/F/created
 test -f /tmp/F/created-with-content
 test "$(< /tmp/F/created-with-content)" = "new content"
 test -f /tmp/F/truncated; test ! -s /tmp/F/truncated
-test "$(stat -c %U:%G:%a /tmp/F/truncated)" = "daemon:daemon:666"
+test $(stat -c %U:%G:%a /tmp/F/truncated) = "daemon:daemon:666"
 test -s /tmp/F/truncated-with-content
-test "$(stat -c %U:%G:%a /tmp/F/truncated-with-content)" = "daemon:daemon:666"
+test $(stat -c %U:%G:%a /tmp/F/truncated-with-content) = "daemon:daemon:666"
 
 ### We shouldn't try to truncate anything but regular files since the behavior is
 ### unspecified in the other cases.
@@ -132,7 +132,7 @@ f     /tmp/F/dangling    0644 daemon daemon - -
 f     /tmp/F/symlink     0644 daemon daemon - -
 EOF
 test ! -e /tmp/F/missing
-test "$(stat -c %U:%G:%a /tmp/file-owned-by-root)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/file-owned-by-root) = "root:root:644"
 
 ### Handle read-only filesystem gracefully: we shouldn't fail if the target
 ### already exists and is empty.
@@ -161,11 +161,11 @@ test -f /tmp/F/ro-fs/foo
 grep -q 'truncating is not allowed' /tmp/F/ro-fs/foo
 
 # Trying to change the perms should fail.
-: >/tmp/F/rw-fs/foo
+>/tmp/F/rw-fs/foo
 systemd-tmpfiles --create - <<EOF && { echo 'unexpected success'; exit 1; }
 F     /tmp/F/ro-fs/foo    0666 - - - -
 EOF
-test "$(stat -c %U:%G:%a /tmp/F/ro-fs/foo)" = "root:root:644"
+test $(stat -c %U:%G:%a /tmp/F/ro-fs/foo) = "root:root:644"
 
 ### Try to create a new file.
 systemd-tmpfiles --create - <<EOF && { echo 'unexpected success'; exit 1; }

test/units/testsuite-22.04.sh

@@ -3,8 +3,8 @@
 # Basic tests for types creating fifos
 #
 
-set -eux
+set -e
-set -o pipefail
+set -x
 
 rm -fr /tmp/p
 mkdir  /tmp/p
@@ -15,7 +15,7 @@ p     /tmp/p/fifo1    0666 - - - -
 EOF
 
 test -p /tmp/p/fifo1
-test "$(stat -c %U:%G:%a /tmp/p/fifo1)" = "root:root:666"
+test $(stat -c %U:%G:%a /tmp/p/fifo1) = "root:root:666"
 
 # Refuse to overwrite an existing file. Error is not propagated.
 systemd-tmpfiles --create - <<EOF
@@ -30,7 +30,7 @@ p+     /tmp/p/f1    0666 - - - -
 EOF
 
 test -p /tmp/p/f1
-test "$(stat -c %U:%G:%a /tmp/p/f1)" = "root:root:666"
+test $(stat -c %U:%G:%a /tmp/p/f1) = "root:root:666"
 
 #
 # Must be fixed

test/units/testsuite-22.05.sh

@@ -1,7 +1,7 @@
 #! /bin/bash
 
-set -eux
+set -e
-set -o pipefail
+set -x
 
 rm -fr /tmp/{z,Z}
 mkdir  /tmp/{z,Z}
@@ -17,15 +17,15 @@ z     /tmp/z/f1    0755 daemon daemon - -
 z     /tmp/z/d1    0755 daemon daemon - -
 EOF
 
-test "$(stat -c %U:%G /tmp/z/f1)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/z/f1) = "daemon:daemon"
-test "$(stat -c %U:%G /tmp/z/d1)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/z/d1) = "daemon:daemon"
-test "$(stat -c %U:%G /tmp/z/d1/f11)" = "root:root"
+test $(stat -c %U:%G /tmp/z/d1/f11) = "root:root"
 
 systemd-tmpfiles --create - <<EOF
 z     /tmp/z/d2/*    0755 daemon daemon - -
 EOF
 
-test "$(stat -c %U:%G /tmp/z/d2/f21)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/z/d2/f21) = "daemon:daemon"
 
 #
 # 'Z'
@@ -38,8 +38,8 @@ Z     /tmp/Z/f1    0755 daemon daemon - -
 Z     /tmp/Z/d1    0755 daemon daemon - -
 EOF
 
-test "$(stat -c %U:%G /tmp/Z/f1)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/Z/f1) = "daemon:daemon"
-test "$(stat -c %U:%G /tmp/Z/d1)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/Z/d1) = "daemon:daemon"
-test "$(stat -c %U:%G /tmp/Z/d1/d11)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/Z/d1/d11) = "daemon:daemon"
-test "$(stat -c %U:%G /tmp/Z/d1/f11)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/Z/d1/f11) = "daemon:daemon"
-test "$(stat -c %U:%G /tmp/Z/d1/d11/f111)" = "daemon:daemon"
+test $(stat -c %U:%G /tmp/Z/d1/d11/f111) = "daemon:daemon"

test/units/testsuite-22.06.sh

@@ -3,8 +3,7 @@
 # Inspired by https://github.com/systemd/systemd/issues/9508
 #
 
-set -eux
+set -e
-set -o pipefail
 
 test_snippet() {
         systemd-tmpfiles "$@" - <<EOF

test/units/testsuite-22.07.sh

@@ -3,8 +3,8 @@
 # Verifies the issues described by https://github.com/systemd/systemd/issues/10191
 #
 
-set -eux
+set -e
-set -o pipefail
+set -x
 
 rm -rf /tmp/test-prefix
 

test/units/testsuite-22.08.sh

@@ -7,8 +7,7 @@
 # https://github.com/systemd/systemd/pull/11820
 #
 
-set -eux
+set -e
-set -o pipefail
 
 rm -fr /tmp/root /tmp/user
 mkdir -p /tmp/root /tmp/user/root

test/units/testsuite-22.09.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-set -eux
+set -e
-set -o pipefail
+set -x
 
 # Make sure that the "stat" output is not locale dependent.
 export LANG=C LC_ALL=C

test/units/testsuite-22.10.sh

@@ -1,6 +1,7 @@
 #!/usr/bin/env bash
 
-set -eux
+set -e
+set -x
 set -o pipefail
 
 systemd-tmpfiles --create - <<EOF

test/units/testsuite-22.sh

@@ -1,12 +1,12 @@
 #!/usr/bin/env bash
 
-set -eux
+set -x
-set -o pipefail
+set -e
 
-: >/failed
+>/failed
 
-for t in "${0%.sh}".*.sh; do
+for t in ${0%.sh}.*.sh; do
-    echo "Running $t"; ./"$t"
+    echo "Running $t"; ./$t
 done
 
 touch /testok

test/units/testsuite-23.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
@@ -21,8 +21,8 @@ systemd-run --unit=six -p Type=exec /tmp/brokenbinary && { echo 'unexpected succ
 
 systemd-run --unit=seven -p KillSignal=SIGTERM -p RestartKillSignal=SIGINT -p Type=exec /bin/sleep infinity
 # Both TERM and SIGINT happen to have the same number on all architectures
-test "$(systemctl show --value -p KillSignal seven.service)" -eq 15
+test $(systemctl show --value -p KillSignal seven.service) -eq 15
-test "$(systemctl show --value -p RestartKillSignal seven.service)" -eq 2
+test $(systemctl show --value -p RestartKillSignal seven.service) -eq 2
 
 systemctl restart seven.service
 systemctl stop seven.service

test/units/testsuite-25.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 export SYSTEMD_PAGER=cat
@@ -120,7 +120,6 @@ test ! -f /var/lib/machines/scratch4
 machinectl image-status scratch4 && { echo 'unexpected success'; exit 1; }
 
 # Test import-tar hyphen/stdin pipe behavior
-# shellcheck disable=SC2002
 cat /var/tmp/scratch.tar.gz | machinectl import-tar - scratch5
 test -d /var/lib/machines/scratch5
 machinectl image-status scratch5

test/units/testsuite-26.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 # Make sure PATH is set

test/units/testsuite-27.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug

test/units/testsuite-29.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-set -eux
+set -ex
 set -o pipefail
 
 export SYSTEMD_LOG_LEVEL=debug

test/units/testsuite-30.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug

test/units/testsuite-31.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -e
 set -o pipefail
 
 if journalctl -b -t systemd --grep '\.device: Changed plugged -> dead'; then

test/units/testsuite-32.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 # Let's run this test only if the "memory.oom.group" cgroupfs attribute
@@ -9,6 +9,7 @@ set -o pipefail
 # kernels where the concept was still new.
 
 if test -f /sys/fs/cgroup/system.slice/testsuite-32.service/memory.oom.group; then
+
     systemd-analyze log-level debug
     systemd-analyze log-target console
 
@@ -22,12 +23,12 @@ if test -f /sys/fs/cgroup/system.slice/testsuite-32.service/memory.oom.group; th
     echo f >/proc/sysrq-trigger
 
     while : ; do
-        STATE="$(systemctl show -P ActiveState oomtest.service)"
+        STATE=`systemctl show -P ActiveState oomtest.service`
         [ "$STATE" = "failed" ] && break
         sleep .5
     done
 
-    RESULT="$(systemctl show -P Result oomtest.service)"
+    RESULT=`systemctl show -P Result oomtest.service`
     test "$RESULT" = "oom-kill"
 
     systemd-analyze log-level info

test/units/testsuite-33.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-set -eux
+set -ex
 set -o pipefail
 
 cat >/etc/systemd/system/testservice.service <<EOF

test/units/testsuite-34.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug

test/units/testsuite-36.sh

@@ -1,14 +1,13 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 at_exit() {
-    # shellcheck disable=SC2181
+    if [ $? -ne 0 ]; then
-    if [[ $? -ne 0 ]]; then
         # We're exiting with a non-zero EC, let's dump test artifacts
         # for easier debugging
-        [[ -v straceLog && -f "$straceLog" ]] && cat "$straceLog"
+        [ -f "$straceLog" ] && cat "$straceLog"
-        [[ -v journalLog && -f "$journalLog" ]] && cat "$journalLog"
+        [ -f "$journalLog" ] && cat "$journalLog"
     fi
 }
 
@@ -27,28 +26,25 @@ testUnitFile="/run/systemd/system/$testUnit"
 testUnitNUMAConf="$testUnitFile.d/numa.conf"
 
 # Sleep constants (we should probably figure out something better but nothing comes to mind)
+journalSleep=5
 sleepAfterStart=1
 
 # Journal cursor for easier navigation
 journalCursorFile="jounalCursorFile"
 
 startStrace() {
-    coproc strace -qq -p 1 -o "$straceLog" -e set_mempolicy -s 1024 ${1:+"$1"}
+    coproc strace -qq -p 1 -o $straceLog -e set_mempolicy -s 1024 $1
     # Wait for strace to properly "initialize"
     sleep $sleepAfterStart
 }
 
 stopStrace() {
-    [[ -v COPROC_PID ]] || return
+    kill -s TERM $COPROC_PID
-
-    local PID=$COPROC_PID
-    kill -s TERM "$PID"
     # Make sure the strace process is indeed dead
-    while kill -0 "$PID" 2>/dev/null; do sleep 0.1; done
+    while kill -0 $COPROC_PID 2>/dev/null; do sleep 0.1; done
 }
 
 startJournalctl() {
-    : >"$journalCursorFile"
     # Save journal's cursor for later navigation
     journalctl --no-pager --cursor-file="$journalCursorFile" -n0 -ocat
 }
@@ -59,7 +55,7 @@ stopJournalctl() {
     # the --sync wait until the synchronization is complete
     echo "Force journald to write all queued messages"
     journalctl --sync
-    journalctl -u "$unit" --cursor-file="$journalCursorFile" >"$journalLog"
+    journalctl -u $unit --cursor-file="$journalCursorFile" >"$journalLog"
 }
 
 checkNUMA() {
@@ -68,24 +64,21 @@ checkNUMA() {
 }
 
 writePID1NUMAPolicy() {
-    cat >"$confDir/numa.conf" <<EOF
+    echo [Manager] >$confDir/numa.conf
-[Manager]
+    echo NUMAPolicy=$1 >>$confDir/numa.conf
-NUMAPolicy=${1:?missing argument: NUMAPolicy}
+    echo NUMAMask=$2 >>$confDir/numa.conf
-NUMAMask=${2:-""}
-EOF
 }
 
 writeTestUnit() {
-    mkdir -p "$testUnitFile.d/"
+    mkdir -p $testUnitFile.d/
-    printf "[Service]\nExecStart=/bin/sleep 3600\n" >"$testUnitFile"
+    echo [Service] >$testUnitFile
+    echo ExecStart=/bin/sleep 3600 >>$testUnitFile
 }
 
 writeTestUnitNUMAPolicy() {
-    cat >"$testUnitNUMAConf" <<EOF
+    echo [Service] >$testUnitNUMAConf
-[Service]
+    echo NUMAPolicy=$1 >>$testUnitNUMAConf
-NUMAPolicy=${1:?missing argument: NUMAPolicy}
+    echo NUMAMask=$2 >>$testUnitNUMAConf
-NUMAMask=${2:-""}
-EOF
     systemctl daemon-reload
 }
 
@@ -104,38 +97,32 @@ pid1ReloadWithJournal() {
 
 pid1StartUnitWithStrace() {
     startStrace '-f'
-    systemctl start "${1:?missing unit name}"
+    systemctl start $1
     sleep $sleepAfterStart
     stopStrace
 }
 
 pid1StartUnitWithJournal() {
     startJournalctl
-    systemctl start "${1:?missing unit name}"
+    systemctl start $1
     sleep $sleepAfterStart
     stopJournalctl
 }
 
 pid1StopUnit() {
-    systemctl stop "${1:?missing unit name}"
+    systemctl stop $1
 }
 
 systemctlCheckNUMAProperties() {
-    local UNIT_NAME="${1:?missing unit name}"
+    local LOGFILE="$(mktemp)"
-    local NUMA_POLICY="${2:?missing NUMAPolicy}"
+    systemctl show -p NUMAPolicy $1 >"$LOGFILE"
-    local NUMA_MASK="${3:-""}"
+    grep "NUMAPolicy=$2" "$LOGFILE"
-    local LOGFILE
 
-    LOGFILE="$(mktemp)"
+    >"$LOGFILE"
 
-    systemctl show -p NUMAPolicy "$UNIT_NAME" >"$LOGFILE"
+    if [ -n "$3" ]; then
-    grep "NUMAPolicy=$NUMA_POLICY" "$LOGFILE"
+        systemctl show -p NUMAMask $1 >"$LOGFILE"
-
+        grep "NUMAMask=$3" "$LOGFILE"
-    : >"$LOGFILE"
-
-    if [ -n "$NUMA_MASK" ]; then
-        systemctl show -p NUMAMask "$UNIT_NAME" >"$LOGFILE"
-        grep "NUMAMask=$NUMA_MASK" "$LOGFILE"
     fi
 }
 
@@ -158,10 +145,10 @@ if ! checkNUMA; then
     echo "systemd-run NUMAPolicy=default && NUMAMask=0 check without NUMA support"
     runUnit='numa-systemd-run-test.service'
     startJournalctl
-    systemd-run -p NUMAPolicy=default -p NUMAMask=0 --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=default -p NUMAMask=0 --unit $runUnit sleep 1000
     sleep $sleepAfterStart
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
-    stopJournalctl "$runUnit"
+    stopJournalctl $runUnit
     grep "NUMA support not available, ignoring" "$journalLog"
 
 else
@@ -169,43 +156,43 @@ else
     writePID1NUMAPolicy "default"
     pid1ReloadWithStrace
     # Kernel requires that nodemask argument is set to NULL when setting default policy
-    grep "set_mempolicy(MPOL_DEFAULT, NULL" "$straceLog"
+    grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
 
     echo "PID1 NUMAPolicy support - Default policy w/ mask"
     writePID1NUMAPolicy "default" "0"
     pid1ReloadWithStrace
-    grep "set_mempolicy(MPOL_DEFAULT, NULL" "$straceLog"
+    grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
 
     echo "PID1 NUMAPolicy support - Bind policy w/o mask"
     writePID1NUMAPolicy "bind"
     pid1ReloadWithJournal
-    grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog"
+    grep "Failed to set NUMA memory policy: Invalid argument" $journalLog
 
     echo "PID1 NUMAPolicy support - Bind policy w/ mask"
     writePID1NUMAPolicy "bind" "0"
     pid1ReloadWithStrace
-    grep -P "set_mempolicy\(MPOL_BIND, \[0x0*1\]" "$straceLog"
+    grep -P "set_mempolicy\(MPOL_BIND, \[0x0*1\]" $straceLog
 
     echo "PID1 NUMAPolicy support - Interleave policy w/o mask"
     writePID1NUMAPolicy "interleave"
     pid1ReloadWithJournal
-    grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog"
+    grep "Failed to set NUMA memory policy: Invalid argument" $journalLog
 
     echo "PID1 NUMAPolicy support - Interleave policy w/ mask"
     writePID1NUMAPolicy "interleave" "0"
     pid1ReloadWithStrace
-    grep -P "set_mempolicy\(MPOL_INTERLEAVE, \[0x0*1\]" "$straceLog"
+    grep -P "set_mempolicy\(MPOL_INTERLEAVE, \[0x0*1\]" $straceLog
 
     echo "PID1 NUMAPolicy support - Preferred policy w/o mask"
     writePID1NUMAPolicy "preferred"
     pid1ReloadWithJournal
     # Preferred policy with empty node mask is actually allowed and should reset allocation policy to default
-    grep "Failed to set NUMA memory policy: Invalid argument" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; }
+    ! grep "Failed to set NUMA memory policy: Invalid argument" $journalLog
 
     echo "PID1 NUMAPolicy support - Preferred policy w/ mask"
     writePID1NUMAPolicy "preferred" "0"
     pid1ReloadWithStrace
-    grep -P "set_mempolicy\(MPOL_PREFERRED, \[0x0*1\]" "$straceLog"
+    grep -P "set_mempolicy\(MPOL_PREFERRED, \[0x0*1\]" $straceLog
 
     echo "PID1 NUMAPolicy support - Local policy w/o mask"
     writePID1NUMAPolicy "local"
@@ -215,133 +202,136 @@ else
     # return a numerical constant instead (with a comment):
     #   set_mempolicy(0x4 /* MPOL_??? */, NULL, 0) = 0
     # Let's cover this scenario as well
-    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" "$straceLog"
+    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
 
     echo "PID1 NUMAPolicy support - Local policy w/ mask"
     writePID1NUMAPolicy "local" "0"
     pid1ReloadWithStrace
-    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" "$straceLog"
+    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
 
     echo "Unit file NUMAPolicy support - Default policy w/o mask"
     writeTestUnitNUMAPolicy "default"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "default"
+    systemctlCheckNUMAProperties $testUnit "default"
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep "set_mempolicy(MPOL_DEFAULT, NULL" "$straceLog"
+    grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
 
     echo "Unit file NUMAPolicy support - Default policy w/ mask"
     writeTestUnitNUMAPolicy "default" "0"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "default" "0"
+    systemctlCheckNUMAProperties $testUnit "default" "0"
     pid1StopUnit $testUnit
     # Mask must be ignored
-    grep "set_mempolicy(MPOL_DEFAULT, NULL" "$straceLog"
+    grep "set_mempolicy(MPOL_DEFAULT, NULL" $straceLog
 
     echo "Unit file NUMAPolicy support - Bind policy w/o mask"
     writeTestUnitNUMAPolicy "bind"
-    pid1StartUnitWithJournal "$testUnit"
+    pid1StartUnitWithJournal $testUnit
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" "$journalLog"
+    grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" $journalLog
 
     echo "Unit file NUMAPolicy support - Bind policy w/ mask"
     writeTestUnitNUMAPolicy "bind" "0"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "bind" "0"
+    systemctlCheckNUMAProperties $testUnit "bind" "0"
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep -P "set_mempolicy\(MPOL_BIND, \[0x0*1\]" "$straceLog"
+    grep -P "set_mempolicy\(MPOL_BIND, \[0x0*1\]" $straceLog
 
     echo "Unit file NUMAPolicy support - Interleave policy w/o mask"
     writeTestUnitNUMAPolicy "interleave"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" "$journalLog"
+    grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" $journalLog
 
     echo "Unit file NUMAPolicy support - Interleave policy w/ mask"
     writeTestUnitNUMAPolicy "interleave" "0"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "interleave" "0"
+    systemctlCheckNUMAProperties $testUnit "interleave" "0"
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep -P "set_mempolicy\(MPOL_INTERLEAVE, \[0x0*1\]" "$straceLog"
+    grep -P "set_mempolicy\(MPOL_INTERLEAVE, \[0x0*1\]" $straceLog
 
     echo "Unit file NUMAPolicy support - Preferred policy w/o mask"
     writeTestUnitNUMAPolicy "preferred"
-    pid1StartUnitWithJournal "$testUnit"
+    pid1StartUnitWithJournal $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "preferred"
+    systemctlCheckNUMAProperties $testUnit "preferred"
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" "$journalLog" && { echo >&2 "unexpected pass"; exit 1; }
+    ! grep "numa-test.service: Main process exited, code=exited, status=242/NUMA" $journalLog
 
     echo "Unit file NUMAPolicy support - Preferred policy w/ mask"
     writeTestUnitNUMAPolicy "preferred" "0"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "preferred" "0"
+    systemctlCheckNUMAProperties $testUnit "preferred" "0"
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep -P "set_mempolicy\(MPOL_PREFERRED, \[0x0*1\]" "$straceLog"
+    grep -P "set_mempolicy\(MPOL_PREFERRED, \[0x0*1\]" $straceLog
 
     echo "Unit file NUMAPolicy support - Local policy w/o mask"
     writeTestUnitNUMAPolicy "local"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "local"
+    systemctlCheckNUMAProperties $testUnit "local"
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
-    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" "$straceLog"
+    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
 
     echo "Unit file NUMAPolicy support - Local policy w/ mask"
     writeTestUnitNUMAPolicy "local" "0"
-    pid1StartUnitWithStrace "$testUnit"
+    pid1StartUnitWithStrace $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "local" "0"
+    systemctlCheckNUMAProperties $testUnit "local" "0"
-    pid1StopUnit "$testUnit"
+    pid1StopUnit $testUnit
     # Mask must be ignored
-    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" "$straceLog"
+    grep -E "set_mempolicy\((MPOL_LOCAL|0x4 [^,]*), NULL" $straceLog
 
     echo "Unit file CPUAffinity=NUMA support"
     writeTestUnitNUMAPolicy "bind" "0"
-    echo "CPUAffinity=numa" >>"$testUnitNUMAConf"
+    echo "CPUAffinity=numa" >>$testUnitNUMAConf
     systemctl daemon-reload
-    systemctl start "$testUnit"
+    systemctl start $testUnit
-    systemctlCheckNUMAProperties "$testUnit" "bind" "0"
+    systemctlCheckNUMAProperties $testUnit "bind" "0"
-    cpulist="$(cat /sys/devices/system/node/node0/cpulist)"
+    pid=$(systemctl show --value -p MainPID $testUnit)
-    affinity_systemd="$(systemctl show --value -p CPUAffinity "$testUnit")"
+    cpulist=$(cat /sys/devices/system/node/node0/cpulist)
-    [ "$cpulist" = "$affinity_systemd" ]
+    affinity_systemd=$(systemctl show --value -p CPUAffinity $testUnit)
-    pid1StopUnit "$testUnit"
+    [ $cpulist = $affinity_systemd ]
+    pid1StopUnit $testUnit
 
     echo "systemd-run NUMAPolicy support"
     runUnit='numa-systemd-run-test.service'
 
-    systemd-run -p NUMAPolicy=default --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=default --unit $runUnit sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "default"
+    systemctlCheckNUMAProperties $runUnit "default"
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
 
-    systemd-run -p NUMAPolicy=default -p NUMAMask=0 --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=default -p NUMAMask=0 --unit $runUnit sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "default" ""
+    systemctlCheckNUMAProperties $runUnit "default" ""
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
 
-    systemd-run -p NUMAPolicy=bind -p NUMAMask=0 --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=bind -p NUMAMask=0 --unit $runUnit sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "bind" "0"
+    systemctlCheckNUMAProperties $runUnit "bind" "0"
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
 
-    systemd-run -p NUMAPolicy=interleave -p NUMAMask=0 --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=interleave -p NUMAMask=0 --unit $runUnit sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "interleave" "0"
+    systemctlCheckNUMAProperties $runUnit "interleave" "0"
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
 
-    systemd-run -p NUMAPolicy=preferred -p NUMAMask=0 --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=preferred -p NUMAMask=0 --unit $runUnit sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "preferred" "0"
+    systemctlCheckNUMAProperties $runUnit "preferred" "0"
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
 
-    systemd-run -p NUMAPolicy=local --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=local --unit $runUnit sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "local"
+    systemctlCheckNUMAProperties $runUnit "local"
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
 
-    systemd-run -p NUMAPolicy=local -p NUMAMask=0 --unit "$runUnit" sleep 1000
+    systemd-run -p NUMAPolicy=local -p NUMAMask=0 --unit $runUnit sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "local" ""
+    systemctlCheckNUMAProperties $runUnit "local" ""
-    pid1StopUnit "$runUnit"
+    pid1StopUnit $runUnit
+
+    systemd-run -p NUMAPolicy=local -p NUMAMask=0 -p CPUAffinity=numa --unit $runUnit sleep 1000
+    systemctlCheckNUMAProperties $runUnit "local" ""
+    systemctl cat $runUnit | grep -q 'CPUAffinity=numa'
+    pid1StopUnit $runUnit
 
-    systemd-run -p NUMAPolicy=local -p NUMAMask=0 -p CPUAffinity=numa --unit "$runUnit" sleep 1000
-    systemctlCheckNUMAProperties "$runUnit" "local" ""
-    systemctl cat "$runUnit" | grep -q 'CPUAffinity=numa'
-    pid1StopUnit "$runUnit"
 fi
 
 # Cleanup
-rm -rf "$confDir"
+rm -rf $testDir
+rm -rf $confDir
 systemctl daemon-reload
 
 systemd-analyze log-level info

test/units/testsuite-37.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-set -eux
+set -ex
 set -o pipefail
 
 systemd-mount -p RuntimeDirectory=hoge -p RuntimeDirectoryPreserve=yes -t tmpfs tmpfs /tmp/aaa

test/units/testsuite-38.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
@@ -14,11 +14,11 @@ start_test_service() {
 }
 
 dbus_freeze() {
-    local name object_path suffix
+    local suffix=
-
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+
-    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
+    local name="$(echo ${1%.$suffix} | sed s/-/_2d/g)"
+    local object_path="/org/freedesktop/systemd1/unit/${name}_2e${suffix}"
 
     busctl call \
            org.freedesktop.systemd1 \
@@ -28,11 +28,11 @@ dbus_freeze() {
 }
 
 dbus_thaw() {
-    local name object_path suffix
+    local suffix=
-
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+
-    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
+    local name="$(echo ${1%.$suffix} | sed s/-/_2d/g)"
+    local object_path="/org/freedesktop/systemd1/unit/${name}_2e${suffix}"
 
     busctl call \
            org.freedesktop.systemd1 \
@@ -62,11 +62,11 @@ dbus_thaw_unit() {
 }
 
 dbus_can_freeze() {
-    local name object_path suffix
+    local suffix=
-
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+
-    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
+    local name="$(echo ${1%.$suffix} | sed s/-/_2d/g)"
+    local object_path="/org/freedesktop/systemd1/unit/${name}_2e${suffix}"
 
     busctl get-property \
            org.freedesktop.systemd1 \
@@ -76,11 +76,11 @@ dbus_can_freeze() {
 }
 
 check_freezer_state() {
-    local name object_path suffix
+    local suffix=
-
     suffix="${1##*.}"
-    name="${1%.$suffix}"
+
-    object_path="/org/freedesktop/systemd1/unit/${name//-/_2d}_2e${suffix}"
+    local name="$(echo ${1%.$suffix} | sed s/-/_2d/g)"
+    local object_path="/org/freedesktop/systemd1/unit/${name}_2e${suffix}"
 
     state=$(busctl get-property \
                    org.freedesktop.systemd1 \

test/units/testsuite-39.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
@@ -18,12 +18,12 @@ ExecReload=/bin/false
 EOF
 
 systemctl daemon-reload
-systemctl start "$SERVICE_NAME"
+systemctl start $SERVICE_NAME
-systemctl status "$SERVICE_NAME"
+systemctl status $SERVICE_NAME
 # The reload SHOULD fail but SHOULD NOT affect the service state
-systemctl reload "$SERVICE_NAME" && { echo 'unexpected success'; exit 1; }
+systemctl reload $SERVICE_NAME && { echo 'unexpected success'; exit 1; }
-systemctl status "$SERVICE_NAME"
+systemctl status $SERVICE_NAME
-systemctl stop "$SERVICE_NAME"
+systemctl stop $SERVICE_NAME
 
 
 echo "[#2] Failing ExecReload= should not kill the service (multiple ExecReload=)"
@@ -36,12 +36,12 @@ ExecReload=/bin/true
 EOF
 
 systemctl daemon-reload
-systemctl start "$SERVICE_NAME"
+systemctl start $SERVICE_NAME
-systemctl status "$SERVICE_NAME"
+systemctl status $SERVICE_NAME
 # The reload SHOULD fail but SHOULD NOT affect the service state
-systemctl reload "$SERVICE_NAME" && { echo 'unexpected success'; exit 1; }
+systemctl reload $SERVICE_NAME && { echo 'unexpected success'; exit 1; }
-systemctl status "$SERVICE_NAME"
+systemctl status $SERVICE_NAME
-systemctl stop "$SERVICE_NAME"
+systemctl stop $SERVICE_NAME
 
 echo "[#3] Failing ExecReload=- should not affect reload's exit code"
 cat >"$SERVICE_PATH" <<EOF
@@ -51,11 +51,11 @@ ExecReload=-/bin/false
 EOF
 
 systemctl daemon-reload
-systemctl start "$SERVICE_NAME"
+systemctl start $SERVICE_NAME
-systemctl status "$SERVICE_NAME"
+systemctl status $SERVICE_NAME
-systemctl reload "$SERVICE_NAME"
+systemctl reload $SERVICE_NAME
-systemctl status "$SERVICE_NAME"
+systemctl status $SERVICE_NAME
-systemctl stop "$SERVICE_NAME"
+systemctl stop $SERVICE_NAME
 
 systemd-analyze log-level info
 

test/units/testsuite-40.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug

test/units/testsuite-41.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 # wait this many secs for each test service to succeed in what is being tested
@@ -12,7 +12,7 @@ systemd-analyze log-target console
 systemd-run --unit=one -p Type=oneshot -p Restart=on-failure /bin/bash -c "exit 1" \
     && { echo 'unexpected success'; exit 1; }
 
-for ((secs = 0; secs < MAX_SECS; secs++)); do
+for ((secs=0; secs<$MAX_SECS; secs++)); do
   [[ "$(systemctl show one.service -P NRestarts)" -le 0 ]] || break
   sleep 1
 done
@@ -35,7 +35,7 @@ systemd-run --unit=two \
     && { echo 'unexpected success'; exit 1; }
 
 # wait for at least 3 restarts
-for ((secs = 0; secs < MAX_SECS; secs++)); do
+for ((secs=0; secs<$MAX_SECS; secs++)); do
   [[ $(cat $TMP_FILE) != "aaa" ]] || break
   sleep 1
 done

test/units/testsuite-42.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 
 systemd-analyze log-level debug
 

test/units/testsuite-43.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
@@ -7,7 +7,6 @@ systemd-analyze log-level debug
 runas() {
     declare userid=$1
     shift
-    # shellcheck disable=SC2016
     su "$userid" -s /bin/sh -c 'XDG_RUNTIME_DIR=/run/user/$UID exec "$@"' -- sh "$@"
 }
 
@@ -47,7 +46,6 @@ runas testuser systemd-run --wait --user --unit=test-protect-home-tmpfs \
     -P test ! -e /home/testuser
 
 # Confirm that home, /root, and /run/user are inaccessible under "yes"
-# shellcheck disable=SC2016
 runas testuser systemd-run --wait --user --unit=test-protect-home-yes \
     -p PrivateUsers=yes -p ProtectHome=yes \
     -P bash -c '

test/units/testsuite-44.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 
 systemd-analyze log-level debug
 

test/units/testsuite-46.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 # Check if homectl is installed, and if it isn't bail out early instead of failing
@@ -14,9 +14,8 @@ inspect() {
     # avoid unexpected fails. To see the full outputs of both homectl &
     # userdbctl (for debugging purposes) drop the fields just before the
     # comparison.
-    local USERNAME="${1:?missing argument}"
+    homectl inspect $1 | tee /tmp/a
-    homectl inspect "$USERNAME" | tee /tmp/a
+    userdbctl user $1 | tee /tmp/b
-    userdbctl user "$USERNAME" | tee /tmp/b
 
     diff -I '/^\s*Disk (Size|Free|Floor|Ceiling):/' /tmp/{a,b}
     rm /tmp/{a,b}

test/units/testsuite-47.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug

test/units/testsuite-48.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-set -eux
+set -ex
 
 cat >/run/systemd/system/testservice-48.target <<EOF
 [Unit]

test/units/testsuite-49.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 
 echo "MARKER_FIXED" >/run/testservice-49-fixed
 mkdir -p /run/inaccessible

test/units/testsuite-50.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
 # ex: ts=8 sw=4 sts=4 et filetype=sh
-set -eux
+set -ex
 set -o pipefail
 
 export SYSTEMD_LOG_LEVEL=debug
@@ -26,48 +26,48 @@ trap cleanup EXIT
 
 cp /usr/share/minimal* "${image_dir}/"
 image="${image_dir}/minimal_0"
-roothash="$(cat "${image}.roothash")"
+roothash="$(cat ${image}.roothash)"
 
-os_release="$(test -e /etc/os-release && echo /etc/os-release || echo /usr/lib/os-release)"
+os_release=$(test -e /etc/os-release && echo /etc/os-release || echo /usr/lib/os-release)
 
-systemd-dissect --json=short "${image}.raw" | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"partition_label":null,"fstype":"squashfs","architecture":null,"verity":"external"'
+systemd-dissect --json=short ${image}.raw | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"partition_label":null,"fstype":"squashfs","architecture":null,"verity":"external"'
-systemd-dissect "${image}.raw" | grep -q -F "MARKER=1"
+systemd-dissect ${image}.raw | grep -q -F "MARKER=1"
-systemd-dissect "${image}.raw" | grep -q -F -f <(sed 's/"//g' "$os_release")
+systemd-dissect ${image}.raw | grep -q -F -f <(sed 's/"//g' $os_release)
 
-mv "${image}.verity" "${image}.fooverity"
+mv ${image}.verity ${image}.fooverity
-mv "${image}.roothash" "${image}.foohash"
+mv ${image}.roothash ${image}.foohash
-systemd-dissect --json=short "${image}.raw" --root-hash="${roothash}" --verity-data="${image}.fooverity" | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"partition_label":null,"fstype":"squashfs","architecture":null,"verity":"external"'
+systemd-dissect --json=short ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F '{"rw":"ro","designator":"root","partition_uuid":null,"partition_label":null,"fstype":"squashfs","architecture":null,"verity":"external"'
-systemd-dissect "${image}.raw" --root-hash="${roothash}" --verity-data="${image}.fooverity" | grep -q -F "MARKER=1"
+systemd-dissect ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F "MARKER=1"
-systemd-dissect "${image}.raw" --root-hash="${roothash}" --verity-data="${image}.fooverity" | grep -q -F -f <(sed 's/"//g' "$os_release")
+systemd-dissect ${image}.raw --root-hash=${roothash} --verity-data=${image}.fooverity | grep -q -F -f <(sed 's/"//g' $os_release)
-mv "${image}.fooverity" "${image}.verity"
+mv ${image}.fooverity ${image}.verity
-mv "${image}.foohash" "${image}.roothash"
+mv ${image}.foohash ${image}.roothash
 
-mkdir -p "${image_dir}/mount" "${image_dir}/mount2"
+mkdir -p ${image_dir}/mount ${image_dir}/mount2
-systemd-dissect --mount "${image}.raw" "${image_dir}/mount"
+systemd-dissect --mount ${image}.raw ${image_dir}/mount
-grep -q -F -f "$os_release" "${image_dir}/mount/usr/lib/os-release"
+cat ${image_dir}/mount/usr/lib/os-release | grep -q -F -f $os_release
-grep -q -F -f "$os_release" "${image_dir}/mount/etc/os-release"
+cat ${image_dir}/mount/etc/os-release | grep -q -F -f $os_release
-grep -q -F "MARKER=1" "${image_dir}/mount/usr/lib/os-release"
+cat ${image_dir}/mount/usr/lib/os-release | grep -q -F "MARKER=1"
 # Verity volume should be shared (opened only once)
-systemd-dissect --mount "${image}.raw" "${image_dir}/mount2"
+systemd-dissect --mount ${image}.raw ${image_dir}/mount2
-verity_count=$(find /dev/mapper/ -name "*verity*" | wc -l)
+verity_count=$(ls -1 /dev/mapper/ | grep -c verity)
 # In theory we should check that count is exactly one. In practice, libdevmapper
 # randomly and unpredictably fails with an unhelpful EINVAL when a device is open
 # (and even mounted and in use), so best-effort is the most we can do for now
-if [ "${verity_count}" -lt 1 ]; then
+if [ ${verity_count} -lt 1 ]; then
     echo "Verity device ${image}.raw not found in /dev/mapper/"
     exit 1
 fi
-umount "${image_dir}/mount"
+umount ${image_dir}/mount
-umount "${image_dir}/mount2"
+umount ${image_dir}/mount2
 
-systemd-run -t -p RootImage="${image}.raw" cat /usr/lib/os-release | grep -q -F "MARKER=1"
+systemd-run -t -p RootImage=${image}.raw cat /usr/lib/os-release | grep -q -F "MARKER=1"
-mv "${image}.verity" "${image}.fooverity"
+mv ${image}.verity ${image}.fooverity
-mv "${image}.roothash" "${image}.foohash"
+mv ${image}.roothash ${image}.foohash
-systemd-run -t -p RootImage="${image}.raw" -p RootHash="${image}.foohash" -p RootVerity="${image}.fooverity" cat /usr/lib/os-release | grep -q -F "MARKER=1"
+systemd-run -t -p RootImage=${image}.raw -p RootHash=${image}.foohash -p RootVerity=${image}.fooverity cat /usr/lib/os-release | grep -q -F "MARKER=1"
 # Let's use the long option name just here as a test
-systemd-run -t --property RootImage="${image}.raw" --property RootHash="${roothash}" --property RootVerity="${image}.fooverity" cat /usr/lib/os-release | grep -q -F "MARKER=1"
+systemd-run -t --property RootImage=${image}.raw --property RootHash=${roothash} --property RootVerity=${image}.fooverity cat /usr/lib/os-release | grep -q -F "MARKER=1"
-mv "${image}.fooverity" "${image}.verity"
+mv ${image}.fooverity ${image}.verity
-mv "${image}.foohash" "${image}.roothash"
+mv ${image}.foohash ${image}.roothash
 
 # Make a GPT disk on the fly, with the squashfs as partition 1 and the verity hash tree as partition 2
 machine="$(uname -m)"
@@ -100,54 +100,51 @@ else
     exit 1
 fi
 # du rounds up to block size, which is more helpful for partitioning
-root_size="$(du -k "${image}.raw" | cut -f1)"
+root_size="$(du -k ${image}.raw | cut -f1)"
-verity_size="$(du -k "${image}.verity" | cut -f1)"
+verity_size="$(du -k ${image}.verity | cut -f1)"
 # 4MB seems to be the minimum size blkid will accept, below that probing fails
-dd if=/dev/zero of="${image}.gpt" bs=512 count=$((8192+root_size*2+verity_size*2))
+dd if=/dev/zero of=${image}.gpt bs=512 count=$((8192+${root_size}*2+${verity_size}*2))
 # sfdisk seems unhappy if the size overflows into the next unit, eg: 1580KiB will be interpreted as 1MiB
 # so do some basic rounding up if the minimal image is more than 1 MB
-if [ "${root_size}" -ge 1024 ]; then
+if [ ${root_size} -ge 1024 ]; then
-    root_size="$((root_size/1024 + 1))MiB"
+    root_size="$((${root_size}/1024 + 1))MiB"
 else
     root_size="${root_size}KiB"
 fi
-verity_size="$((verity_size * 2))KiB"
+verity_size="$((${verity_size} * 2))KiB"
-# Construct a UUID from hash
+uuid="$(head -c 32 ${image}.roothash | cut -c -8)-$(head -c 32 ${image}.roothash | cut -c 9-12)-$(head -c 32 ${image}.roothash | cut -c 13-16)-$(head -c 32 ${image}.roothash | cut -c 17-20)-$(head -c 32 ${image}.roothash | cut -c 21-)"
-# input:  11111111222233334444555566667777
+echo -e "label: gpt\nsize=${root_size}, type=${root_guid}, uuid=${uuid}" | sfdisk ${image}.gpt
-# output: 11111111-2222-3333-4444-555566667777
+uuid="$(tail -c 32 ${image}.roothash | cut -c -8)-$(tail -c 32 ${image}.roothash | cut -c 9-12)-$(tail -c 32 ${image}.roothash | cut -c 13-16)-$(tail -c 32 ${image}.roothash | cut -c 17-20)-$(tail -c 32 ${image}.roothash | cut -c 21-)"
-uuid="$(head -c 32 "${image}.roothash" | sed -r 's/(.{8})(.{4})(.{4})(.{4})(.+)/\1-\2-\3-\4-\5/')"
+echo -e "size=${verity_size}, type=${verity_guid}, uuid=${uuid}" | sfdisk ${image}.gpt --append
-echo -e "label: gpt\nsize=${root_size}, type=${root_guid}, uuid=${uuid}" | sfdisk "${image}.gpt"
+sfdisk --part-label ${image}.gpt 1 "Root Partition"
-uuid="$(tail -c 32 "${image}.roothash" | sed -r 's/(.{8})(.{4})(.{4})(.{4})(.+)/\1-\2-\3-\4-\5/')"
+sfdisk --part-label ${image}.gpt 2 "Verity Partition"
-echo -e "size=${verity_size}, type=${verity_guid}, uuid=${uuid}" | sfdisk "${image}.gpt" --append
+loop="$(losetup --show -P -f ${image}.gpt)"
-sfdisk --part-label "${image}.gpt" 1 "Root Partition"
+dd if=${image}.raw of=${loop}p1
-sfdisk --part-label "${image}.gpt" 2 "Verity Partition"
+dd if=${image}.verity of=${loop}p2
-loop="$(losetup --show -P -f "${image}.gpt")"
+losetup -d ${loop}
-dd if="${image}.raw" of="${loop}p1"
-dd if="${image}.verity" of="${loop}p2"
-losetup -d "${loop}"
 
 # Derive partition UUIDs from root hash, in UUID syntax
-ROOT_UUID="$(systemd-id128 -u show "$(head -c 32 "${image}.roothash")" -u | tail -n 1 | cut -b 6-)"
+ROOT_UUID=$(systemd-id128 -u show $(head -c 32 ${image}.roothash) -u | tail -n 1 | cut -b 6-)
-VERITY_UUID="$(systemd-id128 -u show "$(tail -c 32 "${image}.roothash")" -u | tail -n 1 | cut -b 6-)"
+VERITY_UUID=$(systemd-id128 -u show $(tail -c 32 ${image}.roothash) -u | tail -n 1 | cut -b 6-)
 
-systemd-dissect --json=short --root-hash "${roothash}" "${image}.gpt" | grep -q '{"rw":"ro","designator":"root","partition_uuid":"'"$ROOT_UUID"'","partition_label":"Root Partition","fstype":"squashfs","architecture":"'"$architecture"'","verity":"yes","node":'
+systemd-dissect --json=short --root-hash ${roothash} ${image}.gpt | grep -q '{"rw":"ro","designator":"root","partition_uuid":"'$ROOT_UUID'","partition_label":"Root Partition","fstype":"squashfs","architecture":"'$architecture'","verity":"yes","node":'
-systemd-dissect --json=short --root-hash "${roothash}" "${image}.gpt" | grep -q '{"rw":"ro","designator":"root-verity","partition_uuid":"'"$VERITY_UUID"'","partition_label":"Verity Partition","fstype":"DM_verity_hash","architecture":"'"$architecture"'","verity":null,"node":'
+systemd-dissect --json=short --root-hash ${roothash} ${image}.gpt | grep -q '{"rw":"ro","designator":"root-verity","partition_uuid":"'$VERITY_UUID'","partition_label":"Verity Partition","fstype":"DM_verity_hash","architecture":"'$architecture'","verity":null,"node":'
-systemd-dissect --root-hash "${roothash}" "${image}.gpt" | grep -q -F "MARKER=1"
+systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q -F "MARKER=1"
-systemd-dissect --root-hash "${roothash}" "${image}.gpt" | grep -q -F -f <(sed 's/"//g' "$os_release")
+systemd-dissect --root-hash ${roothash} ${image}.gpt | grep -q -F -f <(sed 's/"//g' $os_release)
 
-systemd-dissect --root-hash "${roothash}" --mount "${image}.gpt" "${image_dir}/mount"
+systemd-dissect --root-hash ${roothash} --mount ${image}.gpt ${image_dir}/mount
-grep -q -F -f "$os_release" "${image_dir}/mount/usr/lib/os-release"
+cat ${image_dir}/mount/usr/lib/os-release | grep -q -F -f $os_release
-grep -q -F -f "$os_release" "${image_dir}/mount/etc/os-release"
+cat ${image_dir}/mount/etc/os-release | grep -q -F -f $os_release
-grep -q -F "MARKER=1" "${image_dir}/mount/usr/lib/os-release"
+cat ${image_dir}/mount/usr/lib/os-release | grep -q -F "MARKER=1"
-umount "${image_dir}/mount"
+umount ${image_dir}/mount
 
 # add explicit -p MountAPIVFS=yes once to test the parser
-systemd-run -t -p RootImage="${image}.gpt" -p RootHash="${roothash}" -p MountAPIVFS=yes cat /usr/lib/os-release | grep -q -F "MARKER=1"
+systemd-run -t -p RootImage=${image}.gpt -p RootHash=${roothash} -p MountAPIVFS=yes cat /usr/lib/os-release | grep -q -F "MARKER=1"
 
-systemd-run -t -p RootImage="${image}.raw" -p RootImageOptions="root:nosuid,dev home:ro,dev ro,noatime" mount | grep -F "squashfs" | grep -q -F "nosuid"
+systemd-run -t -p RootImage=${image}.raw -p RootImageOptions="root:nosuid,dev home:ro,dev ro,noatime" mount | grep -F "squashfs" | grep -q -F "nosuid"
-systemd-run -t -p RootImage="${image}.gpt" -p RootImageOptions="root:ro,noatime root:ro,dev" mount | grep -F "squashfs" | grep -q -F "noatime"
+systemd-run -t -p RootImage=${image}.gpt -p RootImageOptions="root:ro,noatime root:ro,dev" mount | grep -F "squashfs" | grep -q -F "noatime"
 
-mkdir -p "${image_dir}/result"
+mkdir -p mkdir -p ${image_dir}/result
 cat >/run/systemd/system/testservice-50a.service <<EOF
 [Service]
 Type=oneshot
@@ -159,8 +156,8 @@ RootImageOptions=root:ro,noatime home:ro,dev relatime,dev
 RootImageOptions=nosuid,dev
 EOF
 systemctl start testservice-50a.service
-grep -F "squashfs" "${image_dir}/result/a" | grep -q -F "noatime"
+grep -F "squashfs" ${image_dir}/result/a | grep -q -F "noatime"
-grep -F "squashfs" "${image_dir}/result/a" | grep -q -F -v "nosuid"
+grep -F "squashfs" ${image_dir}/result/a | grep -q -F -v "nosuid"
 
 cat >/run/systemd/system/testservice-50b.service <<EOF
 [Service]
@@ -175,7 +172,7 @@ RootImageOptions=home:ro,dev nosuid,dev,%%foo
 MountAPIVFS=yes
 EOF
 systemctl start testservice-50b.service
-grep -F "squashfs" "${image_dir}/result/b" | grep -q -F "noatime"
+grep -F "squashfs" ${image_dir}/result/b | grep -q -F "noatime"
 
 # Check that specifier escape is applied %%foo → %foo
 busctl get-property org.freedesktop.systemd1 /org/freedesktop/systemd1/unit/testservice_2d50b_2eservice org.freedesktop.systemd1.Service RootImageOptions | grep -F "nosuid,dev,%foo"
@@ -187,9 +184,9 @@ systemd-run -t -p MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2:nos
 systemd-run -t -p MountImages="${image}.gpt:/run/img1:root:nosuid ${image}.raw:/run/img2:home:suid" mount | grep -F "squashfs" | grep -q -F "nosuid"
 systemd-run -t -p MountImages="${image}.raw:/run/img2\:3" cat /run/img2:3/usr/lib/os-release | grep -q -F "MARKER=1"
 systemd-run -t -p MountImages="${image}.raw:/run/img2\:3:nosuid" mount | grep -F "squashfs" | grep -q -F "nosuid"
-systemd-run -t -p TemporaryFileSystem=/run -p RootImage="${image}.raw" -p MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" cat /usr/lib/os-release | grep -q -F "MARKER=1"
+systemd-run -t -p TemporaryFileSystem=/run -p RootImage=${image}.raw -p MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" cat /usr/lib/os-release | grep -q -F "MARKER=1"
-systemd-run -t -p TemporaryFileSystem=/run -p RootImage="${image}.raw" -p MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" cat /run/img1/usr/lib/os-release | grep -q -F "MARKER=1"
+systemd-run -t -p TemporaryFileSystem=/run -p RootImage=${image}.raw -p MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" cat /run/img1/usr/lib/os-release | grep -q -F "MARKER=1"
-systemd-run -t -p TemporaryFileSystem=/run -p RootImage="${image}.gpt" -p RootHash="${roothash}" -p MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" cat /run/img2/usr/lib/os-release | grep -q -F "MARKER=1"
+systemd-run -t -p TemporaryFileSystem=/run -p RootImage=${image}.gpt -p RootHash=${roothash} -p MountImages="${image}.gpt:/run/img1 ${image}.raw:/run/img2" cat /run/img2/usr/lib/os-release | grep -q -F "MARKER=1"
 cat >/run/systemd/system/testservice-50c.service <<EOF
 [Service]
 MountAPIVFS=yes
@@ -204,9 +201,9 @@ BindPaths=${image_dir}/result:/run/result
 Type=oneshot
 EOF
 systemctl start testservice-50c.service
-grep -q -F "MARKER=1" "${image_dir}/result/c"
+grep -q -F "MARKER=1" ${image_dir}/result/c
-grep -F "squashfs" "${image_dir}/result/c" | grep -q -F "noatime"
+grep -F "squashfs" ${image_dir}/result/c | grep -q -F "noatime"
-grep -F "squashfs" "${image_dir}/result/c" | grep -q -F -v "nosuid"
+grep -F "squashfs" ${image_dir}/result/c | grep -q -F -v "nosuid"
 
 # Adding a new mounts at runtime works if the unit is in the active state,
 # so use Type=notify to make sure there's no race condition in the test
@@ -221,7 +218,7 @@ ExecStart=/bin/sh -c 'systemd-notify --ready; while ! grep -q -F MARKER /tmp/img
 EOF
 systemctl start testservice-50d.service
 
-systemctl mount-image --mkdir testservice-50d.service "${image}.raw" /tmp/img root:nosuid
+systemctl mount-image --mkdir testservice-50d.service ${image}.raw /tmp/img root:nosuid
 
 while systemctl show -P SubState testservice-50d.service | grep -q running
 do
@@ -231,12 +228,12 @@ done
 systemctl is-active testservice-50d.service
 
 # ExtensionImages will set up an overlay
-systemd-run -t --property ExtensionImages=/usr/share/app0.raw --property RootImage="${image}.raw" cat /opt/script0.sh | grep -q -F "extension-release.app0"
+systemd-run -t --property ExtensionImages=/usr/share/app0.raw --property RootImage=${image}.raw cat /opt/script0.sh | grep -q -F "extension-release.app0"
-systemd-run -t --property ExtensionImages=/usr/share/app0.raw --property RootImage="${image}.raw" cat /usr/lib/systemd/system/some_file | grep -q -F "MARKER=1"
+systemd-run -t --property ExtensionImages=/usr/share/app0.raw --property RootImage=${image}.raw cat /usr/lib/systemd/system/some_file | grep -q -F "MARKER=1"
-systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage="${image}.raw" cat /opt/script0.sh | grep -q -F "extension-release.app0"
+systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage=${image}.raw cat /opt/script0.sh | grep -q -F "extension-release.app0"
-systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage="${image}.raw" cat /usr/lib/systemd/system/some_file | grep -q -F "MARKER=1"
+systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage=${image}.raw cat /usr/lib/systemd/system/some_file | grep -q -F "MARKER=1"
-systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage="${image}.raw" cat /opt/script1.sh | grep -q -F "extension-release.app1"
+systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage=${image}.raw cat /opt/script1.sh | grep -q -F "extension-release.app1"
-systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage="${image}.raw" cat /usr/lib/systemd/system/other_file | grep -q -F "MARKER=1"
+systemd-run -t --property ExtensionImages="/usr/share/app0.raw /usr/share/app1.raw" --property RootImage=${image}.raw cat /usr/lib/systemd/system/other_file | grep -q -F "MARKER=1"
 cat >/run/systemd/system/testservice-50e.service <<EOF
 [Service]
 MountAPIVFS=yes

test/units/testsuite-51.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemctl start testsuite-51-repro-1

test/units/testsuite-53.sh

@@ -1,8 +1,8 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
-: >/failed
+>/failed
 
 # Reset host date to current time, 3 days in the past.
 date -s "-3 days"

test/units/testsuite-54.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
-# shellcheck disable=SC2016
+set -ex
-set -eux
 
 systemd-analyze log-level debug
 

test/units/testsuite-55-slowgrowth.sh

@@ -1,8 +1,5 @@
 #!/usr/bin/env bash
-# Don't use set -x here, since it generates a lot of output and slows
+set -eu -o pipefail
-# the script down, causing unexpected test fails.
-set -eu
-set -o pipefail
 
 PAGE_SIZE=$(getconf PAGE_SIZE)
 BLOAT_ITERATION_TARGET=$(( 100 << 20 )) # 100 MB
@@ -10,30 +7,26 @@ BLOAT_HOLDER=()
 PID="$$"
 
 function bloat {
-        local set_size mem_usage target_mem_size
+        local set_size=$(cat "/proc/$PID/statm" | cut -d " " -f2)
-
+        local mem_usage=$(( "$set_size" * "$PAGE_SIZE" ))
-        # Following `| cat` weirdness is intentional to generate some reclaim
+        local target_mem_size=$(( "$mem_usage" + "$1" ))
-        # activity in case there's no swap available.
-        set_size=$(cut -d " " -f2 "/proc/$PID/statm" | cat)
-        mem_usage=$((set_size * PAGE_SIZE))
-        target_mem_size=$((mem_usage + $1))
 
         BLOAT_HOLDER=()
         while [[ "$mem_usage" -lt "$target_mem_size" ]]; do
                 echo "target $target_mem_size"
                 echo "mem usage $mem_usage"
-                BLOAT_HOLDER+=("$(printf "=%0.s" {1..1000000})")
+                BLOAT_HOLDER+=( $(printf "%0.sg" {1..1000000}) )
-                set_size=$(cut -d " " -f2 "/proc/$PID/statm" | cat)
+                set_size=$(cat "/proc/$PID/statm" | cut -d " " -f2)
-                mem_usage=$((set_size * PAGE_SIZE))
+                mem_usage=$(( "$set_size" * "$PAGE_SIZE" ))
         done
 }
 
 function run {
         local arr=()
 
-        while :; do
+        while [[ true ]]; do
                 bloat "$BLOAT_ITERATION_TARGET"
-                arr+=("${BLOAT_HOLDER[@]}")
+                arr+=( "$BLOAT_HOLDER" )
                 sleep 1
         done
 }

test/units/testsuite-55.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 set -o pipefail
 
 systemd-analyze log-level debug
@@ -7,17 +7,14 @@ systemd-analyze log-target console
 
 # Loose checks to ensure the environment has the necessary features for systemd-oomd
 [[ -e /proc/pressure ]] || echo "no PSI" >>/skipped
-cgroup_type="$(stat -fc %T /sys/fs/cgroup/)"
+cgroup_type=$(stat -fc %T /sys/fs/cgroup/)
 if [[ "$cgroup_type" != *"cgroup2"* ]] && [[ "$cgroup_type" != *"0x63677270"* ]]; then
     echo "no cgroup2" >>/skipped
 fi
 if [ ! -f /usr/lib/systemd/systemd-oomd ] && [ ! -f /lib/systemd/systemd-oomd ]; then
     echo "no oomd" >>/skipped
 fi
-
+[[ -e /skipped ]] && exit 0 || true
-if [[ -e /skipped ]]; then
-    exit 0
-fi
 
 rm -rf /etc/systemd/system/testsuite-55-testbloat.service.d
 
@@ -33,7 +30,7 @@ oomctl | grep "Default Memory Pressure Duration: 5s"
 
 # systemd-oomd watches for elevated pressure for 5 seconds before acting.
 # It can take time to build up pressure so either wait 2 minutes or for the service to fail.
-timeout="$(date -ud "2 minutes" +%s)"
+timeout=$(date -ud "2 minutes" +%s)
 while [[ $(date -u +%s) -le $timeout ]]; do
     if ! systemctl status testsuite-55-testbloat.service; then
         break
@@ -58,8 +55,8 @@ if setfattr -n user.xattr_test -v 1 /sys/fs/cgroup/; then
     systemctl start testsuite-55-testmunch.service
     systemctl start testsuite-55-testbloat.service
 
-    timeout="$(date -ud "2 minutes" +%s)"
+    timeout=$(date -ud "2 minutes" +%s)
-    while [[ "$(date -u +%s)" -le "$timeout" ]]; do
+    while [[ $(date -u +%s) -le $timeout ]]; do
         if ! systemctl status testsuite-55-testmunch.service; then
             break
         fi

test/units/testsuite-56.sh

@@ -1,5 +1,5 @@
 #!/usr/bin/env bash
-set -eux
+set -ex
 
 systemd-analyze log-level debug