From patchwork Mon Feb 24 11:41:34 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Carlos Santos X-Patchwork-Id: 1243012 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.138; helo=whitealder.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=aHc8YCni; dkim-atps=neutral Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48R0XD2ghLz9sRl for ; Mon, 24 Feb 2020 22:41:48 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 9552E86132; Mon, 24 Feb 2020 11:41:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4WzwdMHrqXmj; Mon, 24 Feb 2020 11:41:45 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id CCBD485C57; Mon, 24 Feb 2020 11:41:45 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id 67F611BF2F1 for ; Mon, 24 Feb 2020 11:41:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 649DE85C57 for ; Mon, 24 Feb 2020 11:41:44 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id sV9tuqzl33Vq for ; Mon, 24 Feb 2020 11:41:43 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-qk1-f194.google.com (mail-qk1-f194.google.com [209.85.222.194]) by whitealder.osuosl.org (Postfix) with ESMTPS id A07F98539F for ; Mon, 24 Feb 2020 11:41:43 +0000 (UTC) Received: by mail-qk1-f194.google.com with SMTP id f3so5442790qkh.3 for ; Mon, 24 Feb 2020 03:41:43 -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; bh=5dA3GW35AgAtGorqFuOSvo5dkYNtXSrbT6o7v17dMKg=; b=aHc8YCni+YCywh8ZDwOS9qs9KgkE3Nzefh5tQS7vGM2PlTQU1LH13cUmIOvgBlxeid MZDtIpVNBLg1SEQexeXoyIeFtNrP3KY3ZQJpvsquDtmz8LtiecqC3lBET3eFBZoztth/ YUuSubxw2zpTeKIMTwgwvZO6nB7j3P+5TZhHK9BSd1ecuNIdrOnQx1Qsv5/HpEuhA4J/ qsw+1+JgWWOecgN7qjbJ537SgIpmq+x4CQxGdB08vfZrZuoBUFrHu6sLCxWTeFWdRn9K bmrorhzGDpkv+TVOewbn5zKcFAyEeod7b6Y/JKFcn7ytjRbk9m0nRSWu/ksP88JQEvYe HSrw== 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; bh=5dA3GW35AgAtGorqFuOSvo5dkYNtXSrbT6o7v17dMKg=; b=VRkJYplN3pfdzHRsLXh7SlUP/jvdc9toe5QhBe6FVgNFyc7601fo6qr6kSCWXSTl20 1F5cWVWiCzhGMI7bepkYqvSoRtjrDXOC4WV70ultfI/PXoP7H5bH+h0r342t/rQT1AXk qWzMBIQTzDxGzSjTGkpconKCgFhD/w2lqQnpE/qHWoiv0EKFlq1MqzyYV3P/EBU3Bprv i3wqiK9LoYYXw/6r0zuhf0PErQT9+vujqCvyRuz+mqhKKRbZh6prWfSUz7FAEsYmJqlY oB4DRBTTVNQdAoYzGG9bKIn5fG1cP1ti0gDK5cVqg+N9lucmJwI7/YuMb7mq4uyO5alt N0ow== X-Gm-Message-State: APjAAAWL2oWzOWIjNr6k2KBaqVS05GGH9t+CF0c2ovNJeFSuIkrX8Ucl 6krTd4+9Q7MNMlFu63SnbHnytikh X-Google-Smtp-Source: APXvYqztq+Z1iP4e61suMMZitc009aWrdgjHNImCuPZJR4Nws/OoY6QOmvCzjhZM0U5cNISRzoLFug== X-Received: by 2002:a37:aac4:: with SMTP id t187mr8343978qke.258.1582544502421; Mon, 24 Feb 2020 03:41:42 -0800 (PST) Received: from casantos.remote.com (189.27.186.149.dynamic.adsl.gvt.net.br. [189.27.186.149]) by smtp.gmail.com with ESMTPSA id z1sm5950943qtq.69.2020.02.24.03.41.40 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 24 Feb 2020 03:41:41 -0800 (PST) From: unixmania@gmail.com To: buildroot@buildroot.org Date: Mon, 24 Feb 2020 08:41:34 -0300 Message-Id: <20200224114134.25887-1-unixmania@gmail.com> X-Mailer: git-send-email 2.18.2 Subject: [Buildroot] [PATCH] package/skeleton-init-openrc: fix root filesystem ro/rw remount 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: Carlos Santos , =?utf-8?b?TWljaGHFgiDFgXlzemN6?= =?utf-8?q?ek?= MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" From: Carlos Santos The regular expressions used in the sed commands assumes that there is a space after '/dev/root' but the skeleton file contains a tab. Use a more flexible '[[:blank:]]', instead. Signed-off-by: Carlos Santos --- package/skeleton-init-openrc/skeleton-init-openrc.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/skeleton-init-openrc/skeleton-init-openrc.mk b/package/skeleton-init-openrc/skeleton-init-openrc.mk index 656fc531d7..b0538ad03f 100644 --- a/package/skeleton-init-openrc/skeleton-init-openrc.mk +++ b/package/skeleton-init-openrc/skeleton-init-openrc.mk @@ -19,13 +19,13 @@ ifeq ($(BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW),y) # Comment /dev/root entry in fstab. When openrc does not find fstab entry for # "/", it will try to remount "/" as "rw". define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW - $(SED) '\:^/dev/root :s/^/# /' $(TARGET_DIR)/etc/fstab + $(SED) '\:^/dev/root[[:blank:]]:s/^/# /' $(TARGET_DIR)/etc/fstab endef else # Uncomment /dev/root entry in fstab which has "ro" option so openrc notices # it and doesn't remount root to rw. define SKELETON_INIT_OPENRC_ROOT_RO_OR_RW - $(SED) '\:^# /dev/root:s/^# //' $(TARGET_DIR)/etc/fstab + $(SED) '\:^#[[:blank:]]*/dev/root[[:blank:]]:s/^# //' $(TARGET_DIR)/etc/fstab endef endif # BR2_TARGET_GENERIC_REMOUNT_ROOTFS_RW