package/libbatadv/src/batadv-genl.h

@@ -79,10 +79,8 @@ struct batadv_nlquery_opts {
  *
  * Return: Return true when a attribute is missing, false otherwise
  */
-static inline bool
-batadv_genl_missing_attrs(struct nlattr *attrs[],
-			  const enum batadv_nl_attrs mandatory[], size_t num)
-{
+static inline bool batadv_genl_missing_attrs(struct nlattr *attrs[],
+		const enum batadv_nl_attrs mandatory[], size_t num) {
 	size_t i;
 
 	for (i = 0; i < num; i++) {

package/libbatadv/src/batman_adv.h

 /* SPDX-License-Identifier: MIT */
-/* Copyright (C) 2016-2017  B.A.T.M.A.N. contributors:
+/* Copyright (C) B.A.T.M.A.N. contributors:
  *
  * Matthias Schiffer
- *
- * Permission is hereby granted, free of charge, to any person obtaining a
- * copy of this software and associated documentation files (the "Software"),
- * to deal in the Software without restriction, including without limitation
- * the rights to use, copy, modify, merge, publish, distribute, sublicense,
- * and/or sell copies of the Software, and to permit persons to whom the
- * Software is furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- * DEALINGS IN THE SOFTWARE.
  */
 
 #ifndef _UAPI_LINUX_BATMAN_ADV_H_
@@ -27,6 +9,7 @@
 
 #define BATADV_NL_NAME "batadv"
 
+#define BATADV_NL_MCAST_GROUP_CONFIG	"config"
 #define BATADV_NL_MCAST_GROUP_TPMETER	"tpmeter"
 
 /**
@@ -86,11 +69,72 @@ enum batadv_tt_client_flags {
 
 	/**
 	 * @BATADV_TT_CLIENT_TEMP: this global client has been detected to be
-	 * part of the network but no nnode has already announced it
+	 * part of the network but no node has already announced it
 	 */
 	BATADV_TT_CLIENT_TEMP	 = (1 << 11),
 };
 
+/**
+ * enum batadv_mcast_flags_priv - Private, own multicast flags
+ *
+ * These are internal, multicast related flags. Currently they describe certain
+ * multicast related attributes of the segment this originator bridges into the
+ * mesh.
+ *
+ * Those attributes are used to determine the public multicast flags this
+ * originator is going to announce via TT.
+ *
+ * For netlink, if BATADV_MCAST_FLAGS_BRIDGED is unset then all querier
+ * related flags are undefined.
+ */
+enum batadv_mcast_flags_priv {
+	/**
+	 * @BATADV_MCAST_FLAGS_BRIDGED: There is a bridge on top of the mesh
+	 * interface.
+	 */
+	BATADV_MCAST_FLAGS_BRIDGED			= (1 << 0),
+
+	/**
+	 * @BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS: Whether an IGMP querier
+	 * exists in the mesh
+	 */
+	BATADV_MCAST_FLAGS_QUERIER_IPV4_EXISTS		= (1 << 1),
+
+	/**
+	 * @BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS: Whether an MLD querier
+	 * exists in the mesh
+	 */
+	BATADV_MCAST_FLAGS_QUERIER_IPV6_EXISTS		= (1 << 2),
+
+	/**
+	 * @BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING: If an IGMP querier
+	 * exists, whether it is potentially shadowing multicast listeners
+	 * (i.e. querier is behind our own bridge segment)
+	 */
+	BATADV_MCAST_FLAGS_QUERIER_IPV4_SHADOWING	= (1 << 3),
+
+	/**
+	 * @BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING: If an MLD querier
+	 * exists, whether it is potentially shadowing multicast listeners
+	 * (i.e. querier is behind our own bridge segment)
+	 */
+	BATADV_MCAST_FLAGS_QUERIER_IPV6_SHADOWING	= (1 << 4),
+};
+
+/**
+ * enum batadv_gw_modes - gateway mode of node
+ */
+enum batadv_gw_modes {
+	/** @BATADV_GW_MODE_OFF: gw mode disabled */
+	BATADV_GW_MODE_OFF,
+
+	/** @BATADV_GW_MODE_CLIENT: send DHCP requests to gw servers */
+	BATADV_GW_MODE_CLIENT,
+
+	/** @BATADV_GW_MODE_SERVER: announce itself as gateway server */
+	BATADV_GW_MODE_SERVER,
+};
+
 /**
  * enum batadv_nl_attrs - batman-adv netlink attributes
  */
@@ -272,6 +316,171 @@ enum batadv_nl_attrs {
 	 */
 	BATADV_ATTR_BLA_CRC,
 
+	/**
+	 * @BATADV_ATTR_DAT_CACHE_IP4ADDRESS: Client IPv4 address
+	 */
+	BATADV_ATTR_DAT_CACHE_IP4ADDRESS,
+
+	/**
+	 * @BATADV_ATTR_DAT_CACHE_HWADDRESS: Client MAC address
+	 */
+	BATADV_ATTR_DAT_CACHE_HWADDRESS,
+
+	/**
+	 * @BATADV_ATTR_DAT_CACHE_VID: VLAN ID
+	 */
+	BATADV_ATTR_DAT_CACHE_VID,
+
+	/**
+	 * @BATADV_ATTR_MCAST_FLAGS: Per originator multicast flags
+	 */
+	BATADV_ATTR_MCAST_FLAGS,
+
+	/**
+	 * @BATADV_ATTR_MCAST_FLAGS_PRIV: Private, own multicast flags
+	 */
+	BATADV_ATTR_MCAST_FLAGS_PRIV,
+
+	/**
+	 * @BATADV_ATTR_VLANID: VLAN id on top of soft interface
+	 */
+	BATADV_ATTR_VLANID,
+
+	/**
+	 * @BATADV_ATTR_AGGREGATED_OGMS_ENABLED: whether the batman protocol
+	 *  messages of the mesh interface shall be aggregated or not.
+	 */
+	BATADV_ATTR_AGGREGATED_OGMS_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_AP_ISOLATION_ENABLED: whether the data traffic going
+	 *  from a wireless client to another wireless client will be silently
+	 *  dropped.
+	 */
+	BATADV_ATTR_AP_ISOLATION_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_ISOLATION_MARK: the isolation mark which is used to
+	 *  classify clients as "isolated" by the Extended Isolation feature.
+	 */
+	BATADV_ATTR_ISOLATION_MARK,
+
+	/**
+	 * @BATADV_ATTR_ISOLATION_MASK: the isolation (bit)mask which is used to
+	 *  classify clients as "isolated" by the Extended Isolation feature.
+	 */
+	BATADV_ATTR_ISOLATION_MASK,
+
+	/**
+	 * @BATADV_ATTR_BONDING_ENABLED: whether the data traffic going through
+	 *  the mesh will be sent using multiple interfaces at the same time.
+	 */
+	BATADV_ATTR_BONDING_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED: whether the bridge loop
+	 *  avoidance feature is enabled. This feature detects and avoids loops
+	 *  between the mesh and devices bridged with the soft interface
+	 */
+	BATADV_ATTR_BRIDGE_LOOP_AVOIDANCE_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED: whether the distributed
+	 *  arp table feature is enabled. This feature uses a distributed hash
+	 *  table to answer ARP requests without flooding the request through
+	 *  the whole mesh.
+	 */
+	BATADV_ATTR_DISTRIBUTED_ARP_TABLE_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_FRAGMENTATION_ENABLED: whether the data traffic going
+	 *  through the mesh will be fragmented or silently discarded if the
+	 *  packet size exceeds the outgoing interface MTU.
+	 */
+	BATADV_ATTR_FRAGMENTATION_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_GW_BANDWIDTH_DOWN: defines the download bandwidth which
+	 *  is propagated by this node if %BATADV_ATTR_GW_BANDWIDTH_MODE was set
+	 *  to 'server'.
+	 */
+	BATADV_ATTR_GW_BANDWIDTH_DOWN,
+
+	/**
+	 * @BATADV_ATTR_GW_BANDWIDTH_UP: defines the upload bandwidth which
+	 *  is propagated by this node if %BATADV_ATTR_GW_BANDWIDTH_MODE was set
+	 *  to 'server'.
+	 */
+	BATADV_ATTR_GW_BANDWIDTH_UP,
+
+	/**
+	 * @BATADV_ATTR_GW_MODE: defines the state of the gateway features.
+	 * Possible values are specified in enum batadv_gw_modes
+	 */
+	BATADV_ATTR_GW_MODE,
+
+	/**
+	 * @BATADV_ATTR_GW_SEL_CLASS: defines the selection criteria this node
+	 *  will use to choose a gateway if gw_mode was set to 'client'.
+	 */
+	BATADV_ATTR_GW_SEL_CLASS,
+
+	/**
+	 * @BATADV_ATTR_HOP_PENALTY: defines the penalty which will be applied
+	 *  to an originator message's tq-field on every hop and/or per
+	 *  hard interface
+	 */
+	BATADV_ATTR_HOP_PENALTY,
+
+	/**
+	 * @BATADV_ATTR_LOG_LEVEL: bitmask with to define which debug messages
+	 *  should be send to the debug log/trace ring buffer
+	 */
+	BATADV_ATTR_LOG_LEVEL,
+
+	/**
+	 * @BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED: whether multicast
+	 *  optimizations should be replaced by simple broadcast-like flooding
+	 *  of multicast packets. If set to non-zero then all nodes in the mesh
+	 *  are going to use classic flooding for any multicast packet with no
+	 *  optimizations.
+	 */
+	BATADV_ATTR_MULTICAST_FORCEFLOOD_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_NETWORK_CODING_ENABLED: whether Network Coding (using
+	 *  some magic to send fewer wifi packets but still the same content) is
+	 *  enabled or not.
+	 */
+	BATADV_ATTR_NETWORK_CODING_ENABLED,
+
+	/**
+	 * @BATADV_ATTR_ORIG_INTERVAL: defines the interval in milliseconds in
+	 *  which batman sends its protocol messages.
+	 */
+	BATADV_ATTR_ORIG_INTERVAL,
+
+	/**
+	 * @BATADV_ATTR_ELP_INTERVAL: defines the interval in milliseconds in
+	 *  which batman emits probing packets for neighbor sensing (ELP).
+	 */
+	BATADV_ATTR_ELP_INTERVAL,
+
+	/**
+	 * @BATADV_ATTR_THROUGHPUT_OVERRIDE: defines the throughput value to be
+	 *  used by B.A.T.M.A.N. V when estimating the link throughput using
+	 *  this interface. If the value is set to 0 then batman-adv will try to
+	 *  estimate the throughput by itself.
+	 */
+	BATADV_ATTR_THROUGHPUT_OVERRIDE,
+
+	/**
+	 * @BATADV_ATTR_MULTICAST_FANOUT: defines the maximum number of packet
+	 * copies that may be generated for a multicast-to-unicast conversion.
+	 * Once this limit is exceeded distribution will fall back to broadcast.
+	 */
+	BATADV_ATTR_MULTICAST_FANOUT,
+
 	/* add attributes above here, update the policy in netlink.c */
 
 	/**
@@ -300,10 +509,14 @@ enum batadv_nl_commands {
 	BATADV_CMD_UNSPEC,
 
 	/**
-	 * @BATADV_CMD_GET_MESH_INFO: Query basic information about batman-adv
-	 * device
+	 * @BATADV_CMD_GET_MESH: Get attributes from softif/mesh
 	 */
-	BATADV_CMD_GET_MESH_INFO,
+	BATADV_CMD_GET_MESH,
+
+	/**
+	 * @BATADV_CMD_GET_MESH_INFO: Alias for @BATADV_CMD_GET_MESH
+	 */
+	BATADV_CMD_GET_MESH_INFO = BATADV_CMD_GET_MESH,
 
 	/**
 	 * @BATADV_CMD_TP_METER: Start a tp meter session
@@ -321,9 +534,15 @@ enum batadv_nl_commands {
 	BATADV_CMD_GET_ROUTING_ALGOS,
 
 	/**
-	 * @BATADV_CMD_GET_HARDIFS: Query list of hard interfaces
+	 * @BATADV_CMD_GET_HARDIF: Get attributes from a hardif of the
+	 *  current softif
 	 */
-	BATADV_CMD_GET_HARDIFS,
+	BATADV_CMD_GET_HARDIF,
+
+	/**
+	 * @BATADV_CMD_GET_HARDIFS: Alias for @BATADV_CMD_GET_HARDIF
+	 */
+	BATADV_CMD_GET_HARDIFS = BATADV_CMD_GET_HARDIF,
 
 	/**
 	 * @BATADV_CMD_GET_TRANSTABLE_LOCAL: Query list of local translations
@@ -361,6 +580,39 @@ enum batadv_nl_commands {
 	 */
 	BATADV_CMD_GET_BLA_BACKBONE,
 
+	/**
+	 * @BATADV_CMD_GET_DAT_CACHE: Query list of DAT cache entries
+	 */
+	BATADV_CMD_GET_DAT_CACHE,
+
+	/**
+	 * @BATADV_CMD_GET_MCAST_FLAGS: Query list of multicast flags
+	 */
+	BATADV_CMD_GET_MCAST_FLAGS,
+
+	/**
+	 * @BATADV_CMD_SET_MESH: Set attributes for softif/mesh
+	 */
+	BATADV_CMD_SET_MESH,
+
+	/**
+	 * @BATADV_CMD_SET_HARDIF: Set attributes for hardif of the
+	 *  current softif
+	 */
+	BATADV_CMD_SET_HARDIF,
+
+	/**
+	 * @BATADV_CMD_GET_VLAN: Get attributes from a VLAN of the
+	 *  current softif
+	 */
+	BATADV_CMD_GET_VLAN,
+
+	/**
+	 * @BATADV_CMD_SET_VLAN: Set attributes for VLAN of the
+	 *  current softif
+	 */
+	BATADV_CMD_SET_VLAN,
+
 	/* add new commands above here */
 
 	/**
@@ -423,4 +675,30 @@ enum batadv_tp_meter_reason {
 	BATADV_TP_REASON_TOO_MANY		= 133,
 };
 
+/**
+ * enum batadv_ifla_attrs - batman-adv ifla nested attributes
+ */
+enum batadv_ifla_attrs {
+	/**
+	 * @IFLA_BATADV_UNSPEC: unspecified attribute which is not parsed by
+	 *  rtnetlink
+	 */
+	IFLA_BATADV_UNSPEC,
+
+	/**
+	 * @IFLA_BATADV_ALGO_NAME: routing algorithm (name) which should be
+	 *  used by the newly registered batadv net_device.
+	 */
+	IFLA_BATADV_ALGO_NAME,
+
+	/* add attributes above here, update the policy in soft-interface.c */
+
+	/**
+	 * @__IFLA_BATADV_MAX: internal use
+	 */
+	__IFLA_BATADV_MAX,
+};
+
+#define IFLA_BATADV_MAX (__IFLA_BATADV_MAX - 1)
+
 #endif /* _UAPI_LINUX_BATMAN_ADV_H_ */

package/libgluonutil/src/libgluonutil.c

-/*
-  Copyright (c) 2016, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+/* SPDX-FileCopyrightText: 2016 Matthias Schiffer <mschiffer@universe-factory.net> */
+/* SPDX-License-Identifier: BSD-2-Clause */
 
 
 #include "libgluonutil.h"
 
 #include <json-c/json.h>
 #include <uci.h>
+
 #include <arpa/inet.h>
+
+#include <errno.h>
+#include <glob.h>
+#include <libgen.h>
+#include <limits.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
@@ -127,6 +111,75 @@ char * gluonutil_get_interface_address(const char *ifname) {
 	return gluonutil_read_line(path);
 }
 
+void gluonutil_get_interface_lower(char out[IF_NAMESIZE], const char *ifname) {
+	strncpy(out, ifname, IF_NAMESIZE-1);
+	out[IF_NAMESIZE-1] = 0;
+
+	const char *format = "/sys/class/net/%s/lower_*";
+	char pattern[strlen(format) + IF_NAMESIZE];
+
+	while (true) {
+		snprintf(pattern, sizeof(pattern), format, out);
+		size_t pattern_len = strlen(pattern);
+
+		glob_t lower;
+		if (glob(pattern, GLOB_NOSORT, NULL, &lower) != 0)
+			break;
+
+		strncpy(out, lower.gl_pathv[0] + pattern_len - 1, IF_NAMESIZE-1);
+
+		globfree(&lower);
+	}
+}
+
+enum gluonutil_interface_type lookup_interface_type(const char *devtype) {
+	if (strcmp(devtype, "wlan") == 0)
+		return GLUONUTIL_INTERFACE_TYPE_WIRELESS;
+
+	if (strcmp(devtype, "l2tpeth") == 0 || strcmp(devtype, "wireguard") == 0)
+		return GLUONUTIL_INTERFACE_TYPE_TUNNEL;
+
+	/* Regular wired interfaces do not set DEVTYPE, so if this point is
+	 * reached, we have something different */
+	return GLUONUTIL_INTERFACE_TYPE_UNKNOWN;
+}
+
+enum gluonutil_interface_type gluonutil_get_interface_type(const char *ifname) {
+	const char *pattern = "/sys/class/net/%s/%s";
+
+	/* Default to wired type when no DEVTYPE is set */
+	enum gluonutil_interface_type ret = GLUONUTIL_INTERFACE_TYPE_WIRED;
+	char *line = NULL, path[PATH_MAX];
+	size_t buflen = 0;
+	ssize_t len;
+	FILE *f;
+
+	snprintf(path, sizeof(path), pattern, ifname, "tun_flags");
+	if (access(path, F_OK) == 0)
+		return GLUONUTIL_INTERFACE_TYPE_TUNNEL;
+
+	snprintf(path, sizeof(path), pattern, ifname, "uevent");
+	f = fopen(path, "r");
+	if (!f)
+		return GLUONUTIL_INTERFACE_TYPE_UNKNOWN;
+
+	while ((len = getline(&line, &buflen, f)) >= 0) {
+		if (len == 0)
+			continue;
+
+		if (line[len-1] == '\n')
+			line[len-1] = '\0';
+
+		if (strncmp(line, "DEVTYPE=", 8) == 0) {
+			ret = lookup_interface_type(line+8);
+			break;
+		}
+	}
+	free(line);
+
+	fclose(f);
+	return ret;
+}
 
 
 struct json_object * gluonutil_wrap_string(const char *str) {
@@ -212,6 +265,45 @@ uci_fail:
 	return ret;
 }
 
+char * gluonutil_get_primary_domain(void) {
+	if (!gluonutil_has_domains())
+		return NULL;
+
+	char *domain_code = gluonutil_get_domain();
+	if (!domain_code)
+		return NULL;
+
+	const char *domain_path_fmt = "/lib/gluon/domains/%s.json";
+	char domain_path[strlen(domain_path_fmt) + strlen(domain_code)];
+	snprintf(domain_path, sizeof(domain_path), domain_path_fmt, domain_code);
+
+	char primary_domain_path[PATH_MAX+1];
+	char *primary_domain_code;
+	ssize_t len = readlink(domain_path, primary_domain_path, PATH_MAX);
+	if (len < 0) {
+		// EINVAL = file is not a symlink = the domain itself is the primary domain
+		if (errno != EINVAL) {
+			free(domain_code);
+			return NULL;
+		}
+
+		return domain_code;
+	}
+
+	free(domain_code);
+
+	primary_domain_path[len] = '\0';
+	primary_domain_code = basename(primary_domain_path);
+
+	char *ext_begin = strrchr(primary_domain_code, '.');
+	if (!ext_begin)
+		return NULL;
+
+	// strip .json from filename
+	*ext_begin = '\0';
+	return strdup(primary_domain_code);
+}
+
 
 struct json_object * gluonutil_load_site_config(void) {
 	char *domain_code = NULL;
@@ -243,6 +335,5 @@ struct json_object * gluonutil_load_site_config(void) {
 
 err:
 	json_object_put(site);
-	free(domain_code);
 	return NULL;
 }

package/libgluonutil/src/libgluonutil.h

-/*
-  Copyright (c) 2016, Matthias Schiffer <mschiffer@universe-factory.net>
-  All rights reserved.
-
-  Redistribution and use in source and binary forms, with or without
-  modification, are permitted provided that the following conditions are met:
-
-    1. Redistributions of source code must retain the above copyright notice,
-       this list of conditions and the following disclaimer.
-    2. Redistributions in binary form must reproduce the above copyright notice,
-       this list of conditions and the following disclaimer in the documentation
-       and/or other materials provided with the distribution.
-
-  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-  AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-  IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-  DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-  FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-  DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-  SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-  CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-  OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-*/
+/* SPDX-FileCopyrightText: 2016 Matthias Schiffer <mschiffer@universe-factory.net> */
+/* SPDX-License-Identifier: BSD-2-Clause */
 
 
 #ifndef _LIBGLUON_LIBGLUON_H_
 #define _LIBGLUON_LIBGLUON_H_
 
+#include <net/if.h>
 #include <netinet/in.h>
 #include <stdbool.h>
 
@@ -34,7 +13,18 @@
 char * gluonutil_read_line(const char *filename);
 char * gluonutil_get_sysconfig(const char *key);
 char * gluonutil_get_node_id(void);
+
+enum gluonutil_interface_type {
+	GLUONUTIL_INTERFACE_TYPE_UNKNOWN,
+	GLUONUTIL_INTERFACE_TYPE_WIRED,
+	GLUONUTIL_INTERFACE_TYPE_WIRELESS,
+	GLUONUTIL_INTERFACE_TYPE_TUNNEL,
+};
+
+void gluonutil_get_interface_lower(char out[IF_NAMESIZE], const char *ifname);
 char * gluonutil_get_interface_address(const char *ifname);
+enum gluonutil_interface_type gluonutil_get_interface_type(const char *ifname);
+
 bool gluonutil_get_node_prefix6(struct in6_addr *prefix);
 
 struct json_object * gluonutil_wrap_string(const char *str);
@@ -42,6 +32,7 @@ struct json_object * gluonutil_wrap_and_free_string(char *str);
 
 bool gluonutil_has_domains(void);
 char * gluonutil_get_domain(void);
+char * gluonutil_get_primary_domain(void);
 struct json_object * gluonutil_load_site_config(void);
 
 #endif /* _LIBGLUON_LIBGLUON_H_ */

patches/lede/0001-build-move-STAGING_DIR_HOSTPKG-and-BUILD_DIR_HOST-back-to-a-common-directory-for-all-targets.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 14 Jan 2017 18:13:14 +0100
-Subject: build: move STAGING_DIR_HOSTPKG and BUILD_DIR_HOST back to a common directory for all targets
-
-$(STAGING_DIR)/host is kept in addition to $(STAGING_DIR_HOSTPKG) in most
-places; it is still used as destination for host files in Build/InstallDev.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/Makefile b/Makefile
-index b220dfd3c56a11f3e27d70e3d6e58cc6448abd2f..c1a7285c83df310e987eaef8376500d2b614eafb 100644
---- a/Makefile
-+++ b/Makefile
-@@ -55,7 +55,7 @@ clean: FORCE
- 	rm -rf $(BUILD_DIR) $(STAGING_DIR) $(BIN_DIR) $(OUTPUT_DIR)/packages/$(ARCH_PACKAGES) $(BUILD_LOG_DIR) $(TOPDIR)/staging_dir/packages
- 
- dirclean: clean
--	rm -rf $(STAGING_DIR_HOST) $(TOOLCHAIN_DIR) $(BUILD_DIR_HOST) $(BUILD_DIR_TOOLCHAIN)
-+	rm -rf $(STAGING_DIR_HOST) $(STAGING_DIR_HOSTPKG) $(TOOLCHAIN_DIR) $(BUILD_DIR_BASE)/host $(BUILD_DIR_BASE)/hostpkg $(BUILD_DIR_TOOLCHAIN)
- 	rm -rf $(TMP_DIR)
- 
- ifndef DUMP_TARGET_DB
-diff --git a/include/autotools.mk b/include/autotools.mk
-index c6aa47e0bef311697b4def7a7183d1ac59dcf599..7bd400ab36d052b39fcb76a66873c8673eb189a0 100644
---- a/include/autotools.mk
-+++ b/include/autotools.mk
-@@ -75,7 +75,7 @@ define autoreconf_target
-   $(strip $(call autoreconf, \
-     $(PKG_BUILD_DIR), $(PKG_REMOVE_FILES), \
-     $(PKG_AUTOMAKE_PATHS), $(PKG_LIBTOOL_PATHS), \
--    $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
-+    $(STAGING_DIR)/host/share/aclocal $(STAGING_DIR_HOSTPKG)/share/aclocal $(STAGING_DIR)/usr/share/aclocal $(PKG_MACRO_PATHS)))
- endef
- 
- define patch_libtool_target
-diff --git a/include/cmake.mk b/include/cmake.mk
-index 5a403cbf41e2bbd6bdb843492639a01aff8cf75b..900dae1d4afc6007f8ac04179dd7f0922a07d4fa 100644
---- a/include/cmake.mk
-+++ b/include/cmake.mk
-@@ -34,7 +34,7 @@ CMAKE_NM:=$(call cmake_tool,$(TARGET_NM))
- CMAKE_RANLIB:=$(call cmake_tool,$(TARGET_RANLIB))
- 
- CMAKE_FIND_ROOT_PATH:=$(STAGING_DIR)/usr;$(TOOLCHAIN_DIR)$(if $(CONFIG_EXTERNAL_TOOLCHAIN),;$(CONFIG_TOOLCHAIN_ROOT))
--CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOST)
-+CMAKE_HOST_FIND_ROOT_PATH:=$(STAGING_DIR)/host;$(STAGING_DIR_HOSTPKG);$(STAGING_DIR_HOST)
- CMAKE_SHARED_LDFLAGS:=-Wl,-Bsymbolic-functions
- 
- define Build/Configure/Default
-diff --git a/include/host-build.mk b/include/host-build.mk
-index 5fcec7ebf48361100d29c5925beaae4f36d5ac7b..485f09a6b71b881692b5ee575927397259bbac24 100644
---- a/include/host-build.mk
-+++ b/include/host-build.mk
-@@ -126,7 +126,7 @@ ifneq ($(if $(HOST_QUILT),,$(CONFIG_AUTOREBUILD)),)
- endif
- 
- define Host/Exports/Default
--  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
-+  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR_HOST)/share/aclocal $$(STAGING_DIR_HOST)/share/aclocal-* $(if $(IS_PACKAGE_BUILD),$$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*)),-I $$(p))
-   $(1) : export STAGING_PREFIX=$$(HOST_BUILD_PREFIX)
-   $(1) : export PKG_CONFIG_PATH=$$(STAGING_DIR_HOST)/lib/pkgconfig:$$(HOST_BUILD_PREFIX)/lib/pkgconfig
-   $(1) : export PKG_CONFIG_LIBDIR=$$(HOST_BUILD_PREFIX)/lib/pkgconfig
-diff --git a/include/package.mk b/include/package.mk
-index e9989ab13ec81a8751ee7245639ee0b82b9a87b2..7f77c4e99b1e9b79503963c497c4c87d7af9d71a 100644
---- a/include/package.mk
-+++ b/include/package.mk
-@@ -130,7 +130,7 @@ ifdef USE_SOURCE_DIR
- endif
- 
- define Build/Exports/Default
--  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p))
-+  $(1) : export ACLOCAL_INCLUDE=$$(foreach p,$$(wildcard $$(STAGING_DIR)/usr/share/aclocal $$(STAGING_DIR)/usr/share/aclocal-* $$(STAGING_DIR_HOSTPKG)/share/aclocal $$(STAGING_DIR_HOSTPKG)/share/aclocal-* $$(STAGING_DIR)/host/share/aclocal $$(STAGING_DIR)/host/share/aclocal-*),-I $$(p))
-   $(1) : export STAGING_PREFIX=$$(STAGING_DIR)/usr
-   $(1) : export PATH=$$(TARGET_PATH_PKG)
-   $(1) : export CONFIG_SITE:=$$(CONFIG_SITE)
-diff --git a/rules.mk b/rules.mk
-index 5710a84fe7ad24e45acb2ef62ee29eab37e8de06..b678e9bea5bc146a3c515d93003415cd21882068 100644
---- a/rules.mk
-+++ b/rules.mk
-@@ -147,9 +147,9 @@ STAGING_DIR_ROOT:=$(STAGING_DIR)/root-$(BOARD)
- BUILD_LOG_DIR:=$(TOPDIR)/logs
- PKG_INFO_DIR := $(STAGING_DIR)/pkginfo
- 
--BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR)/host,$(BUILD_DIR_BASE)/host)
-+BUILD_DIR_HOST:=$(if $(IS_PACKAGE_BUILD),$(BUILD_DIR_BASE)/hostpkg,$(BUILD_DIR_BASE)/host)
- STAGING_DIR_HOST:=$(TOPDIR)/staging_dir/host
--STAGING_DIR_HOSTPKG:=$(STAGING_DIR)/host
-+STAGING_DIR_HOSTPKG:=$(TOPDIR)/staging_dir/hostpkg
- 
- TARGET_PATH:=$(subst $(space),:,$(filter-out .,$(filter-out ./,$(subst :,$(space),$(PATH)))))
- TARGET_INIT_PATH:=$(call qstrip,$(CONFIG_TARGET_INIT_PATH))
-@@ -208,7 +208,7 @@ ifndef DUMP
-     endif
-   endif
- endif
--TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(TARGET_PATH)
-+TARGET_PATH_PKG:=$(STAGING_DIR)/host/bin:$(STAGING_DIR_HOSTPKG)/bin:$(TARGET_PATH)
- 
- ifeq ($(CONFIG_SOFT_FLOAT),y)
-   SOFT_FLOAT_CONFIG_OPTION:=--with-float=soft
-@@ -234,9 +234,9 @@ export PKG_CONFIG
- 
- HOSTCC:=gcc
- HOSTCXX:=g++
--HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR)/host/include)
-+HOST_CPPFLAGS:=-I$(STAGING_DIR_HOST)/include -I$(STAGING_DIR_HOST)/usr/include $(if $(IS_PACKAGE_BUILD),-I$(STAGING_DIR_HOSTPKG)/include -I$(STAGING_DIR)/host/include)
- HOST_CFLAGS:=-O2 $(HOST_CPPFLAGS)
--HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR)/host/lib)
-+HOST_LDFLAGS:=-L$(STAGING_DIR_HOST)/lib -L$(STAGING_DIR_HOST)/usr/lib $(if $(IS_PACKAGE_BUILD),-L$(STAGING_DIR_HOSTPKG)/lib -L$(STAGING_DIR)/host/lib)
- 
- ifeq ($(CONFIG_EXTERNAL_TOOLCHAIN),)
-   TARGET_AR:=$(TARGET_CROSS)gcc-ar

