From 8170f280c4c8e45a50e9d4942e7358e1271e697f 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. This also broke sysupgrade from failsafe mode over SSH. 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 728d787e09..d0c9d6bc29 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -12,7 +12,7 @@ include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/feeds.mk PKG_NAME:=base-files -PKG_RELEASE:=179 +PKG_RELEASE:=180 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