From: Yann E. MORIN <yann.morin.1998@free.fr>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH] package/skeleton-init-openrc: fix root filesystem ro/rw remount
Date: Mon, 24 Feb 2020 19:34:52 +0100 [thread overview]
Message-ID: <20200224183452.GX8743@scaer> (raw)
In-Reply-To: <20200224114134.25887-1-unixmania@gmail.com>
Carlos, All,
On 2020-02-24 08:41 -0300, unixmania at gmail.com spake thusly:
> From: Carlos Santos <unixmania@gmail.com>
>
> 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 <unixmania@gmail.com>
Applied to master, thanks.
Regards,
Yann E. MORIN.
> ---
> 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
>
> --
> 2.18.2
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
--
.-----------------.--------------------.------------------.--------------------.
| Yann E. MORIN | Real-Time Embedded | /"\ ASCII RIBBON | Erics' conspiracy: |
| +33 662 376 056 | Software Designer | \ / CAMPAIGN | ___ |
| +33 561 099 427 `------------.-------: X AGAINST | \e/ There is no |
| http://ymorin.is-a-geek.org/ | _/*\_ | / \ HTML MAIL | v conspiracy. |
'------------------------------^-------^------------------^--------------------'
next prev parent reply other threads:[~2020-02-24 18:34 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-02-24 11:41 [Buildroot] [PATCH] package/skeleton-init-openrc: fix root filesystem ro/rw remount unixmania at gmail.com
2020-02-24 18:34 ` Yann E. MORIN [this message]
2020-03-14 16:28 ` Peter Korsgaard
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20200224183452.GX8743@scaer \
--to=yann.morin.1998@free.fr \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.