From c51c981a060d11f2cbc7c389ab649f84029c4646 Mon Sep 17 00:00:00 2001 From: Carlos Santos Date: Mon, 24 Feb 2020 08:41:34 -0300 Subject: [PATCH] package/skeleton-init-openrc: fix root filesystem ro/rw remount 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 Signed-off-by: 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.30.2