From 1c9299877be9f4b0aa91d9861d04f78b01d66a9d Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Fri, 29 Dec 2017 14:34:03 +0100 Subject: [PATCH] base-files: set FAILSAFE in /etc/profile when /tmp/.failsafe exists Since dropbear clears the environment, FAILSAFE was not set as intended in failsafe mode. Signed-off-by: Matthias Schiffer --- package/base-files/Makefile | 2 +- package/base-files/files/etc/profile | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/package/base-files/Makefile b/package/base-files/Makefile index 170bc3d483..1cda882bd3 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/version.mk PKG_NAME:=base-files -PKG_RELEASE:=173.1 +PKG_RELEASE:=173.2 PKG_FLAGS:=nonshared PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/ diff --git a/package/base-files/files/etc/profile b/package/base-files/files/etc/profile index 3eda09b456..8ac9d6dbb5 100644 --- a/package/base-files/files/etc/profile +++ b/package/base-files/files/etc/profile @@ -1,6 +1,9 @@ #!/bin/sh +[ -e /tmp/.failsafe ] && export FAILSAFE=1 + [ -f /etc/banner ] && cat /etc/banner -[ -e /tmp/.failsafe ] && cat /etc/banner.failsafe +[ -n "$FAILSAFE" ] || cat /etc/banner.failsafe + fgrep -sq '/ overlay ro,' /proc/mounts && { echo 'Your JFFS2-partition seems full and overlayfs is mounted read-only.' echo 'Please try to remove files from /overlay/upper/... and reboot!' -- 2.25.1