From ebf4a7e8a29f2a665ec30a9cf32fa608b996c061 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Mon, 13 Jan 2014 18:24:15 +0100 Subject: [PATCH] Remove initscript enable/disable hacks Better configure these properly. --- .../lib/gluon/upgrade/alfred/invariant/010-enable-alfred | 2 -- .../lib/gluon/upgrade/core/invariant/010-disable-services | 5 ----- .../files/lib/gluon/upgrade/cron/invariant/010-enable-cron | 4 ---- .../lib/gluon/upgrade/ebtables/invariant/010-enable-ebtables | 3 --- gluon/gluon-mesh-vpn-fastd/Makefile | 1 - .../gluon/upgrade/mesh-vpn-fastd/invariant/010-enable-fastd | 3 --- 6 files changed, 18 deletions(-) delete mode 100755 gluon/gluon-core/files/lib/gluon/upgrade/core/invariant/010-disable-services delete mode 100755 gluon/gluon-cron/files/lib/gluon/upgrade/cron/invariant/010-enable-cron delete mode 100755 gluon/gluon-ebtables/files/lib/gluon/upgrade/ebtables/invariant/010-enable-ebtables delete mode 100755 gluon/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-enable-fastd diff --git a/gluon/gluon-alfred/files/lib/gluon/upgrade/alfred/invariant/010-enable-alfred b/gluon/gluon-alfred/files/lib/gluon/upgrade/alfred/invariant/010-enable-alfred index 755fff3..fb75e8e 100755 --- a/gluon/gluon-alfred/files/lib/gluon/upgrade/alfred/invariant/010-enable-alfred +++ b/gluon/gluon-alfred/files/lib/gluon/upgrade/alfred/invariant/010-enable-alfred @@ -12,5 +12,3 @@ uci_set alfred alfred start_vis '1' uci_set alfred alfred run_facters '0' uci_commit alfred - -/etc/init.d/alfred enable diff --git a/gluon/gluon-core/files/lib/gluon/upgrade/core/invariant/010-disable-services b/gluon/gluon-core/files/lib/gluon/upgrade/core/invariant/010-disable-services deleted file mode 100755 index c415205..0000000 --- a/gluon/gluon-core/files/lib/gluon/upgrade/core/invariant/010-disable-services +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -/etc/init.d/dnsmasq disable -/etc/init.d/telnet disable -/etc/init.d/uhttpd disable diff --git a/gluon/gluon-cron/files/lib/gluon/upgrade/cron/invariant/010-enable-cron b/gluon/gluon-cron/files/lib/gluon/upgrade/cron/invariant/010-enable-cron deleted file mode 100755 index 4639152..0000000 --- a/gluon/gluon-cron/files/lib/gluon/upgrade/cron/invariant/010-enable-cron +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -/etc/init.d/gluon-cron enable - diff --git a/gluon/gluon-ebtables/files/lib/gluon/upgrade/ebtables/invariant/010-enable-ebtables b/gluon/gluon-ebtables/files/lib/gluon/upgrade/ebtables/invariant/010-enable-ebtables deleted file mode 100755 index 5c2aa26..0000000 --- a/gluon/gluon-ebtables/files/lib/gluon/upgrade/ebtables/invariant/010-enable-ebtables +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/etc/init.d/gluon-ebtables enable diff --git a/gluon/gluon-mesh-vpn-fastd/Makefile b/gluon/gluon-mesh-vpn-fastd/Makefile index 5261881..1553af9 100644 --- a/gluon/gluon-mesh-vpn-fastd/Makefile +++ b/gluon/gluon-mesh-vpn-fastd/Makefile @@ -31,7 +31,6 @@ define Build/Compile endef define Package/gluon-mesh-vpn-fastd/install - $(CP) ./files/* $(1)/ $(INSTALL_DIR) $(1)/lib/gluon/upgrade/mesh-vpn-fastd/invariant $(INSTALL_BIN) $(PKG_BUILD_DIR)/fastd.sh $(1)/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-mesh-vpn-fastd endef diff --git a/gluon/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-enable-fastd b/gluon/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-enable-fastd deleted file mode 100755 index f4fc6d5..0000000 --- a/gluon/gluon-mesh-vpn-fastd/files/lib/gluon/upgrade/mesh-vpn-fastd/invariant/010-enable-fastd +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -/etc/init.d/fastd enable