Remove the old PBE 100mb port fix as it's no longer necessary. (#823)

Deprecate /etc/rc.local (where the fix was) by making dnsmasq startup the proper way
This commit is contained in:
Tim Wilkinson 2023-05-05 18:20:45 -07:00 committed by GitHub
parent 5f19a7d090
commit 175d23ee30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 2 additions and 29 deletions

View File

@ -1,11 +1,3 @@
--- a/package/base-files/files/etc/rc.local
+++ b/package/base-files/files/etc/rc.local
@@ -1,4 +1,4 @@
# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.
-
+/etc/init.d/dnsmasq start
exit 0
--- a/package/network/services/dnsmasq/Makefile
+++ b/package/network/services/dnsmasq/Makefile
@@ -167,7 +167,7 @@ define Package/dnsmasq/install
@ -19,7 +11,7 @@
$(INSTALL_DIR) $(1)/etc/hotplug.d/ntp
--- /dev/null
+++ b/package/network/services/dnsmasq/files/dnsmasq.init.aredn
@@ -0,0 +1,641 @@
@@ -0,0 +1,637 @@
+#!/bin/sh /etc/rc.common
+# Copyright (C) 2007-2012 OpenWrt.org
+
@ -562,11 +554,6 @@
+ procd_add_reload_trigger "dhcp"
+}
+
+boot() {
+ # Will be launched through hotplug
+ return 0
+}
+
+start_service() {
+ include /lib/functions
+
@ -587,6 +574,7 @@
+ mkdir -p /var/run/dnsmasq/
+ mkdir -p $(dirname $CONFIGFILE)
+ mkdir -p /var/lib/misc
+ mkdir -p /tmp/hosts
+ touch /tmp/dhcp.leases
+
+ if [ ! -f "$TIMESTAMPFILE" ]; then

View File

@ -1,14 +0,0 @@
--- a/package/base-files/files/etc/rc.local
+++ b/package/base-files/files/etc/rc.local
@@ -1,4 +1,12 @@
# Put your custom commands here that should be executed once
# the system init finished. By default this file does nothing.
+
+BOARDID=$(/usr/local/bin/get_boardid)
+case "$BOARDID" in
+ 0xe885|0xe4e5|0xe6e5)
+ /usr/sbin/ethtool -s eth0 speed 100 duplex full autoneg on
+ ;;
+esac
+
exit 0

View File

@ -19,7 +19,6 @@
714-vtun-openssl-fix.patch
714-vtun-fix-cdefs.patch
715-set-min-free.patch
716-ubnt-pbe-100mb-port.patch
717-fix-olsrd-oparse-error.patch
718-temp-remove-olsrd-pud.patch
719-disable-ipv6.patch