From a35b02445c3db06f5d6eaf8496ba5e3b4cde579e Mon Sep 17 00:00:00 2001 From: Calin Crisan Date: Fri, 7 Jun 2019 22:44:21 +0300 Subject: [PATCH] Do not assume /etc/{hostname,hosts,issue} files are present --- package/skeleton-init-common/skeleton-init-common.mk | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/package/skeleton-init-common/skeleton-init-common.mk b/package/skeleton-init-common/skeleton-init-common.mk index 46a181c30d..eb8db2b3f5 100644 --- a/package/skeleton-init-common/skeleton-init-common.mk +++ b/package/skeleton-init-common/skeleton-init-common.mk @@ -49,9 +49,11 @@ SKELETON_INIT_COMMON_HOSTS_LINE += $(SKELETON_INIT_COMMON_SHORT_HOSTNAME) endif define SKELETON_INIT_COMMON_SET_HOSTNAME mkdir -p $(TARGET_DIR)/etc - echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname - $(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTS_LINE)' \ - -e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts + test -f $(TARGET_DIR)/etc/hostname && \ + echo "$(SKELETON_INIT_COMMON_HOSTNAME)" > $(TARGET_DIR)/etc/hostname || true + test -f $(TARGET_DIR)/etc/hosts && \ + $(SED) '$$a \127.0.1.1\t$(SKELETON_INIT_COMMON_HOSTS_LINE)' \ + -e '/^127.0.1.1/d' $(TARGET_DIR)/etc/hosts || true endef SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_HOSTNAME endif @@ -59,7 +61,8 @@ endif ifneq ($(SKELETON_INIT_COMMON_ISSUE),) define SKELETON_INIT_COMMON_SET_ISSUE mkdir -p $(TARGET_DIR)/etc - echo "$(SKELETON_INIT_COMMON_ISSUE)" > $(TARGET_DIR)/etc/issue + test -f $(TARGET_DIR)/etc/issue && \ + echo "$(SKELETON_INIT_COMMON_ISSUE)" > $(TARGET_DIR)/etc/issue || true endef SKELETON_INIT_COMMON_TARGET_FINALIZE_HOOKS += SKELETON_INIT_COMMON_SET_ISSUE endif