d0fbb81a65
9b0a4bafbce7 base-files: tune fragment queue thresholds for available system memory b47094ce96ff include/package-defaults.mk: fix default Build/Prepare with empty ./src 75be005e8bdc include/rootfs.mk: retain list of conffiles with CONFIG_CLEAN_IPKG 696c6325a3a7 include/rootfs.mk: do not remove opkg prerm scripts during rootfs preparation 17c0362178ca base-files: sysupgrade: do not rely on opkg to list changed conffiles 2ae9ebf37402 kernel: bump 4.4 to 4.4.120 for 17.01 571d3def6baf x86: add preinit hook to reload microcode 681aaaf719ec firmware: add microcode package for Intel c6314ee06f94 firmware: add microcode package for AMD 222521d5937a tools: add iucode-tool f7a6b6724a63 x86: enable microcode loading for Intel and AMD dfe620cb93c0 odhcpd: fix interop with wide DHCPv6 client (FS#1377) 18c999a6ff33 base-files: fix off-by-one in counting seconds for factory reset 92ea65b36aa7 sunxi: disable LPAE to allow kernel to run on A13 7dcbe0e22dbb bcm53xx: fix fallback code for picking status LED 4db583b9c2ab mountd: update to the latest version from 2018-02-26
44 lines
943 B
Diff
44 lines
943 B
Diff
From: Matthias Schiffer <mschiffer@universe-factory.net>
|
|
Date: Sat, 21 Mar 2015 16:40:52 +0100
|
|
Subject: base-files: disable reset button handling
|
|
|
|
This conflicts with our reset button usage.
|
|
|
|
diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset
|
|
deleted file mode 100755
|
|
index 2403122ad21d1abd568337908c9d58060e87bf08..0000000000000000000000000000000000000000
|
|
--- a/package/base-files/files/etc/rc.button/reset
|
|
+++ /dev/null
|
|
@@ -1,31 +0,0 @@
|
|
-#!/bin/sh
|
|
-
|
|
-. /lib/functions.sh
|
|
-
|
|
-OVERLAY="$( grep ' /overlay ' /proc/mounts )"
|
|
-
|
|
-case "$ACTION" in
|
|
-pressed)
|
|
- [ -z "$OVERLAY" ] && return 0
|
|
-
|
|
- return 5
|
|
-;;
|
|
-timeout)
|
|
- . /etc/diag.sh
|
|
- set_state failsafe
|
|
-;;
|
|
-released)
|
|
- if [ "$SEEN" -lt 1 ]
|
|
- then
|
|
- echo "REBOOT" > /dev/console
|
|
- sync
|
|
- reboot
|
|
- elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ]
|
|
- then
|
|
- echo "FACTORY RESET" > /dev/console
|
|
- jffs2reset -y && reboot &
|
|
- fi
|
|
-;;
|
|
-esac
|
|
-
|
|
-return 0
|