patches/lede/0004-hostapd-prevent-channel-switch-for-5GHz.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 27 Jul 2015 20:42:50 +0200
-Subject: hostapd: prevent channel switch for 5GHz
-
-hostapd would switch the primary and secondary channel on 5GHz networks in
-certain circumstances, completely breaking the adhoc interfaces of the WLAN
-adapter (they would lose their configuration).
-
-As a temporary fix, disable this channel switch function.
-
-diff --git a/package/network/services/hostapd/patches/900-no_channel_switch.patch b/package/network/services/hostapd/patches/900-no_channel_switch.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..c6145156928ffa5a5195ca145b0655bb88c92091
---- /dev/null
-+++ b/package/network/services/hostapd/patches/900-no_channel_switch.patch
-@@ -0,0 +1,68 @@
-+--- a/src/common/hw_features_common.c
-++++ b/src/common/hw_features_common.c
-+@@ -171,7 +171,6 @@ int check_40mhz_5g(struct hostapd_hw_mod
-+ 		   struct wpa_scan_results *scan_res, int pri_chan,
-+ 		   int sec_chan)
-+ {
-+-	int pri_freq, sec_freq, pri_bss, sec_bss;
-+ 	int bss_pri_chan, bss_sec_chan;
-+ 	size_t i;
-+ 	int match;
-+@@ -180,57 +179,6 @@ int check_40mhz_5g(struct hostapd_hw_mod
-+ 	    pri_chan == sec_chan)
-+ 		return 0;
-+ 
-+-	pri_freq = hw_get_freq(mode, pri_chan);
-+-	sec_freq = hw_get_freq(mode, sec_chan);
-+-
-+-	/*
-+-	 * Switch PRI/SEC channels if Beacons were detected on selected SEC
-+-	 * channel, but not on selected PRI channel.
-+-	 */
-+-	pri_bss = sec_bss = 0;
-+-	for (i = 0; i < scan_res->num; i++) {
-+-		struct wpa_scan_res *bss = scan_res->res[i];
-+-		if (bss->freq == pri_freq)
-+-			pri_bss++;
-+-		else if (bss->freq == sec_freq)
-+-			sec_bss++;
-+-	}
-+-	if (sec_bss && !pri_bss) {
-+-		wpa_printf(MSG_INFO,
-+-			   "Switch own primary and secondary channel to get secondary channel with no Beacons from other BSSes");
-+-		return 2;
-+-	}
-+-
-+-	/*
-+-	 * Match PRI/SEC channel with any existing HT40 BSS on the same
-+-	 * channels that we are about to use (if already mixed order in
-+-	 * existing BSSes, use own preference).
-+-	 */
-+-	match = 0;
-+-	for (i = 0; i < scan_res->num; i++) {
-+-		struct wpa_scan_res *bss = scan_res->res[i];
-+-		get_pri_sec_chan(bss, &bss_pri_chan, &bss_sec_chan);
-+-		if (pri_chan == bss_pri_chan &&
-+-		    sec_chan == bss_sec_chan) {
-+-			match = 1;
-+-			break;
-+-		}
-+-	}
-+-	if (!match) {
-+-		for (i = 0; i < scan_res->num; i++) {
-+-			struct wpa_scan_res *bss = scan_res->res[i];
-+-			get_pri_sec_chan(bss, &bss_pri_chan, &bss_sec_chan);
-+-			if (pri_chan == bss_sec_chan &&
-+-			    sec_chan == bss_pri_chan) {
-+-				wpa_printf(MSG_INFO, "Switch own primary and "
-+-					   "secondary channel due to BSS "
-+-					   "overlap with " MACSTR,
-+-					   MAC2STR(bss->bssid));
-+-				return 2;
-+-			}
-+-		}
-+-	}
-+-
-+ 	return 1;
-+ }
-+ 

