From patchwork Mon Jan 13 15:35:14 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Norbert Lange X-Patchwork-Id: 1222181 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=busybox.net (client-ip=140.211.166.136; helo=silver.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20161025 header.b=qdelfnFi; dkim-atps=neutral Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 47xHjc19F3z9sPn for ; Tue, 14 Jan 2020 02:35:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 03BEB20433; Mon, 13 Jan 2020 15:35:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id hefHdltpGEBq; Mon, 13 Jan 2020 15:35:37 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 045692043B; Mon, 13 Jan 2020 15:35:37 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id EF9721BF365 for ; Mon, 13 Jan 2020 15:35:35 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id EC66A85184 for ; Mon, 13 Jan 2020 15:35:35 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 8nuJA6DPf1jL for ; Mon, 13 Jan 2020 15:35:35 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wr1-f44.google.com (mail-wr1-f44.google.com [209.85.221.44]) by fraxinus.osuosl.org (Postfix) with ESMTPS id A01FB855F6 for ; Mon, 13 Jan 2020 15:35:34 +0000 (UTC) Received: by mail-wr1-f44.google.com with SMTP id y17so9057282wrh.5 for ; Mon, 13 Jan 2020 07:35:34 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=h4kSTKA96FpMI6af45gKU4YW1pGhCTAZqNJhmo9G94k=; b=qdelfnFiJ9gby+eqY1tfno875XMATFBbIfas6jbcvoaeuoHRKpJzhDIDYbt/DONstB N3+0zI0jGlF3y+pt9hsSNJ9Rut0zPxJmMEmMvwp6SOilkpPZFXg8yvPDiyy6MBmPwclR oLi7KAGlG+eF959K72CV6pcF8gOgvZG92HRYEIUhQbE1bRaFZCrFP8qEDZqFD3fGQJsy jdq6iM5i8m2+C9u7zpKS9DqqvfJox8+vSExw+Y09hkp8vWof5c52y+6q3RIldrWqZHBM HC6SWwSioylfZn0xyIkkh3ypdoGB7WCtZRIqILxuQf8zbnZHzLpTZoCN/f57If9BMWdC /Dbg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=h4kSTKA96FpMI6af45gKU4YW1pGhCTAZqNJhmo9G94k=; b=DCnuiht7IPIu3d2QZROkqO6mqGX2e2akqrxLkX8stYzgaCRztCQc/SsBgIgPQjFFn0 BlzjnHHbyAIW5hkpCXl16AW/eU6vGmBImBE8ic1OMtQBYyZam9ghH7DTjh5YfKrM3xpy DmerYomph9NlL/uD1LhfBaj2G5yjx7LmJFodMhJb5xExCmriu8zyaBKAWef/IFNYjZy/ NLM0WiwhTyjgEllQLpToCy7i43b2ntLubNQmP2bVIpDC26vGwiSe/A8fbj8tFiB6tHwx MzcywgQZaN4OuQ06PeUU8kKqW5PuR2TBMK5WX+uw3eJqdxGxldspzvMsT3RXM9L2Ar8Q 9qnA== X-Gm-Message-State: APjAAAWlrXLz/kUVn8xEM4KPrAtoEheyARyCn+A1MuATEUGFT4bd3p8S xa9oZoZtostu+Rux4PjgXsw/+cXjQgw9gg== X-Google-Smtp-Source: APXvYqzTXn8pkElk7MVtLNYpqOnBkhU9+BNKq6mGEl75xRD9FAkQUual/7Uktp/FC0WVspwc0ZmTfw== X-Received: by 2002:adf:806e:: with SMTP id 101mr20112836wrk.300.1578929732500; Mon, 13 Jan 2020 07:35:32 -0800 (PST) Received: from lano-work.andritz.com ([80.120.136.76]) by smtp.gmail.com with ESMTPSA id c9sm14505199wmc.47.2020.01.13.07.35.31 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 13 Jan 2020 07:35:32 -0800 (PST) From: Norbert Lange To: buildroot@buildroot.org Date: Mon, 13 Jan 2020 16:35:14 +0100 Message-Id: <20200113153516.486106-2-nolange79@gmail.com> X-Mailer: git-send-email 2.24.1 In-Reply-To: <20200113153516.486106-1-nolange79@gmail.com> References: <20200113153516.486106-1-nolange79@gmail.com> MIME-Version: 1.0 Subject: [Buildroot] [PATCH 2/3] package/systemd: create system users X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Norbert Lange , "Yann E. MORIN" , Adam Duskett , Maxime Hadjinlian Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Signed-off-by: Norbert Lange --- package/systemd/allow-empty-hostname.patch | 58 ++++++++++++++++++++++ package/systemd/systemd.mk | 18 +++---- 2 files changed, 67 insertions(+), 9 deletions(-) create mode 100644 package/systemd/allow-empty-hostname.patch diff --git a/package/systemd/allow-empty-hostname.patch b/package/systemd/allow-empty-hostname.patch new file mode 100644 index 0000000000..43dff94eae --- /dev/null +++ b/package/systemd/allow-empty-hostname.patch @@ -0,0 +1,58 @@ +diff --git a/src/network/generator/network-generator.c b/src/network/generator/network-generator.c +index 81afa953076..bed1e42697c 100644 +--- a/src/network/generator/network-generator.c ++++ b/src/network/generator/network-generator.c +@@ -574,7 +574,7 @@ static int parse_netmask_or_prefixlen(int family, const char **value, unsigned c + + static int parse_cmdline_ip_address(Context *context, int family, const char *value) { + union in_addr_union addr = {}, peer = {}, gateway = {}; +- const char *hostname, *ifname, *dhcp_type, *dns, *p; ++ const char *hostname = NULL, *ifname, *dhcp_type, *dns, *p; + unsigned char prefixlen; + int r; + +@@ -599,9 +599,11 @@ static int parse_cmdline_ip_address(Context *context, int family, const char *va + if (!p) + return -EINVAL; + +- hostname = strndupa(value, p - value); +- if (!hostname_is_valid(hostname, false)) +- return -EINVAL; ++ if (p != value) { ++ hostname = strndupa(value, p - value); ++ if (!hostname_is_valid(hostname, false)) ++ return -EINVAL; ++ } + + value = p + 1; + +diff --git a/test/TEST-35-NETWORK-GENERATOR/test-03-issue-14319.expected/90-enp3s0.network b/test/TEST-35-NETWORK-GENERATOR/test-03-issue-14319.expected/90-enp3s0.network +new file mode 100644 +index 00000000000..28ccfdd9b00 +--- /dev/null ++++ b/test/TEST-35-NETWORK-GENERATOR/test-03-issue-14319.expected/90-enp3s0.network +@@ -0,0 +1,17 @@ ++# Automatically generated by systemd-network-generator ++ ++[Match] ++Name=enp3s0 ++ ++[Link] ++ ++[Network] ++DHCP=no ++ ++[DHCP] ++ ++[Address] ++Address=10.99.37.44/16 ++ ++[Route] ++Gateway=10.99.10.1 +diff --git a/test/TEST-35-NETWORK-GENERATOR/test-03-issue-14319.input b/test/TEST-35-NETWORK-GENERATOR/test-03-issue-14319.input +new file mode 100644 +index 00000000000..3be752067b8 +--- /dev/null ++++ b/test/TEST-35-NETWORK-GENERATOR/test-03-issue-14319.input +@@ -0,0 +1 @@ ++root=/dev/nfs nfsroot=10.99.37.240:/srv/netroot,v3,tcp ip=10.99.37.44::10.99.10.1:255.255.0.0::enp3s0:off diff --git a/package/systemd/systemd.mk b/package/systemd/systemd.mk index a3073f10a9..bce87951d2 100644 --- a/package/systemd/systemd.mk +++ b/package/systemd/systemd.mk @@ -181,7 +181,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_JOURNAL_REMOTE),y) SYSTEMD_CONF_OPTS += -Dremote=true -SYSTEMD_REMOTE_USER = systemd-journal-remote -1 systemd-journal-remote -1 * /run/systemd - - systemd Journal Remote +SYSTEMD_REMOTE_USER = systemd-journal-remote -2 systemd-journal-remote -2 * /run/systemd - - systemd Journal Remote else SYSTEMD_CONF_OPTS += -Dremote=false endif @@ -305,7 +305,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_COREDUMP),y) SYSTEMD_CONF_OPTS += -Dcoredump=true -SYSTEMD_COREDUMP_USER = systemd-coredump -1 systemd-coredump -1 * /run/systemd - - systemd core dump processing +SYSTEMD_COREDUMP_USER = systemd-coredump -2 systemd-coredump -2 * /run/systemd - - systemd core dump processing else SYSTEMD_CONF_OPTS += -Dcoredump=false endif @@ -325,7 +325,7 @@ endif ifeq ($(BR2_PACKAGE_SYSTEMD_NETWORKD),y) SYSTEMD_CONF_OPTS += -Dnetworkd=true -SYSTEMD_NETWORKD_USER = systemd-network -1 systemd-network -1 * /run/systemd - - systemd Network Management +SYSTEMD_NETWORKD_USER = systemd-network -2 systemd-network -2 * /run/systemd - - systemd Network Management SYSTEMD_NETWORKD_DHCP_IFACE = $(call qstrip,$(BR2_SYSTEM_DHCP)) ifneq ($(SYSTEMD_NETWORKD_DHCP_IFACE),) define SYSTEMD_INSTALL_NETWORK_CONFS @@ -344,14 +344,14 @@ define SYSTEMD_INSTALL_RESOLVCONF_HOOK $(TARGET_DIR)/etc/resolv.conf endef SYSTEMD_CONF_OPTS += -Dresolve=true -SYSTEMD_RESOLVED_USER = systemd-resolve -1 systemd-resolve -1 * /run/systemd - - systemd Resolver +SYSTEMD_RESOLVED_USER = systemd-resolve -2 systemd-resolve -2 * /run/systemd - - systemd Resolver else SYSTEMD_CONF_OPTS += -Dresolve=false endif ifeq ($(BR2_PACKAGE_SYSTEMD_TIMESYNCD),y) SYSTEMD_CONF_OPTS += -Dtimesyncd=true -SYSTEMD_TIMESYNCD_USER = systemd-timesync -1 systemd-timesync -1 * /run/systemd - - systemd Time Synchronization +SYSTEMD_TIMESYNCD_USER = systemd-timesync -2 systemd-timesync -2 * /run/systemd - - systemd Time Synchronization else SYSTEMD_CONF_OPTS += -Dtimesyncd=false endif @@ -420,10 +420,10 @@ define SYSTEMD_INSTALL_IMAGES_CMDS endef define SYSTEMD_USERS - - - input -1 * - - - Input device group - - - systemd-journal -1 * - - - Journal - - - render -1 * - - - DRI rendering nodes - - - kvm -1 * - - - kvm nodes + - - input -2 * - - - Input device group + - - systemd-journal -2 * - - - Journal + - - render -2 * - - - DRI rendering nodes + - - kvm -2 * - - - kvm nodes $(SYSTEMD_REMOTE_USER) $(SYSTEMD_COREDUMP_USER) $(SYSTEMD_NETWORKD_USER)