patches/lede/0005-libjson-c-Add-support-for-custom-format-strings-for-doubles.patch

-From: Jan-Philipp Litza <janphilipp@litza.de>
-Date: Fri, 6 May 2016 16:44:29 +0200
-Subject: libjson-c: Add support for custom format strings for doubles
-
-diff --git a/package/libs/libjson-c/patches/002-custom-format-string.patch b/package/libs/libjson-c/patches/002-custom-format-string.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..2f454c560ff78c1edd4654b9651f0e6299bd5e6f
---- /dev/null
-+++ b/package/libs/libjson-c/patches/002-custom-format-string.patch
-@@ -0,0 +1,98 @@
-+From 21dc5dc92bd56f5f4dc2c90b9ea6bf1e1407714e Mon Sep 17 00:00:00 2001
-+From: Jan-Philipp Litza <janphilipp@litza.de>
-+Date: Fri, 6 May 2016 16:12:44 +0200
-+Subject: [PATCH] Export json_object_double_to_json_string() and use custom
-+ format string
-+BCC: janphilipp@litza.de
-+
-+---
-+ json_object.c | 12 ++++++------
-+ json_object.h | 28 ++++++++++++++++++++++++++++
-+ 2 files changed, 34 insertions(+), 6 deletions(-)
-+
-+diff --git a/json_object.c b/json_object.c
-+index 7d60884..46701e7 100644
-+--- a/json_object.c
-++++ b/json_object.c
-+@@ -55,7 +55,6 @@ static struct json_object* json_object_new(enum json_type o_type);
-+ static json_object_to_json_string_fn json_object_object_to_json_string;
-+ static json_object_to_json_string_fn json_object_boolean_to_json_string;
-+ static json_object_to_json_string_fn json_object_int_to_json_string;
-+-static json_object_to_json_string_fn json_object_double_to_json_string;
-+ static json_object_to_json_string_fn json_object_string_to_json_string;
-+ static json_object_to_json_string_fn json_object_array_to_json_string;
-+ 
-+@@ -644,10 +643,10 @@ int64_t json_object_get_int64(const struct json_object *jso)
-+ 
-+ /* json_object_double */
-+ 
-+-static int json_object_double_to_json_string(struct json_object* jso,
-+-					     struct printbuf *pb,
-+-					     int level,
-+-						 int flags)
-++int json_object_double_to_json_string(struct json_object* jso,
-++				      struct printbuf *pb,
-++				      int level,
-++				      int flags)
-+ {
-+   char buf[128], *p, *q;
-+   int size;
-+@@ -663,7 +662,8 @@ static int json_object_double_to_json_string(struct json_object* jso,
-+     else
-+       size = snprintf(buf, sizeof(buf), "-Infinity");
-+   else
-+-    size = snprintf(buf, sizeof(buf), "%.17g", jso->o.c_double);
-++    size = snprintf(buf, sizeof(buf),
-++        jso->_userdata ? (const char*) jso->_userdata : "%.17g", jso->o.c_double);
-+ 
-+   p = strchr(buf, ',');
-+   if (p) {
-+diff --git a/json_object.h b/json_object.h
-+index 2bce454..a89de44 100644
-+--- a/json_object.h
-++++ b/json_object.h
-+@@ -614,6 +614,9 @@ extern int64_t json_object_get_int64(const struct json_object *obj);
-+ /* double type methods */
-+ 
-+ /** Create a new empty json_object of type json_type_double
-++ *
-++ * @see json_object_double_to_json_string() for how to set a custom format string.
-++ *
-+  * @param d the double
-+  * @returns a json_object of type json_type_double
-+  */
-+@@ -642,6 +645,31 @@ extern struct json_object* json_object_new_double(double d);
-+  */
-+ extern struct json_object* json_object_new_double_s(double d, const char *ds);
-+ 
-++
-++/** Serialize a json_object of type json_type_double to a string.
-++ *
-++ * This function isn't meant to be called directly. Instead, you can set a
-++ * custom format string for the serialization of this double using the
-++ * following call (where "%.17g" actually is the default):
-++ *
-++ * @code
-++ *   jso = json_object_new_double(d);
-++ *   json_object_set_serializer(jso, json_object_double_to_json_string,
-++ *       "%.17g", NULL);
-++ * @endcode
-++ *
-++ * @see printf(3) man page for format strings
-++ *
-++ * @param jso The json_type_double object that is serialized.
-++ * @param pb The destination buffer.
-++ * @param level Ignored.
-++ * @param flags Ignored.
-++ */
-++extern int json_object_double_to_json_string(struct json_object* jso,
-++					     struct printbuf *pb,
-++					     int level,
-++					     int flags);
-++
-+ /** Get the double floating point value of a json_object
-+  *
-+  * The type is coerced to a double if the passed object is not a double.
-+-- 
-+2.7.4
-+

patches/lede/0007-rules.mk-export-STAGING_DIR_HOSTPKG.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 19 Jan 2017 00:03:32 +0100
-Subject: rules.mk: export STAGING_DIR_HOSTPKG
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/rules.mk b/rules.mk
-index b678e9bea5bc146a3c515d93003415cd21882068..16cab67d5d1b8b130a0ffddc81789e798cda338e 100644
---- a/rules.mk
-+++ b/rules.mk
-@@ -225,7 +225,7 @@ else
- endif
- 
- export PATH:=$(TARGET_PATH)
--export STAGING_DIR STAGING_DIR_HOST
-+export STAGING_DIR STAGING_DIR_HOST STAGING_DIR_HOSTPKG
- export SH_FUNC:=. $(INCLUDE_DIR)/shell.sh;
- 
- PKG_CONFIG:=$(STAGING_DIR_HOST)/bin/pkg-config

patches/lede/0008-gettext-full-fix-to-use-STAGING_DIR_HOSTPKG-instead-of-STAGING_DIR-host.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 19 Jan 2017 00:04:09 +0100
-Subject: gettext-full: fix to use $STAGING_DIR_HOSTPKG instead of $STAGING_DIR/host
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/libs/gettext-full/patches/000-relocatable.patch b/package/libs/gettext-full/patches/000-relocatable.patch
-index c14be728367b57c08024d848cf8ff847cfe865be..a95c268f5bc94ed8ec3784ae2044aa77e0322491 100644
---- a/package/libs/gettext-full/patches/000-relocatable.patch
-+++ b/package/libs/gettext-full/patches/000-relocatable.patch
-@@ -5,8 +5,8 @@
-  # Set variables
-  # - gettext_datadir     directory where the data files are stored.
- -prefix="@prefix@"
--+if [ -n "$STAGING_DIR" ]; then
--+	prefix="$STAGING_DIR/host"
-++if [ -n "$STAGING_DIR_HOSTPKG" ]; then
-++	prefix="$STAGING_DIR_HOSTPKG"
- +else
- +	prefix="@prefix@"
- +fi
-@@ -20,8 +20,8 @@
-  # Set variables
-  # - gettext_datadir     directory where the data files are stored.
- -prefix="@prefix@"
--+if [ -n "$STAGING_DIR" ]; then
--+	prefix="$STAGING_DIR/host"
-++if [ -n "$STAGING_DIR_HOSTPKG" ]; then
-++	prefix="$STAGING_DIR_HOSTPKG"
- +else
- +	prefix="@prefix@"
- +fi

patches/lede/0009-netifd-update-to-git-HEAD-version.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 10 Mar 2017 01:58:42 +0100
-Subject: netifd: update to git HEAD version
-
-91810ec system-linux: add VXLAN support
-f107656 netifd: Add option to configure locktime for each device
-cdc0e80 interface: add prefix assignment priority support
-6397f5e device: add veth support
-6228d0f wireless: fix _wireless_add_process
-7cc2f10 treewide: fix white space errors
-
-diff --git a/package/network/config/netifd/Makefile b/package/network/config/netifd/Makefile
-index fb035864017df739a0d0b0c0451fe8488a40c77c..d6d91ba014c67f126176eba8acae5fd2c8b007ba 100644
---- a/package/network/config/netifd/Makefile
-+++ b/package/network/config/netifd/Makefile
-@@ -5,9 +5,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/netifd.git
--PKG_SOURCE_DATE:=2017-01-25
--PKG_SOURCE_VERSION:=650758b16e5185505a3fbc1307949340af70b611
--PKG_MIRROR_HASH:=d09c740bc1bf6269678bd75c9af52ecd4be3d1d59402a543ceb9d4459cecfa2b
-+PKG_SOURCE_DATE:=2017-03-07
-+PKG_SOURCE_VERSION:=91810ecc13239f3b18c8299de265b4f3531c0017
-+PKG_MIRROR_HASH:=51d0a8866c6b004185f1fb83f37e7aed33fc94b72bd85954c773549a57c3c761
- PKG_MAINTAINER:=Felix Fietkau <nbd@nbd.name>
- 
- PKG_LICENSE:=GPL-2.0

patches/lede/0010-netifd-ubus-add-interface-method-to-trigger-renew-event.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 12 Apr 2017 02:31:12 +0200
-Subject: netifd: ubus: add interface method to trigger renew event
-
-diff --git a/package/network/config/netifd/patches/0001-ubus-add-interface-method-to-trigger-renew-event.patch b/package/network/config/netifd/patches/0001-ubus-add-interface-method-to-trigger-renew-event.patch
-new file mode 100644
-index 0000000000000000000000000000000000000000..1f59498d421b7e1d3e76a1a38f604181d11c4649
---- /dev/null
-+++ b/package/network/config/netifd/patches/0001-ubus-add-interface-method-to-trigger-renew-event.patch
-@@ -0,0 +1,73 @@
-+From 8b39c2fce4c1da3f3dcd4c6fd305c124714839e8 Mon Sep 17 00:00:00 2001
-+Message-Id: <8b39c2fce4c1da3f3dcd4c6fd305c124714839e8.1491956920.git.mschiffer@universe-factory.net>
-+From: Matthias Schiffer <mschiffer@universe-factory.net>
-+Date: Wed, 12 Apr 2017 02:25:33 +0200
-+Subject: [PATCH] ubus: add interface method to trigger renew event
-+
-+proto-shell handlers may implement all kinds of renew handlers, there
-+should be a way to explicitly trigger such a renew.
-+
-+Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-+---
-+ interface.c |  8 ++++++++
-+ interface.h |  1 +
-+ ubus.c      | 14 ++++++++++++++
-+ 3 files changed, 23 insertions(+)
-+
-+--- a/interface.c
-++++ b/interface.c
-+@@ -1076,6 +1076,14 @@ interface_set_down(struct interface *ifa
-+ 	return 0;
-+ }
-+ 
-++int interface_renew(struct interface *iface)
-++{
-++	if (iface->state == IFS_TEARDOWN || iface->state == IFS_DOWN)
-++		return -1;
-++
-++	return interface_proto_event(iface->proto, PROTO_CMD_RENEW, false);
-++}
-++
-+ void
-+ interface_start_pending(void)
-+ {
-+--- a/interface.h
-++++ b/interface.h
-+@@ -184,6 +184,7 @@ void interface_set_available(struct inte
-+ int interface_set_up(struct interface *iface);
-+ int interface_set_down(struct interface *iface);
-+ void __interface_set_down(struct interface *iface, bool force);
-++int interface_renew(struct interface *iface);
-+ 
-+ void interface_set_main_dev(struct interface *iface, struct device *dev);
-+ void interface_set_l3_dev(struct interface *iface, struct device *dev);
-+--- a/ubus.c
-++++ b/ubus.c
-+@@ -376,6 +376,19 @@ netifd_handle_down(struct ubus_context *
-+ 	return 0;
-+ }
-+ 
-++static int
-++netifd_handle_renew(struct ubus_context *ctx, struct ubus_object *obj,
-++		   struct ubus_request_data *req, const char *method,
-++		   struct blob_attr *msg)
-++{
-++	struct interface *iface;
-++
-++	iface = container_of(obj, struct interface, ubus);
-++	interface_renew(iface);
-++
-++	return 0;
-++}
-++
-+ static void
-+ netifd_add_interface_errors(struct blob_buf *b, struct interface *iface)
-+ {
-+@@ -912,6 +925,7 @@ netifd_handle_set_data(struct ubus_conte
-+ static struct ubus_method iface_object_methods[] = {
-+ 	{ .name = "up", .handler = netifd_handle_up },
-+ 	{ .name = "down", .handler = netifd_handle_down },
-++	{ .name = "renew", .handler = netifd_handle_renew },
-+ 	{ .name = "status", .handler = netifd_handle_status },
-+ 	{ .name = "prepare", .handler = netifd_handle_iface_prepare },
-+ 	{ .name = "dump", .handler = netifd_handle_dump },

patches/lede/0011-procd-switch-to-latest-master.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Thu, 13 Jul 2017 17:15:21 +0200
-Subject: procd: switch to latest master
-
-diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index b905cb25aa02c4c3f82cbc288ef15648dfd66444..5b92d79332f2ea400041586b92b570d8b633218a 100644
---- a/package/system/procd/Makefile
-+++ b/package/system/procd/Makefile
-@@ -12,9 +12,9 @@ PKG_RELEASE:=1
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/procd.git
--PKG_SOURCE_DATE:=2018-01-22
--PKG_SOURCE_VERSION:=9a4036fb1b7412ab2ea4f360d2cc7e6a5e0fa6b5
--PKG_MIRROR_HASH:=669f062e9c5228ef9d09cc9904d8ce4651f0b8506a6c2fff27b21e83b26f0abb
-+PKG_SOURCE_DATE:=2018-01-23
-+PKG_SOURCE_VERSION:=653629f19e591a0827ab39de07b4526bb119a57a
-+PKG_MIRROR_HASH:=2e0c3ae45521eea456a8411c8d9ef19ed9a5ed6c0ab38b9496555625fb4ba6a2
- CMAKE_INSTALL:=1
- 
- PKG_LICENSE:=GPL-2.0

patches/lede/0012-procd-clean-up-trailing-whitespace-in-nand.sh.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:27:40 +0200
-Subject: procd: clean up trailing whitespace in nand.sh
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
-index ebaaf2aa16009cc1431dbb79ba9f689c8b636069..8a164ee08537014936a8608f5a60fe0e27dcabd6 100644
---- a/package/system/procd/files/nand.sh
-+++ b/package/system/procd/files/nand.sh
-@@ -194,7 +194,7 @@ nand_upgrade_prepare_ubi() {
- 
- nand_do_upgrade_success() {
- 	local conf_tar="/tmp/sysupgrade.tgz"
--	
-+
- 	sync
- 	[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
- 	echo "sysupgrade successful"
-@@ -231,7 +231,7 @@ nand_upgrade_ubifs() {
- 	local rootfs_length=`(cat $1 | wc -c) 2> /dev/null`
- 
- 	nand_upgrade_prepare_ubi "$rootfs_length" "ubifs" "0" "0"
--	
-+
- 	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
- 	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
- 	ubiupdatevol /dev/$root_ubivol -s $rootfs_length $1

patches/lede/0013-procd-prepare-NAND-sysupgrade-for-making-upgraded-dynamically-linked.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:28:05 +0200
-Subject: procd: prepare NAND sysupgrade for making upgraded dynamically linked
-
-Use install_bin to copy upgraded with all dependencies. The old name
-/tmp/upgraded is temporarily retained as a symlink to avoid breaking
-things.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
-index 8a164ee08537014936a8608f5a60fe0e27dcabd6..6bd2005344c081df20e5a330a69e49e37225c39f 100644
---- a/package/system/procd/files/nand.sh
-+++ b/package/system/procd/files/nand.sh
-@@ -333,7 +333,7 @@ nand_upgrade_stage1() {
- 		[ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] &&
- 			rm $CONF_TAR
- 
--		ubus call system nandupgrade "{\"path\": \"$path\" }"
-+		ubus call system nandupgrade "{\"prefix\": \"$RAM_ROOT\", \"path\": \"$path\" }"
- 		exit 0
- 	}
- }
-@@ -370,6 +370,7 @@ nand_do_platform_check() {
- # $(1): file to be used for upgrade
- nand_do_upgrade() {
- 	echo -n $1 > /tmp/sysupgrade-nand-path
--	cp /sbin/upgraded /tmp/
-+	install_bin /sbin/upgraded
-+	ln -s "$RAM_ROOT"/sbin/upgraded /tmp/upgraded
- 	nand_upgrade_stage1
- }

patches/lede/0014-procd-remove-procd-nand-package.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Fri, 21 Apr 2017 20:37:58 +0200
-Subject: procd: remove procd-nand package
-
-We always want to support staged upgrades now, so it's better to include
-upgraded into the main package. /lib/upgrade/nand.sh is moved to
-base-files.
-
-The procd-nand-firstboot package is removed for now, it may return later
-as a separate package.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/Makefile b/package/base-files/Makefile
-index 4fbc9a265b535d850fe812085677b3f6aabf4e1f..c971de4deee7cd331ddcad6b87eb9fefd7af6a64 100644
---- a/package/base-files/Makefile
-+++ b/package/base-files/Makefile
-@@ -19,7 +19,9 @@ PKG_BUILD_DEPENDS:=usign/host
- PKG_LICENSE:=GPL-2.0
- 
- # Extend depends from version.mk
--PKG_CONFIG_DEPENDS += CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE
-+PKG_CONFIG_DEPENDS += \
-+	CONFIG_SIGNED_PACKAGES CONFIG_TARGET_INIT_PATH CONFIG_TARGET_PREINIT_DISABLE_FAILSAFE \
-+	CONFIG_NAND_SUPPORT
- 
- include $(INCLUDE_DIR)/package.mk
- 
-@@ -31,7 +33,7 @@ endif
- define Package/base-files
-   SECTION:=base
-   CATEGORY:=Base system
--  DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +fstools +fwtool
-+  DEPENDS:=+netifd +libc +procd +jsonfilter +SIGNED_PACKAGES:usign +SIGNED_PACKAGES:lede-keyring +NAND_SUPPORT:ubi-utils +fstools +fwtool
-   TITLE:=Base filesystem for Lede
-   URL:=http://openwrt.org/
-   VERSION:=$(PKG_RELEASE)-$(REVISION)
-@@ -107,9 +109,16 @@ ifdef CONFIG_SIGNED_PACKAGES
-   endef
- endif
- 
-+ifeq ($(CONFIG_NAND_SUPPORT),)
-+  define Package/base-files/nand-support
-+	rm -f $(1)/lib/upgrade/nand.sh
-+  endef
-+endif
-+
- define Package/base-files/install
- 	$(CP) ./files/* $(1)/
- 	$(Package/base-files/install-key)
-+	$(Package/base-files/nand-support)
- 	if [ -d $(GENERIC_PLATFORM_DIR)/base-files/. ]; then \
- 		$(CP) $(GENERIC_PLATFORM_DIR)/base-files/* $(1)/; \
- 	fi
-diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
-new file mode 100644
-index 0000000000000000000000000000000000000000..6bd2005344c081df20e5a330a69e49e37225c39f
---- /dev/null
-+++ b/package/base-files/files/lib/upgrade/nand.sh
-@@ -0,0 +1,376 @@
-+#!/bin/sh
-+# Copyright (C) 2014 OpenWrt.org
-+#
-+
-+. /lib/functions.sh
-+
-+# 'kernel' partition on NAND contains the kernel
-+CI_KERNPART="kernel"
-+
-+# 'ubi' partition on NAND contains UBI
-+CI_UBIPART="ubi"
-+
-+ubi_mknod() {
-+	local dir="$1"
-+	local dev="/dev/$(basename $dir)"
-+
-+	[ -e "$dev" ] && return 0
-+
-+	local devid="$(cat $dir/dev)"
-+	local major="${devid%%:*}"
-+	local minor="${devid##*:}"
-+	mknod "$dev" c $major $minor
-+}
-+
-+nand_find_volume() {
-+	local ubidevdir ubivoldir
-+	ubidevdir="/sys/devices/virtual/ubi/$1"
-+	[ ! -d "$ubidevdir" ] && return 1
-+	for ubivoldir in $ubidevdir/${1}_*; do
-+		[ ! -d "$ubivoldir" ] && continue
-+		if [ "$( cat $ubivoldir/name )" = "$2" ]; then
-+			basename $ubivoldir
-+			ubi_mknod "$ubivoldir"
-+			return 0
-+		fi
-+	done
-+}
-+
-+nand_find_ubi() {
-+	local ubidevdir ubidev mtdnum
-+	mtdnum="$( find_mtd_index $1 )"
-+	[ ! "$mtdnum" ] && return 1
-+	for ubidevdir in /sys/devices/virtual/ubi/ubi*; do
-+		[ ! -d "$ubidevdir" ] && continue
-+		cmtdnum="$( cat $ubidevdir/mtd_num )"
-+		[ ! "$mtdnum" ] && continue
-+		if [ "$mtdnum" = "$cmtdnum" ]; then
-+			ubidev=$( basename $ubidevdir )
-+			ubi_mknod "$ubidevdir"
-+			echo $ubidev
-+			return 0
-+		fi
-+	done
-+}
-+
-+nand_get_magic_long() {
-+	dd if="$1" skip=$2 bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
-+}
-+
-+get_magic_long_tar() {
-+	( tar xf $1 $2 -O | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
-+}
-+
-+identify_magic() {
-+	local magic=$1
-+	case "$magic" in
-+		"55424923")
-+			echo "ubi"
-+			;;
-+		"31181006")
-+			echo "ubifs"
-+			;;
-+		"68737173")
-+			echo "squashfs"
-+			;;
-+		"d00dfeed")
-+			echo "fit"
-+			;;
-+		"4349"*)
-+			echo "combined"
-+			;;
-+		*)
-+			echo "unknown $magic"
-+			;;
-+	esac
-+}
-+
-+
-+identify() {
-+	identify_magic $(nand_get_magic_long "$1" "${2:-0}")
-+}
-+
-+identify_tar() {
-+	identify_magic $(get_magic_long_tar "$1" "$2")
-+}
-+
-+nand_restore_config() {
-+	sync
-+	local ubidev=$( nand_find_ubi $CI_UBIPART )
-+	local ubivol="$( nand_find_volume $ubidev rootfs_data )"
-+	[ ! "$ubivol" ] &&
-+		ubivol="$( nand_find_volume $ubidev rootfs )"
-+	mkdir /tmp/new_root
-+	if ! mount -t ubifs /dev/$ubivol /tmp/new_root; then
-+		echo "mounting ubifs $ubivol failed"
-+		rmdir /tmp/new_root
-+		return 1
-+	fi
-+	mv "$1" "/tmp/new_root/sysupgrade.tgz"
-+	umount /tmp/new_root
-+	sync
-+	rmdir /tmp/new_root
-+}
-+
-+nand_upgrade_prepare_ubi() {
-+	local rootfs_length="$1"
-+	local rootfs_type="$2"
-+	local has_kernel="${3:-0}"
-+	local has_env="${4:-0}"
-+
-+	local mtdnum="$( find_mtd_index "$CI_UBIPART" )"
-+	if [ ! "$mtdnum" ]; then
-+		echo "cannot find ubi mtd partition $CI_UBIPART"
-+		return 1
-+	fi
-+
-+	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
-+	if [ ! "$ubidev" ]; then
-+		ubiattach -m "$mtdnum"
-+		sync
-+		ubidev="$( nand_find_ubi "$CI_UBIPART" )"
-+	fi
-+
-+	if [ ! "$ubidev" ]; then
-+		ubiformat /dev/mtd$mtdnum -y
-+		ubiattach -m "$mtdnum"
-+		sync
-+		ubidev="$( nand_find_ubi "$CI_UBIPART" )"
-+		[ "$has_env" -gt 0 ] && {
-+			ubimkvol /dev/$ubidev -n 0 -N ubootenv -s 1MiB
-+			ubimkvol /dev/$ubidev -n 1 -N ubootenv2 -s 1MiB
-+		}
-+	fi
-+
-+	local kern_ubivol="$( nand_find_volume $ubidev kernel )"
-+	local root_ubivol="$( nand_find_volume $ubidev rootfs )"
-+	local data_ubivol="$( nand_find_volume $ubidev rootfs_data )"
-+
-+	# remove ubiblock device of rootfs
-+	local root_ubiblk="ubiblock${root_ubivol:3}"
-+	if [ "$root_ubivol" -a -e "/dev/$root_ubiblk" ]; then
-+		echo "removing $root_ubiblk"
-+		if ! ubiblock -r /dev/$root_ubivol; then
-+			echo "cannot remove $root_ubiblk"
-+			return 1;
-+		fi
-+	fi
-+
-+	# kill volumes
-+	[ "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N kernel || true
-+	[ "$root_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs || true
-+	[ "$data_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs_data || true
-+
-+	# update kernel
-+	if [ "$has_kernel" = "1" ]; then
-+		if ! ubimkvol /dev/$ubidev -N kernel -s $kernel_length; then
-+			echo "cannot create kernel volume"
-+			return 1;
-+		fi
-+	fi
-+
-+	# update rootfs
-+	local root_size_param
-+	if [ "$rootfs_type" = "ubifs" ]; then
-+		root_size_param="-m"
-+	else
-+		root_size_param="-s $rootfs_length"
-+	fi
-+	if ! ubimkvol /dev/$ubidev -N rootfs $root_size_param; then
-+		echo "cannot create rootfs volume"
-+		return 1;
-+	fi
-+
-+	# create rootfs_data for non-ubifs rootfs
-+	if [ "$rootfs_type" != "ubifs" ]; then
-+		if ! ubimkvol /dev/$ubidev -N rootfs_data -m; then
-+			echo "cannot initialize rootfs_data volume"
-+			return 1
-+		fi
-+	fi
-+	sync
-+	return 0
-+}
-+
-+nand_do_upgrade_success() {
-+	local conf_tar="/tmp/sysupgrade.tgz"
-+
-+	sync
-+	[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
-+	echo "sysupgrade successful"
-+	umount -a
-+	reboot -f
-+}
-+
-+# Flash the UBI image to MTD partition
-+nand_upgrade_ubinized() {
-+	local ubi_file="$1"
-+	local mtdnum="$(find_mtd_index "$CI_UBIPART")"
-+
-+	[ ! "$mtdnum" ] && {
-+		CI_UBIPART="rootfs"
-+		mtdnum="$(find_mtd_index "$CI_UBIPART")"
-+	}
-+
-+	if [ ! "$mtdnum" ]; then
-+		echo "cannot find mtd device $CI_UBIPART"
-+		umount -a
-+		reboot -f
-+	fi
-+
-+	local mtddev="/dev/mtd${mtdnum}"
-+	ubidetach -p "${mtddev}" || true
-+	sync
-+	ubiformat "${mtddev}" -y -f "${ubi_file}"
-+	ubiattach -p "${mtddev}"
-+	nand_do_upgrade_success
-+}
-+
-+# Write the UBIFS image to UBI volume
-+nand_upgrade_ubifs() {
-+	local rootfs_length=`(cat $1 | wc -c) 2> /dev/null`
-+
-+	nand_upgrade_prepare_ubi "$rootfs_length" "ubifs" "0" "0"
-+
-+	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
-+	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
-+	ubiupdatevol /dev/$root_ubivol -s $rootfs_length $1
-+
-+	nand_do_upgrade_success
-+}
-+
-+nand_board_name() {
-+	if type 'platform_nand_board_name' >/dev/null 2>/dev/null; then
-+		platform_nand_board_name
-+		return
-+	fi
-+
-+	cat /tmp/sysinfo/board_name
-+}
-+
-+nand_upgrade_tar() {
-+	local tar_file="$1"
-+	local board_name="$(nand_board_name)"
-+	local kernel_mtd="$(find_mtd_index $CI_KERNPART)"
-+
-+	local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null`
-+	local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null`
-+
-+	local rootfs_type="$(identify_tar "$tar_file" sysupgrade-$board_name/root)"
-+
-+	local has_kernel=1
-+	local has_env=0
-+
-+	[ "$kernel_length" != 0 -a -n "$kernel_mtd" ] && {
-+		tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - $CI_KERNPART
-+	}
-+	[ "$kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
-+
-+	nand_upgrade_prepare_ubi "$rootfs_length" "$rootfs_type" "$has_kernel" "$has_env"
-+
-+	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
-+	[ "$has_kernel" = "1" ] && {
-+		local kern_ubivol="$(nand_find_volume $ubidev kernel)"
-+	 	tar xf $tar_file sysupgrade-$board_name/kernel -O | \
-+			ubiupdatevol /dev/$kern_ubivol -s $kernel_length -
-+	}
-+
-+	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
-+	tar xf $tar_file sysupgrade-$board_name/root -O | \
-+		ubiupdatevol /dev/$root_ubivol -s $rootfs_length -
-+
-+	nand_do_upgrade_success
-+}
-+
-+# Recognize type of passed file and start the upgrade process
-+nand_do_upgrade_stage2() {
-+	local file_type=$(identify $1)
-+
-+	if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then
-+		platform_nand_pre_upgrade "$1"
-+	fi
-+
-+	[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
-+
-+	case "$file_type" in
-+		"ubi")		nand_upgrade_ubinized $1;;
-+		"ubifs")	nand_upgrade_ubifs $1;;
-+		*)		nand_upgrade_tar $1;;
-+	esac
-+}
-+
-+nand_upgrade_stage2() {
-+	[ $1 = "nand" ] && {
-+		[ -f "$2" ] && {
-+			touch /tmp/sysupgrade
-+
-+			killall -9 telnetd
-+			killall -9 dropbear
-+			killall -9 ash
-+
-+			kill_remaining TERM
-+			sleep 3
-+			kill_remaining KILL
-+
-+			sleep 1
-+
-+			if [ -n "$(rootfs_type)" ]; then
-+				v "Switching to ramdisk..."
-+				run_ramfs ". /lib/functions.sh; include /lib/upgrade; nand_do_upgrade_stage2 $2"
-+			else
-+				nand_do_upgrade_stage2 $2
-+			fi
-+			return 0
-+		}
-+		echo "Nand upgrade failed"
-+		exit 1
-+	}
-+}
-+
-+nand_upgrade_stage1() {
-+	[ -f /tmp/sysupgrade-nand-path ] && {
-+		path="$(cat /tmp/sysupgrade-nand-path)"
-+		[ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] &&
-+			rm $CONF_TAR
-+
-+		ubus call system nandupgrade "{\"prefix\": \"$RAM_ROOT\", \"path\": \"$path\" }"
-+		exit 0
-+	}
-+}
-+
-+# Check if passed file is a valid one for NAND sysupgrade. Currently it accepts
-+# 3 types of files:
-+# 1) UBI - should contain an ubinized image, header is checked for the proper
-+#    MAGIC
-+# 2) UBIFS - should contain UBIFS partition that will replace "rootfs" volume,
-+#    header is checked for the proper MAGIC
-+# 3) TAR - archive has to include "sysupgrade-BOARD" directory with a non-empty
-+#    "CONTROL" file (at this point its content isn't verified)
-+#
-+# You usually want to call this function in platform_check_image.
-+#
-+# $(1): board name, used in case of passing TAR file
-+# $(2): file to be checked
-+nand_do_platform_check() {
-+	local board_name="$1"
-+	local tar_file="$2"
-+	local control_length=`(tar xf $tar_file sysupgrade-$board_name/CONTROL -O | wc -c) 2> /dev/null`
-+	local file_type="$(identify $2)"
-+
-+	[ "$control_length" = 0 -a "$file_type" != "ubi" -a "$file_type" != "ubifs" ] && {
-+		echo "Invalid sysupgrade file."
-+		return 1
-+	}
-+
-+	return 0
-+}
-+
-+# Start NAND upgrade process
-+#
-+# $(1): file to be used for upgrade
-+nand_do_upgrade() {
-+	echo -n $1 > /tmp/sysupgrade-nand-path
-+	install_bin /sbin/upgraded
-+	ln -s "$RAM_ROOT"/sbin/upgraded /tmp/upgraded
-+	nand_upgrade_stage1
-+}
-diff --git a/package/system/procd/Makefile b/package/system/procd/Makefile
-index 5b92d79332f2ea400041586b92b570d8b633218a..879f03f54b23603a360499078d7d53503875f55a 100644
---- a/package/system/procd/Makefile
-+++ b/package/system/procd/Makefile
-@@ -22,11 +22,9 @@ PKG_LICENSE_FILES:=
- 
- PKG_MAINTAINER:=John Crispin <john@phrozen.org>
- 
--PKG_FLAGS:=nonshared
--
- PKG_CONFIG_DEPENDS:= \
- 	CONFIG_TARGET_INIT_PATH CONFIG_KERNEL_SECCOMP \
--	CONFIG_NAND_SUPPORT CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \
-+	CONFIG_PROCD_SHOW_BOOT CONFIG_PROCD_ZRAM_TMPFS \
- 	CONFIG_KERNEL_NAMESPACES CONFIG_PACKAGE_procd-ujail CONFIG_PACKAGE_procd-seccomp
- 
- include $(INCLUDE_DIR)/package.mk
-@@ -42,7 +40,7 @@ TARGET_LDFLAGS += $(if $(CONFIG_USE_GLIBC),-lrt)
- define Package/procd
-   SECTION:=base
-   CATEGORY:=Base system
--  DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox +libubus +NAND_SUPPORT:procd-nand
-+  DEPENDS:=+ubusd +ubus +libjson-script +ubox +USE_GLIBC:librt +libubox +libubus
-   TITLE:=OpenWrt system process manager
- endef
- 
-@@ -60,20 +58,6 @@ define Package/procd-seccomp
-   TITLE:=OpenWrt process seccomp helper + utrace
- endef
- 
--define Package/procd-nand
--  SECTION:=utils
--  CATEGORY:=Utilities
--  DEPENDS:=@NAND_SUPPORT +ubi-utils
--  TITLE:=OpenWrt sysupgrade nand helper
--endef
--
--define Package/procd-nand-firstboot
--  SECTION:=utils
--  CATEGORY:=Utilities
--  DEPENDS:=procd-nand
--  TITLE:=OpenWrt firstboot nand helper
--endef
--
- define Package/procd/config
- menu "Configuration"
- 	depends on PACKAGE_procd
-@@ -91,10 +75,6 @@ endmenu
- endef
- 
- 
--ifeq ($(CONFIG_NAND_SUPPORT),y)
--  CMAKE_OPTIONS += -DBUILD_UPGRADED=1
--endif
--
- ifeq ($(CONFIG_PROCD_SHOW_BOOT),y)
-   CMAKE_OPTIONS += -DSHOW_BOOT_ON_CONSOLE=1
- endif
-@@ -113,7 +93,7 @@ CMAKE_OPTIONS += -DSECCOMP_SUPPORT=$(SECCOMP) -DUTRACE_SUPPORT=$(SECCOMP)
- define Package/procd/install
- 	$(INSTALL_DIR) $(1)/sbin $(1)/etc $(1)/lib/functions
- 
--	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{init,procd,askfirst,udevtrigger} $(1)/sbin/
-+	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{init,procd,askfirst,udevtrigger,upgraded} $(1)/sbin/
- 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libsetlbf.so $(1)/lib
- 	$(INSTALL_BIN) ./files/reload_config $(1)/sbin/
- 	$(INSTALL_DATA) ./files/hotplug*.json $(1)/etc/
-@@ -133,21 +113,6 @@ define Package/procd-seccomp/install
- 	$(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libpreload-trace.so $(1)/lib
- endef
- 
--define Package/procd-nand/install
--	$(INSTALL_DIR) $(1)/sbin $(1)/lib/upgrade
--
--	$(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/upgraded $(1)/sbin/
--	$(INSTALL_DATA) ./files/nand.sh $(1)/lib/upgrade/
--endef
--
--define Package/procd-nand-firstboot/install
--	$(INSTALL_DIR) $(1)/lib/preinit
--
--	$(INSTALL_DATA) ./files/nand-preinit.sh $(1)/lib/preinit/60-nand-firstboot.sh
--endef
--
- $(eval $(call BuildPackage,procd))
- $(eval $(call BuildPackage,procd-ujail))
- $(eval $(call BuildPackage,procd-seccomp))
--$(eval $(call BuildPackage,procd-nand))
--$(eval $(call BuildPackage,procd-nand-firstboot))
-diff --git a/package/system/procd/files/nand-preinit.sh b/package/system/procd/files/nand-preinit.sh
-deleted file mode 100644
-index cf596246d1f2891cbeb7b5c7cac4bb6e002b13fb..0000000000000000000000000000000000000000
---- a/package/system/procd/files/nand-preinit.sh
-+++ /dev/null
-@@ -1,21 +0,0 @@
--#!/bin/sh
--# Copyright (C) 2014 OpenWrt.org
--
--nand_takeover() {
--	. /lib/upgrade/nand.sh
--	mtd=$(find_mtd_index "$CI_UBIPART")
--	esize=$(cat /proc/mtd | grep mtd$mtd |cut -d" " -f 3)
--	[ -z "$esize" ] && return 1
--	esize=$(printf "%d" 0x$esize)
--	for a in `seq 0 64`; do
--		mtd -o $((a * esize)) -l 400 dump /dev/mtd$mtd > /tmp/takeover.hdr
--		MAGIC=$(dd if=/tmp/takeover.hdr bs=1 skip=261 count=5 2> /dev/null)
--		SIZE=$(printf "%d" 0x$(dd if=/tmp/takeover.hdr bs=4 count=1 2> /dev/null | hexdump -v -n 4 -e '1/1 "%02x"'))
--		[ "$MAGIC" = "ustar" ] && {
--			mtd -o $((a * esize)) -l $((SIZE + 4)) dump /dev/mtd$mtd | dd bs=1 skip=4 of=/tmp/sysupgrade.tar
--			nand_do_upgrade_stage2 /tmp/sysupgrade.tar
--		}
--	done
--}
--
--boot_hook_add initramfs nand_takeover
-diff --git a/package/system/procd/files/nand.sh b/package/system/procd/files/nand.sh
-deleted file mode 100644
-index 6bd2005344c081df20e5a330a69e49e37225c39f..0000000000000000000000000000000000000000
---- a/package/system/procd/files/nand.sh
-+++ /dev/null
-@@ -1,376 +0,0 @@
--#!/bin/sh
--# Copyright (C) 2014 OpenWrt.org
--#
--
--. /lib/functions.sh
--
--# 'kernel' partition on NAND contains the kernel
--CI_KERNPART="kernel"
--
--# 'ubi' partition on NAND contains UBI
--CI_UBIPART="ubi"
--
--ubi_mknod() {
--	local dir="$1"
--	local dev="/dev/$(basename $dir)"
--
--	[ -e "$dev" ] && return 0
--
--	local devid="$(cat $dir/dev)"
--	local major="${devid%%:*}"
--	local minor="${devid##*:}"
--	mknod "$dev" c $major $minor
--}
--
--nand_find_volume() {
--	local ubidevdir ubivoldir
--	ubidevdir="/sys/devices/virtual/ubi/$1"
--	[ ! -d "$ubidevdir" ] && return 1
--	for ubivoldir in $ubidevdir/${1}_*; do
--		[ ! -d "$ubivoldir" ] && continue
--		if [ "$( cat $ubivoldir/name )" = "$2" ]; then
--			basename $ubivoldir
--			ubi_mknod "$ubivoldir"
--			return 0
--		fi
--	done
--}
--
--nand_find_ubi() {
--	local ubidevdir ubidev mtdnum
--	mtdnum="$( find_mtd_index $1 )"
--	[ ! "$mtdnum" ] && return 1
--	for ubidevdir in /sys/devices/virtual/ubi/ubi*; do
--		[ ! -d "$ubidevdir" ] && continue
--		cmtdnum="$( cat $ubidevdir/mtd_num )"
--		[ ! "$mtdnum" ] && continue
--		if [ "$mtdnum" = "$cmtdnum" ]; then
--			ubidev=$( basename $ubidevdir )
--			ubi_mknod "$ubidevdir"
--			echo $ubidev
--			return 0
--		fi
--	done
--}
--
--nand_get_magic_long() {
--	dd if="$1" skip=$2 bs=4 count=1 2>/dev/null | hexdump -v -n 4 -e '1/1 "%02x"'
--}
--
--get_magic_long_tar() {
--	( tar xf $1 $2 -O | dd bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2> /dev/null
--}
--
--identify_magic() {
--	local magic=$1
--	case "$magic" in
--		"55424923")
--			echo "ubi"
--			;;
--		"31181006")
--			echo "ubifs"
--			;;
--		"68737173")
--			echo "squashfs"
--			;;
--		"d00dfeed")
--			echo "fit"
--			;;
--		"4349"*)
--			echo "combined"
--			;;
--		*)
--			echo "unknown $magic"
--			;;
--	esac
--}
--
--
--identify() {
--	identify_magic $(nand_get_magic_long "$1" "${2:-0}")
--}
--
--identify_tar() {
--	identify_magic $(get_magic_long_tar "$1" "$2")
--}
--
--nand_restore_config() {
--	sync
--	local ubidev=$( nand_find_ubi $CI_UBIPART )
--	local ubivol="$( nand_find_volume $ubidev rootfs_data )"
--	[ ! "$ubivol" ] &&
--		ubivol="$( nand_find_volume $ubidev rootfs )"
--	mkdir /tmp/new_root
--	if ! mount -t ubifs /dev/$ubivol /tmp/new_root; then
--		echo "mounting ubifs $ubivol failed"
--		rmdir /tmp/new_root
--		return 1
--	fi
--	mv "$1" "/tmp/new_root/sysupgrade.tgz"
--	umount /tmp/new_root
--	sync
--	rmdir /tmp/new_root
--}
--
--nand_upgrade_prepare_ubi() {
--	local rootfs_length="$1"
--	local rootfs_type="$2"
--	local has_kernel="${3:-0}"
--	local has_env="${4:-0}"
--
--	local mtdnum="$( find_mtd_index "$CI_UBIPART" )"
--	if [ ! "$mtdnum" ]; then
--		echo "cannot find ubi mtd partition $CI_UBIPART"
--		return 1
--	fi
--
--	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
--	if [ ! "$ubidev" ]; then
--		ubiattach -m "$mtdnum"
--		sync
--		ubidev="$( nand_find_ubi "$CI_UBIPART" )"
--	fi
--
--	if [ ! "$ubidev" ]; then
--		ubiformat /dev/mtd$mtdnum -y
--		ubiattach -m "$mtdnum"
--		sync
--		ubidev="$( nand_find_ubi "$CI_UBIPART" )"
--		[ "$has_env" -gt 0 ] && {
--			ubimkvol /dev/$ubidev -n 0 -N ubootenv -s 1MiB
--			ubimkvol /dev/$ubidev -n 1 -N ubootenv2 -s 1MiB
--		}
--	fi
--
--	local kern_ubivol="$( nand_find_volume $ubidev kernel )"
--	local root_ubivol="$( nand_find_volume $ubidev rootfs )"
--	local data_ubivol="$( nand_find_volume $ubidev rootfs_data )"
--
--	# remove ubiblock device of rootfs
--	local root_ubiblk="ubiblock${root_ubivol:3}"
--	if [ "$root_ubivol" -a -e "/dev/$root_ubiblk" ]; then
--		echo "removing $root_ubiblk"
--		if ! ubiblock -r /dev/$root_ubivol; then
--			echo "cannot remove $root_ubiblk"
--			return 1;
--		fi
--	fi
--
--	# kill volumes
--	[ "$kern_ubivol" ] && ubirmvol /dev/$ubidev -N kernel || true
--	[ "$root_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs || true
--	[ "$data_ubivol" ] && ubirmvol /dev/$ubidev -N rootfs_data || true
--
--	# update kernel
--	if [ "$has_kernel" = "1" ]; then
--		if ! ubimkvol /dev/$ubidev -N kernel -s $kernel_length; then
--			echo "cannot create kernel volume"
--			return 1;
--		fi
--	fi
--
--	# update rootfs
--	local root_size_param
--	if [ "$rootfs_type" = "ubifs" ]; then
--		root_size_param="-m"
--	else
--		root_size_param="-s $rootfs_length"
--	fi
--	if ! ubimkvol /dev/$ubidev -N rootfs $root_size_param; then
--		echo "cannot create rootfs volume"
--		return 1;
--	fi
--
--	# create rootfs_data for non-ubifs rootfs
--	if [ "$rootfs_type" != "ubifs" ]; then
--		if ! ubimkvol /dev/$ubidev -N rootfs_data -m; then
--			echo "cannot initialize rootfs_data volume"
--			return 1
--		fi
--	fi
--	sync
--	return 0
--}
--
--nand_do_upgrade_success() {
--	local conf_tar="/tmp/sysupgrade.tgz"
--
--	sync
--	[ -f "$conf_tar" ] && nand_restore_config "$conf_tar"
--	echo "sysupgrade successful"
--	umount -a
--	reboot -f
--}
--
--# Flash the UBI image to MTD partition
--nand_upgrade_ubinized() {
--	local ubi_file="$1"
--	local mtdnum="$(find_mtd_index "$CI_UBIPART")"
--
--	[ ! "$mtdnum" ] && {
--		CI_UBIPART="rootfs"
--		mtdnum="$(find_mtd_index "$CI_UBIPART")"
--	}
--
--	if [ ! "$mtdnum" ]; then
--		echo "cannot find mtd device $CI_UBIPART"
--		umount -a
--		reboot -f
--	fi
--
--	local mtddev="/dev/mtd${mtdnum}"
--	ubidetach -p "${mtddev}" || true
--	sync
--	ubiformat "${mtddev}" -y -f "${ubi_file}"
--	ubiattach -p "${mtddev}"
--	nand_do_upgrade_success
--}
--
--# Write the UBIFS image to UBI volume
--nand_upgrade_ubifs() {
--	local rootfs_length=`(cat $1 | wc -c) 2> /dev/null`
--
--	nand_upgrade_prepare_ubi "$rootfs_length" "ubifs" "0" "0"
--
--	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
--	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
--	ubiupdatevol /dev/$root_ubivol -s $rootfs_length $1
--
--	nand_do_upgrade_success
--}
--
--nand_board_name() {
--	if type 'platform_nand_board_name' >/dev/null 2>/dev/null; then
--		platform_nand_board_name
--		return
--	fi
--
--	cat /tmp/sysinfo/board_name
--}
--
--nand_upgrade_tar() {
--	local tar_file="$1"
--	local board_name="$(nand_board_name)"
--	local kernel_mtd="$(find_mtd_index $CI_KERNPART)"
--
--	local kernel_length=`(tar xf $tar_file sysupgrade-$board_name/kernel -O | wc -c) 2> /dev/null`
--	local rootfs_length=`(tar xf $tar_file sysupgrade-$board_name/root -O | wc -c) 2> /dev/null`
--
--	local rootfs_type="$(identify_tar "$tar_file" sysupgrade-$board_name/root)"
--
--	local has_kernel=1
--	local has_env=0
--
--	[ "$kernel_length" != 0 -a -n "$kernel_mtd" ] && {
--		tar xf $tar_file sysupgrade-$board_name/kernel -O | mtd write - $CI_KERNPART
--	}
--	[ "$kernel_length" = 0 -o ! -z "$kernel_mtd" ] && has_kernel=0
--
--	nand_upgrade_prepare_ubi "$rootfs_length" "$rootfs_type" "$has_kernel" "$has_env"
--
--	local ubidev="$( nand_find_ubi "$CI_UBIPART" )"
--	[ "$has_kernel" = "1" ] && {
--		local kern_ubivol="$(nand_find_volume $ubidev kernel)"
--	 	tar xf $tar_file sysupgrade-$board_name/kernel -O | \
--			ubiupdatevol /dev/$kern_ubivol -s $kernel_length -
--	}
--
--	local root_ubivol="$(nand_find_volume $ubidev rootfs)"
--	tar xf $tar_file sysupgrade-$board_name/root -O | \
--		ubiupdatevol /dev/$root_ubivol -s $rootfs_length -
--
--	nand_do_upgrade_success
--}
--
--# Recognize type of passed file and start the upgrade process
--nand_do_upgrade_stage2() {
--	local file_type=$(identify $1)
--
--	if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then
--		platform_nand_pre_upgrade "$1"
--	fi
--
--	[ ! "$(find_mtd_index "$CI_UBIPART")" ] && CI_UBIPART="rootfs"
--
--	case "$file_type" in
--		"ubi")		nand_upgrade_ubinized $1;;
--		"ubifs")	nand_upgrade_ubifs $1;;
--		*)		nand_upgrade_tar $1;;
--	esac
--}
--
--nand_upgrade_stage2() {
--	[ $1 = "nand" ] && {
--		[ -f "$2" ] && {
--			touch /tmp/sysupgrade
--
--			killall -9 telnetd
--			killall -9 dropbear
--			killall -9 ash
--
--			kill_remaining TERM
--			sleep 3
--			kill_remaining KILL
--
--			sleep 1
--
--			if [ -n "$(rootfs_type)" ]; then
--				v "Switching to ramdisk..."
--				run_ramfs ". /lib/functions.sh; include /lib/upgrade; nand_do_upgrade_stage2 $2"
--			else
--				nand_do_upgrade_stage2 $2
--			fi
--			return 0
--		}
--		echo "Nand upgrade failed"
--		exit 1
--	}
--}
--
--nand_upgrade_stage1() {
--	[ -f /tmp/sysupgrade-nand-path ] && {
--		path="$(cat /tmp/sysupgrade-nand-path)"
--		[ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] &&
--			rm $CONF_TAR
--
--		ubus call system nandupgrade "{\"prefix\": \"$RAM_ROOT\", \"path\": \"$path\" }"
--		exit 0
--	}
--}
--
--# Check if passed file is a valid one for NAND sysupgrade. Currently it accepts
--# 3 types of files:
--# 1) UBI - should contain an ubinized image, header is checked for the proper
--#    MAGIC
--# 2) UBIFS - should contain UBIFS partition that will replace "rootfs" volume,
--#    header is checked for the proper MAGIC
--# 3) TAR - archive has to include "sysupgrade-BOARD" directory with a non-empty
--#    "CONTROL" file (at this point its content isn't verified)
--#
--# You usually want to call this function in platform_check_image.
--#
--# $(1): board name, used in case of passing TAR file
--# $(2): file to be checked
--nand_do_platform_check() {
--	local board_name="$1"
--	local tar_file="$2"
--	local control_length=`(tar xf $tar_file sysupgrade-$board_name/CONTROL -O | wc -c) 2> /dev/null`
--	local file_type="$(identify $2)"
--
--	[ "$control_length" = 0 -a "$file_type" != "ubi" -a "$file_type" != "ubifs" ] && {
--		echo "Invalid sysupgrade file."
--		return 1
--	}
--
--	return 0
--}
--
--# Start NAND upgrade process
--#
--# $(1): file to be used for upgrade
--nand_do_upgrade() {
--	echo -n $1 > /tmp/sysupgrade-nand-path
--	install_bin /sbin/upgraded
--	ln -s "$RAM_ROOT"/sbin/upgraded /tmp/upgraded
--	nand_upgrade_stage1
--}

patches/lede/0015-base-files-always-use-staged-sysupgrade.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sat, 22 Apr 2017 00:54:50 +0200
-Subject: base-files: always use staged sysupgrade
-
-Support for the -d and -p options is dropped; it may be added again at some
-point by adding these flags to the ubus sysupgrade call.
-
-A downside of this is that we get a lot less information about the progress
-of the upgrade: as soon as the actual upgrade starts, all shell sessions
-are killed to allow unmounting the root filesystem.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index 8c1b3b180e1ecfdd2c106dd3b8853cd487ff89b4..ef9aac709fc1619ba15eeb0aeb4a9a6a372369b2 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -56,7 +56,6 @@ run_ramfs() { # <command> [...]
- 		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
- 		/bin/mknod
- 
--	install_bin /bin/uclient-fetch /bin/wget
- 	install_bin /sbin/mtd
- 	install_bin /sbin/mount_root
- 	install_bin /sbin/snapshot
-@@ -96,51 +95,37 @@ run_ramfs() { # <command> [...]
- 	exec /bin/busybox ash -c "$*"
- }
- 
--kill_remaining() { # [ <signal> ]
-+kill_remaining() { # [ <signal> [ <loop> ] ]
- 	local sig="${1:-TERM}"
-+	local loop="${2:-0}"
-+	local run=true
-+	local stat
-+
- 	echo -n "Sending $sig to remaining processes ... "
- 
--	local my_pid=$$
--	local my_ppid=$(cut -d' ' -f4  /proc/$my_pid/stat)
--	local my_ppisupgraded=
--	grep -q upgraded /proc/$my_ppid/cmdline >/dev/null && {
--		local my_ppisupgraded=1
--	}
--	
--	local stat
--	for stat in /proc/[0-9]*/stat; do
--		[ -f "$stat" ] || continue
--
--		local pid name state ppid rest
--		read pid name state ppid rest < $stat
--		name="${name#(}"; name="${name%)}"
--
--		local cmdline
--		read cmdline < /proc/$pid/cmdline
--
--		# Skip kernel threads
--		[ -n "$cmdline" ] || continue
--
--		if [ $$ -eq 1 ] || [ $my_ppid -eq 1 ] && [ -n "$my_ppisupgraded" ]; then
--			# Running as init process, kill everything except me
--			if [ $pid -ne $$ ] && [ $pid -ne $my_ppid ]; then
--				echo -n "$name "
--				kill -$sig $pid 2>/dev/null
--			fi
--		else 
--			case "$name" in
--				# Skip essential services
--				*procd*|*ash*|*init*|*watchdog*|*ssh*|*dropbear*|*telnet*|*login*|*hostapd*|*wpa_supplicant*|*nas*|*relayd*) : ;;
--
--				# Killable process
--				*)
--					if [ $pid -ne $$ ] && [ $ppid -ne $$ ]; then
--						echo -n "$name "
--						kill -$sig $pid 2>/dev/null
--					fi
--				;;
--			esac
--		fi
-+	while $run; do
-+		run=false
-+		for stat in /proc/[0-9]*/stat; do
-+			[ -f "$stat" ] || continue
-+
-+			local pid name state ppid rest
-+			read pid name state ppid rest < $stat
-+			name="${name#(}"; name="${name%)}"
-+
-+			# Skip PID1, ourself and our children
-+			[ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
-+
-+			local cmdline
-+			read cmdline < /proc/$pid/cmdline
-+
-+			# Skip kernel threads
-+			[ -n "$cmdline" ] || continue
-+
-+			echo -n "$name "
-+			kill -$sig $pid 2>/dev/null
-+
-+			[ $loop -eq 1 ] && run=true
-+		done
- 	done
- 	echo ""
- }
-@@ -175,28 +160,31 @@ v() {
- 	[ "$VERBOSE" -ge 1 ] && echo "$@"
- }
- 
-+json_string() {
-+	local v="$1"
-+	v="${v//\\/\\\\}"
-+	v="${v//\"/\\\"}"
-+	echo "\"$v\""
-+}
-+
- rootfs_type() {
- 	/bin/mount | awk '($3 ~ /^\/$/) && ($5 !~ /rootfs/) { print $5 }'
- }
- 
- get_image() { # <source> [ <command> ]
- 	local from="$1"
--	local conc="$2"
--	local cmd
--
--	case "$from" in
--		http://*|ftp://*) cmd="wget -O- -q";;
--		*) cmd="cat";;
--	esac
--	if [ -z "$conc" ]; then
--		local magic="$(eval $cmd \"$from\" 2>/dev/null | dd bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
-+	local cat="$2"
-+
-+	if [ -z "$cat" ]; then
-+		local magic="$(dd if="$from" bs=2 count=1 2>/dev/null | hexdump -n 2 -e '1/1 "%02x"')"
- 		case "$magic" in
--			1f8b) conc="zcat";;
--			425a) conc="bzcat";;
-+			1f8b) cat="zcat";;
-+			425a) cat="bzcat";;
-+			*) cat="cat";;
- 		esac
- 	fi
- 
--	eval "$cmd \"$from\" 2>/dev/null ${conc:+| $conc}"
-+	$cat "$from" 2>/dev/null
- }
- 
- get_magic_word() {
-@@ -331,12 +319,14 @@ default_do_upgrade() {
- 	fi
- }
- 
--do_upgrade() {
-+do_upgrade_stage2() {
- 	v "Performing system upgrade..."
--	if type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
--		platform_do_upgrade "$ARGV"
-+	if [ -n "$do_upgrade" ]; then
-+		$do_upgrade "$IMAGE"
-+	elif type 'platform_do_upgrade' >/dev/null 2>/dev/null; then
-+		platform_do_upgrade "$IMAGE"
- 	else
--		default_do_upgrade "$ARGV"
-+		default_do_upgrade "$IMAGE"
- 	fi
- 
- 	if [ "$SAVE_CONFIG" -eq 1 ] && type 'platform_copy_config' >/dev/null 2>/dev/null; then
-@@ -344,12 +334,11 @@ do_upgrade() {
- 	fi
- 
- 	v "Upgrade completed"
--	[ -n "$DELAY" ] && sleep "$DELAY"
--	ask_bool 1 "Reboot" && {
--		v "Rebooting system..."
--		umount -a
--		reboot -f
--		sleep 5
--		echo b 2>/dev/null >/proc/sysrq-trigger
--	}
-+	sleep 1
-+
-+	v "Rebooting system..."
-+	umount -a
-+	reboot -f
-+	sleep 5
-+	echo b 2>/dev/null >/proc/sysrq-trigger
- }
-diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh
-index 6bd2005344c081df20e5a330a69e49e37225c39f..1e69c8f9657b39adf2a2c33bd9bac9303bcbc3d7 100644
---- a/package/base-files/files/lib/upgrade/nand.sh
-+++ b/package/base-files/files/lib/upgrade/nand.sh
-@@ -283,7 +283,16 @@ nand_upgrade_tar() {
- }
- 
- # Recognize type of passed file and start the upgrade process
--nand_do_upgrade_stage2() {
-+nand_do_upgrade() {
-+	if [ -n "$IS_PRE_UPGRADE" ]; then
-+		# Previously, nand_do_upgrade was called from the platform_pre_upgrade
-+		# hook; this piece of code handles scripts that haven't been
-+		# updated. All scripts should gradually move to call nand_do_upgrade
-+		# from platform_do_upgrade instead.
-+		export do_upgrade=nand_do_upgrade
-+		return
-+	fi
-+
- 	local file_type=$(identify $1)
- 
- 	if type 'platform_nand_pre_upgrade' >/dev/null 2>/dev/null; then
-@@ -299,45 +308,6 @@ nand_do_upgrade_stage2() {
- 	esac
- }
- 
--nand_upgrade_stage2() {
--	[ $1 = "nand" ] && {
--		[ -f "$2" ] && {
--			touch /tmp/sysupgrade
--
--			killall -9 telnetd
--			killall -9 dropbear
--			killall -9 ash
--
--			kill_remaining TERM
--			sleep 3
--			kill_remaining KILL
--
--			sleep 1
--
--			if [ -n "$(rootfs_type)" ]; then
--				v "Switching to ramdisk..."
--				run_ramfs ". /lib/functions.sh; include /lib/upgrade; nand_do_upgrade_stage2 $2"
--			else
--				nand_do_upgrade_stage2 $2
--			fi
--			return 0
--		}
--		echo "Nand upgrade failed"
--		exit 1
--	}
--}
--
--nand_upgrade_stage1() {
--	[ -f /tmp/sysupgrade-nand-path ] && {
--		path="$(cat /tmp/sysupgrade-nand-path)"
--		[ "$SAVE_CONFIG" != 1 -a -f "$CONF_TAR" ] &&
--			rm $CONF_TAR
--
--		ubus call system nandupgrade "{\"prefix\": \"$RAM_ROOT\", \"path\": \"$path\" }"
--		exit 0
--	}
--}
--
- # Check if passed file is a valid one for NAND sysupgrade. Currently it accepts
- # 3 types of files:
- # 1) UBI - should contain an ubinized image, header is checked for the proper
-@@ -364,13 +334,3 @@ nand_do_platform_check() {
- 
- 	return 0
- }
--
--# Start NAND upgrade process
--#
--# $(1): file to be used for upgrade
--nand_do_upgrade() {
--	echo -n $1 > /tmp/sysupgrade-nand-path
--	install_bin /sbin/upgraded
--	ln -s "$RAM_ROOT"/sbin/upgraded /tmp/upgraded
--	nand_upgrade_stage1
--}
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-new file mode 100755
-index 0000000000000000000000000000000000000000..4e2aa3a23c3bab07a795762a30a4d4f701081934
---- /dev/null
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -0,0 +1,50 @@
-+#!/bin/sh
-+
-+. /lib/functions.sh
-+. /lib/functions/system.sh
-+
-+export IMAGE="$1"
-+COMMAND="$2"
-+
-+export ARGV="$IMAGE"
-+export ARGC=1
-+
-+export SAVE_CONFIG=1
-+export SAVE_PARTITIONS=1
-+
-+export INTERACTIVE=0
-+export VERBOSE=1
-+export CONFFILES=/tmp/sysupgrade.conffiles
-+export CONF_TAR=/tmp/sysupgrade.tgz
-+
-+
-+[ -f "$CONF_TAR" ] || export SAVE_CONFIG=0
-+[ -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap ] && export SAVE_PARTITIONS=0
-+
-+include /lib/upgrade
-+
-+
-+killall -9 telnetd
-+killall -9 dropbear
-+killall -9 ash
-+
-+kill_remaining TERM
-+sleep 3
-+kill_remaining KILL 1
-+
-+sleep 1
-+
-+
-+if [ -n "$IMAGE" ] && type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
-+	IS_PRE_UPGRADE=1 platform_pre_upgrade "$IMAGE"
-+
-+	# Needs to be unset again because of busybox weirdness ...
-+	IS_PRE_UPGRADE=
-+fi
-+
-+if [ -n "$(rootfs_type)" ]; then
-+	echo "Switching to ramdisk..."
-+	run_ramfs "$COMMAND"
-+else
-+	exec /bin/busybox ash -c "$COMMAND"
-+fi
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index 71c7faa6dbc485ff33e776ff087e1aca58cfb0b0..fa08f4194daa0ee74758b9f49a23fe8dcb4b933d 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -1,4 +1,7 @@
- #!/bin/sh
-+
-+[ "$1" = "nand" ] && exec /lib/upgrade/stage2 "$2" "$3"
-+
- . /lib/functions.sh
- . /lib/functions/system.sh
- 
-@@ -11,7 +14,6 @@ export VERBOSE=1
- export SAVE_CONFIG=1
- export SAVE_OVERLAY=0
- export SAVE_PARTITIONS=1
--export DELAY=
- export CONF_IMAGE=
- export CONF_BACKUP_LIST=0
- export CONF_BACKUP=
-@@ -25,7 +27,6 @@ export TEST=0
- while [ -n "$1" ]; do
- 	case "$1" in
- 		-i) export INTERACTIVE=1;;
--		-d) export DELAY="$2"; shift;;
- 		-v) export VERBOSE="$(($VERBOSE + 1))";;
- 		-q) export VERBOSE="$(($VERBOSE - 1))";;
- 		-n) export SAVE_CONFIG=0;;
-@@ -50,10 +51,9 @@ done
- export CONFFILES=/tmp/sysupgrade.conffiles
- export CONF_TAR=/tmp/sysupgrade.tgz
- 
--export ARGV="$*"
--export ARGC="$#"
-+IMAGE="$1"
- 
--[ -z "$ARGV" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && {
-+[ -z "$IMAGE" -a -z "$NEED_IMAGE" -o $HELP -gt 0 ] && {
- 	cat <<EOF
- Usage: $0 [<upgrade-option>...] <image file or URL>
-        $0 [-q] [-i] <backup-command> <file>
-@@ -90,7 +90,7 @@ EOF
- 	exit 1
- }
- 
--[ -n "$ARGV" -a -n "$NEED_IMAGE" ] && {
-+[ -n "$IMAGE" -a -n "$NEED_IMAGE" ] && {
- 	cat <<-EOF
- 		-b|--create-backup and -r|--restore-backup do not perform a firmware upgrade.
- 		Do not specify both -b|-r and a firmware image.
-@@ -155,14 +155,13 @@ sysupgrade_pre_upgrade="fwtool_pre_upgrade"
- 
- include /lib/upgrade
- 
--[ "$1" = "nand" ] && nand_upgrade_stage2 $@
--
- do_save_conffiles() {
- 	local conf_tar="${1:-$CONF_TAR}"
- 
- 	[ -z "$(rootfs_type)" ] && {
- 		echo "Cannot save config while running from ramdisk."
- 		ask_bool 0 "Abort" && exit
-+		rm -f "$conf_tar"
- 		return 0
- 	}
- 	run_hooks "$CONFFILES" $sysupgrade_init_conffiles
-@@ -203,8 +202,33 @@ type platform_check_image >/dev/null 2>/dev/null || {
- 	exit 1
- }
- 
-+case "$IMAGE" in
-+	http://*)
-+		wget -O/tmp/sysupgrade.img "$IMAGE"
-+		IMAGE=/tmp/sysupgrade.img
-+		;;
-+esac
-+
-+IMAGE="$(readlink -f "$IMAGE")"
-+
-+case "$IMAGE" in
-+	'')
-+		echo "Image file not found."
-+		exit 1
-+		;;
-+	/tmp/*)	;;
-+	*)
-+		v "Image not in /tmp, copying..."
-+		cp -f "$IMAGE" /tmp/sysupgrade.img
-+		IMAGE=/tmp/sysupgrade.img
-+		;;
-+esac
-+
-+export ARGV="$IMAGE"
-+export ARGC=1
-+
- for check in $sysupgrade_image_check; do
--	( eval "$check \"\$ARGV\"" ) || {
-+	( $check "$IMAGE" ) || {
- 		if [ $FORCE -eq 1 ]; then
- 			echo "Image check '$check' failed but --force given - will update anyway!"
- 			break
-@@ -230,6 +254,7 @@ elif ask_bool $SAVE_CONFIG "Keep config files over reflash"; then
- 	[ $TEST -eq 1 ] || do_save_conffiles
- 	export SAVE_CONFIG=1
- else
-+	[ $TEST -eq 1 ] || rm -f "$CONF_TAR"
- 	export SAVE_CONFIG=0
- fi
- 
-@@ -237,28 +262,18 @@ if [ $TEST -eq 1 ]; then
- 	exit 0
- fi
- 
--run_hooks "" $sysupgrade_pre_upgrade
--
--# Some platforms/devices may want different sysupgrade process, e.g. without
--# killing processes yet or calling ubus system upgrade method.
--# This is needed e.g. on NAND devices where we just want to trigger stage1 at
--# this point.
--if type 'platform_pre_upgrade' >/dev/null 2>/dev/null; then
--	platform_pre_upgrade "$ARGV"
-+if [ $SAVE_PARTITIONS -eq 0 ]; then
-+	touch /tmp/sysupgrade.always.overwrite.bootdisk.partmap
-+else
-+	rm -f /tmp/sysupgrade.always.overwrite.bootdisk.partmap
- fi
- 
--ubus call system upgrade
--touch /tmp/sysupgrade
--
--if [ ! -f /tmp/failsafe ] ; then
--	kill_remaining TERM
--	sleep 3
--	kill_remaining KILL
--fi
-+run_hooks "" $sysupgrade_pre_upgrade
- 
--if [ -n "$(rootfs_type)" ]; then
--	v "Switching to ramdisk..."
--	run_ramfs '. /lib/functions.sh; include /lib/upgrade; do_upgrade'
--else
--	do_upgrade
--fi
-+install_bin /sbin/upgraded
-+v "Commencing upgrade. All shell sessions will be closed now."
-+ubus call system sysupgrade "{
-+	\"prefix\": \"$RAM_ROOT\",
-+	\"path\": $(json_string "$IMAGE"),
-+	\"command\": \". /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2\"
-+}"

patches/lede/0016-fstools-clean-up-trailing-whitespace-in-snapshot-script.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:29:24 +0200
-Subject: fstools: clean up trailing whitespace in snapshot script
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
-index c1a5b733f3c70e2bb5f2e83d3589e2f10832760f..baf24f1e3e90fe7708e0f28c17ba270a35a2cd52 100644
---- a/package/system/fstools/files/snapshot
-+++ b/package/system/fstools/files/snapshot
-@@ -42,7 +42,7 @@ do_snapshot_upgrade() {
- 
- 	opkg list-upgradable
- 	[ $? -eq 0 ] || exit 2
--	
-+
- 	UPDATES=`opkg list-upgradable | cut -d" " -f1`
- 	[ -z "${UPDATES}" ] && exit 0
- 

patches/lede/0017-fstools-snapshot-handle-jffs2-conversion-using-upgraded.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Wed, 3 May 2017 08:29:55 +0200
-Subject: fstools: snapshot: handle jffs2 conversion using upgraded
-
-We can reuse the kill_remaining and run_ramfs facilities of the stage2 run
-by upgraded.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
-index 6f1f511d387e900426832f40966012bc11d53075..f2e0580912ab7d475fab576bea4fd84f0dfe6a3d 100644
---- a/package/system/fstools/Makefile
-+++ b/package/system/fstools/Makefile
-@@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
- 
- PKG_NAME:=fstools
--PKG_RELEASE:=1
-+PKG_RELEASE:=2
- 
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/fstools.git
-diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
-index baf24f1e3e90fe7708e0f28c17ba270a35a2cd52..a495e3434523b7a4b1b2f1bc3f4c9298197fc745 100644
---- a/package/system/fstools/files/snapshot
-+++ b/package/system/fstools/files/snapshot
-@@ -64,14 +64,16 @@ do_convert_jffs2() {
- do_convert() {
- 	. /lib/functions.sh
- 	. /lib/upgrade/common.sh
--	ubus call system upgrade
--	touch /tmp/sysupgrade
-+
- 	cd /overlay/upper
- 	tar czf /tmp/snapshot.tar.gz *
--	kill_remaining TERM
--	sleep 3
--	kill_remaining KILL
--	run_ramfs '. /sbin/snapshot; do_convert_jffs2'
-+
-+	install_bin /sbin/upgraded
-+	ubus call system sysupgrade "{
-+		\"prefix\": \"$RAM_ROOT\",
-+		\"path\": \"\",
-+		\"command\": \". /sbin/snapshot; do_convert_jffs2\"
-+	}"
- }
- 
- [ -n "$(cat /proc/mounts|grep /overlay|grep jffs2)" ] && {

patches/lede/0018-base-files-sysupgrade-cleanup.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Sun, 23 Apr 2017 23:33:14 +0200
-Subject: base-files: sysupgrade cleanup
-
-Some functions only used by stage2 are moved there from common.sh.
-
-One piece that could still use more cleanup is platform_pre_upgrade: many
-targets reference files from there are aren't available in the ramfs, so
-we need to evaluate it before the switch; conversely, flash writes happen
-in that function on some targets. Targets that do the latter should be
-fixed eventually to use platform_do_upgrade for that purpose.
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
-index ef9aac709fc1619ba15eeb0aeb4a9a6a372369b2..af7682c29e005c6ca47b91e9be2d60c359a90d05 100644
---- a/package/base-files/files/lib/upgrade/common.sh
-+++ b/package/base-files/files/lib/upgrade/common.sh
-@@ -30,106 +30,6 @@ install_bin() { # <file> [ <symlink> ... ]
- 	}; done
- }
- 
--supivot() { # <new_root> <old_root>
--	/bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o bind $1 $1
--	mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
--	/bin/mount -o noatime,move /proc $1/proc && \
--	pivot_root $1 $1$2 || {
--		/bin/umount -l $1 $1
--		return 1
--	}
--
--	/bin/mount -o noatime,move $2/sys /sys
--	/bin/mount -o noatime,move $2/dev /dev
--	/bin/mount -o noatime,move $2/tmp /tmp
--	/bin/mount -o noatime,move $2/overlay /overlay 2>&-
--	return 0
--}
--
--run_ramfs() { # <command> [...]
--	install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount	\
--		/sbin/pivot_root /sbin/reboot /bin/sync /bin/dd	/bin/grep       \
--		/bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd	\
--		/bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump		\
--		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
--		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
--		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
--		/bin/mknod
--
--	install_bin /sbin/mtd
--	install_bin /sbin/mount_root
--	install_bin /sbin/snapshot
--	install_bin /sbin/snapshot_tool
--	install_bin /usr/sbin/ubiupdatevol
--	install_bin /usr/sbin/ubiattach
--	install_bin /usr/sbin/ubiblock
--	install_bin /usr/sbin/ubiformat
--	install_bin /usr/sbin/ubidetach
--	install_bin /usr/sbin/ubirsvol
--	install_bin /usr/sbin/ubirmvol
--	install_bin /usr/sbin/ubimkvol
--	install_bin /usr/sbin/partx
--	install_bin /usr/sbin/losetup
--	install_bin /usr/sbin/mkfs.ext4
--	for file in $RAMFS_COPY_BIN; do
--		install_bin ${file//:/ }
--	done
--	install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
--
--	[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
--
--	supivot $RAM_ROOT /mnt || {
--		echo "Failed to switch over to ramfs. Please reboot."
--		exit 1
--	}
--
--	/bin/mount -o remount,ro /mnt
--	/bin/umount -l /mnt
--
--	grep /overlay /proc/mounts > /dev/null && {
--		/bin/mount -o noatime,remount,ro /overlay
--		/bin/umount -l /overlay
--	}
--
--	# spawn a new shell from ramdisk to reduce the probability of cache issues
--	exec /bin/busybox ash -c "$*"
--}
--
--kill_remaining() { # [ <signal> [ <loop> ] ]
--	local sig="${1:-TERM}"
--	local loop="${2:-0}"
--	local run=true
--	local stat
--
--	echo -n "Sending $sig to remaining processes ... "
--
--	while $run; do
--		run=false
--		for stat in /proc/[0-9]*/stat; do
--			[ -f "$stat" ] || continue
--
--			local pid name state ppid rest
--			read pid name state ppid rest < $stat
--			name="${name#(}"; name="${name%)}"
--
--			# Skip PID1, ourself and our children
--			[ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
--
--			local cmdline
--			read cmdline < /proc/$pid/cmdline
--
--			# Skip kernel threads
--			[ -n "$cmdline" ] || continue
--
--			echo -n "$name "
--			kill -$sig $pid 2>/dev/null
--
--			[ $loop -eq 1 ] && run=true
--		done
--	done
--	echo ""
--}
--
- run_hooks() {
- 	local arg="$1"; shift
- 	for func in "$@"; do
-diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
-index 4e2aa3a23c3bab07a795762a30a4d4f701081934..cc8047d988e39ca9ba27d2588744aad469d1d978 100755
---- a/package/base-files/files/lib/upgrade/stage2
-+++ b/package/base-files/files/lib/upgrade/stage2
-@@ -24,6 +24,104 @@ export CONF_TAR=/tmp/sysupgrade.tgz
- include /lib/upgrade
- 
- 
-+supivot() { # <new_root> <old_root>
-+	/bin/mount | grep "on $1 type" 2>&- 1>&- || /bin/mount -o bind $1 $1
-+	mkdir -p $1$2 $1/proc $1/sys $1/dev $1/tmp $1/overlay && \
-+	/bin/mount -o noatime,move /proc $1/proc && \
-+	pivot_root $1 $1$2 || {
-+		/bin/umount -l $1 $1
-+		return 1
-+	}
-+
-+	/bin/mount -o noatime,move $2/sys /sys
-+	/bin/mount -o noatime,move $2/dev /dev
-+	/bin/mount -o noatime,move $2/tmp /tmp
-+	/bin/mount -o noatime,move $2/overlay /overlay 2>&-
-+	return 0
-+}
-+
-+switch_to_ramfs() {
-+	install_bin /bin/busybox /bin/ash /bin/sh /bin/mount /bin/umount	\
-+		/sbin/pivot_root /sbin/reboot /bin/sync /bin/dd	/bin/grep       \
-+		/bin/cp /bin/mv /bin/tar /usr/bin/md5sum "/usr/bin/[" /bin/dd	\
-+		/bin/vi /bin/ls /bin/cat /usr/bin/awk /usr/bin/hexdump		\
-+		/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc \
-+		/bin/cut /usr/bin/printf /bin/sync /bin/mkdir /bin/rmdir	\
-+		/bin/rm /usr/bin/basename /bin/kill /bin/chmod /usr/bin/find \
-+		/bin/mknod
-+
-+	install_bin /sbin/mtd
-+	install_bin /sbin/mount_root
-+	install_bin /sbin/snapshot
-+	install_bin /sbin/snapshot_tool
-+	install_bin /usr/sbin/ubiupdatevol
-+	install_bin /usr/sbin/ubiattach
-+	install_bin /usr/sbin/ubiblock
-+	install_bin /usr/sbin/ubiformat
-+	install_bin /usr/sbin/ubidetach
-+	install_bin /usr/sbin/ubirsvol
-+	install_bin /usr/sbin/ubirmvol
-+	install_bin /usr/sbin/ubimkvol
-+	install_bin /usr/sbin/partx
-+	install_bin /usr/sbin/losetup
-+	install_bin /usr/sbin/mkfs.ext4
-+	for file in $RAMFS_COPY_BIN; do
-+		install_bin ${file//:/ }
-+	done
-+	install_file /etc/resolv.conf /lib/*.sh /lib/functions/*.sh /lib/upgrade/*.sh $RAMFS_COPY_DATA
-+
-+	[ -L "/lib64" ] && ln -s /lib $RAM_ROOT/lib64
-+
-+	supivot $RAM_ROOT /mnt || {
-+		echo "Failed to switch over to ramfs. Please reboot."
-+		exit 1
-+	}
-+
-+	/bin/mount -o remount,ro /mnt
-+	/bin/umount -l /mnt
-+
-+	grep /overlay /proc/mounts > /dev/null && {
-+		/bin/mount -o noatime,remount,ro /overlay
-+		/bin/umount -l /overlay
-+	}
-+}
-+
-+kill_remaining() { # [ <signal> [ <loop> ] ]
-+	local sig="${1:-TERM}"
-+	local loop="${2:-0}"
-+	local run=true
-+	local stat
-+
-+	echo -n "Sending $sig to remaining processes ... "
-+
-+	while $run; do
-+		run=false
-+		for stat in /proc/[0-9]*/stat; do
-+			[ -f "$stat" ] || continue
-+
-+			local pid name state ppid rest
-+			read pid name state ppid rest < $stat
-+			name="${name#(}"; name="${name%)}"
-+
-+			# Skip PID1, ourself and our children
-+			[ $pid -ne 1 -a $pid -ne $$ -a $ppid -ne $$ ] || continue
-+
-+			local cmdline
-+			read cmdline < /proc/$pid/cmdline
-+
-+			# Skip kernel threads
-+			[ -n "$cmdline" ] || continue
-+
-+			echo -n "$name "
-+			kill -$sig $pid 2>/dev/null
-+
-+			[ $loop -eq 1 ] && run=true
-+		done
-+	done
-+	echo ""
-+}
-+
-+
- killall -9 telnetd
- killall -9 dropbear
- killall -9 ash
-@@ -44,7 +142,8 @@ fi
- 
- if [ -n "$(rootfs_type)" ]; then
- 	echo "Switching to ramdisk..."
--	run_ramfs "$COMMAND"
--else
--	exec /bin/busybox ash -c "$COMMAND"
-+	switch_to_ramfs
- fi
-+
-+# Exec new shell from ramfs
-+exec /bin/busybox ash -c "$COMMAND"
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index fa08f4194daa0ee74758b9f49a23fe8dcb4b933d..347860d00af27a61152703320bb210d30726db83 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -1,7 +1,5 @@
- #!/bin/sh
- 
--[ "$1" = "nand" ] && exec /lib/upgrade/stage2 "$2" "$3"
--
- . /lib/functions.sh
- . /lib/functions/system.sh
- 

patches/lede/0019-base-files-add-support-for-staged-sysupgrades-from-failsafe-mode.patch

-From: Matthias Schiffer <mschiffer@universe-factory.net>
-Date: Mon, 24 Apr 2017 01:31:04 +0200
-Subject: base-files: add support for staged sysupgrades from failsafe mode
-
-Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
-
-diff --git a/package/base-files/files/lib/preinit/40_run_failsafe_hook b/package/base-files/files/lib/preinit/40_run_failsafe_hook
-index 7301f77349a1a1e42fcef9bcbc927ef55c83b991..533b0a9771e1aac603f00ecf7a4622ea9fee969d 100644
---- a/package/base-files/files/lib/preinit/40_run_failsafe_hook
-+++ b/package/base-files/files/lib/preinit/40_run_failsafe_hook
-@@ -5,8 +5,12 @@
- run_failsafe_hook() {
-     [ "$pi_preinit_no_failsafe" = "y" ] && return
-     if [ "$FAILSAFE" = "true" ]; then
-+	lock /tmp/.failsafe
- 	boot_run_hook failsafe
--	lock -w /tmp/.failsafe
-+	while [ ! -e /tmp/sysupgrade ]; do
-+	    lock -w /tmp/.failsafe
-+	done
-+	exit
-     fi
- }
- 
-diff --git a/package/base-files/files/lib/preinit/99_10_failsafe_login b/package/base-files/files/lib/preinit/99_10_failsafe_login
-index 3147cdc5a68a69cef6b1af6618a4e2367a143c2c..728c63b2e8aebf970cd7dff0d15518ccda83029c 100644
---- a/package/base-files/files/lib/preinit/99_10_failsafe_login
-+++ b/package/base-files/files/lib/preinit/99_10_failsafe_login
-@@ -8,10 +8,13 @@ failsafe_netlogin () {
- }
- 
- failsafe_shell() {
--	lock /tmp/.failsafe
--	ash --login
--	echo "Please reboot system when done with failsafe network logins"
--	while true; do sleep 1; done
-+	local console="$(sed -e 's/ /\n/g' /proc/cmdline | grep '^console=' | head -1 | sed -e 's/^console=//' -e 's/,.*//')"
-+	[ -n "$console" ] || console=console
-+	[ -c "/dev/$console" ] || return 0
-+	while true; do
-+		ash --login <"/dev/$console" >"/dev/$console" 2>"/dev/$console"
-+		sleep 1
-+	done &
- }
- 
- boot_hook_add failsafe failsafe_netlogin
-diff --git a/package/base-files/files/sbin/sysupgrade b/package/base-files/files/sbin/sysupgrade
-index 347860d00af27a61152703320bb210d30726db83..4a133a65e0960619b9cd0d722b6c27ac7894de5b 100755
---- a/package/base-files/files/sbin/sysupgrade
-+++ b/package/base-files/files/sbin/sysupgrade
-@@ -270,8 +270,16 @@ run_hooks "" $sysupgrade_pre_upgrade
- 
- install_bin /sbin/upgraded
- v "Commencing upgrade. All shell sessions will be closed now."
--ubus call system sysupgrade "{
--	\"prefix\": \"$RAM_ROOT\",
--	\"path\": $(json_string "$IMAGE"),
--	\"command\": \". /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2\"
--}"
-+
-+COMMAND='. /lib/functions.sh; include /lib/upgrade; do_upgrade_stage2'
-+
-+if [ -n "$FAILSAFE" ]; then
-+	printf '%s\x00%s\x00%s' "$RAM_ROOT" "$IMAGE" "$COMMAND" >/tmp/sysupgrade
-+	lock -u /tmp/.failsafe
-+else
-+	ubus call system sysupgrade "{
-+		\"prefix\": $(json_string "$RAM_ROOT"),
-+		\"path\": $(json_string "$IMAGE"),
-+		\"command\": $(json_string "$COMMAND")
-+	}"
-+fi