diff options
| author | Phil Sutter <phil.sutter@viprinet.com> | 2011-01-07 18:21:51 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2011-01-10 10:45:27 +0100 |
| commit | 4935edd89d6019323d7c67fd9692cebe0f110496 (patch) | |
| tree | a09bdc84c9014813bfb0652452332167ef1e362f | |
| parent | 2d2cde54102a8cbb12753c7a67058154b6f9c035 (diff) | |
make installation of package network hooks optional
Signed-off-by: Phil Sutter <phil.sutter@viprinet.com>
| -rw-r--r-- | Config.in | 11 | ||||
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rw-r--r-- | package/ppp/Makefile | 4 |
3 files changed, 17 insertions, 0 deletions
@@ -58,6 +58,17 @@ config ADK_INSTALL_PACKAGE_INIT_SCRIPTS Note that without further customisation, turning this option off will almost certainly render the resulting system unusable. +config ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS + boolean "ship custom network-scripts along with packages" + default y + help + Turning this option to false will prevent the ADK from + installing network-scripts (i.e. files in /etc/network/) for + packages providing any. + + Note that without further customisation, turning this option + off will almost certainly render the resulting system unusable. + source "package/Config.in.auto.global" source "package/Config.in.auto" endmenu diff --git a/package/base-files/Makefile b/package/base-files/Makefile index a78326074..dee9fd9a4 100644 --- a/package/base-files/Makefile +++ b/package/base-files/Makefile @@ -45,7 +45,9 @@ endif mkdir -p $(IDIR_BASE_FILES)/usr/lib/ipkg/lists mkdir -p $(IDIR_BASE_FILES)/etc/crontabs mkdir -p $(IDIR_BASE_FILES)/{dev,boot,root,sys,proc,tmp,mnt} +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) mkdir -p $(IDIR_BASE_FILES)/etc/network/{if-pre-up.d,if-up.d,if-down.d,if-post-down.d} +endif mkdir -p $(IDIR_BASE_FILES)/usr/{lib,bin} chmod 755 $(IDIR_BASE_FILES)/lib/mdev/init chmod 600 $(IDIR_BASE_FILES)/etc/shadow diff --git a/package/ppp/Makefile b/package/ppp/Makefile index 591f3ca2a..2c71a603f 100644 --- a/package/ppp/Makefile +++ b/package/ppp/Makefile @@ -65,9 +65,11 @@ post-install: ${SUB_INSTALLS-m} ${SUB_INSTALLS-y} ${INSTALL_BIN} ./files/pon ${IDIR_PPP}/usr/sbin/ ${INSTALL_BIN} ./files/poff ${IDIR_PPP}/usr/sbin/ ${INSTALL_DIR} ${IDIR_PPP}/etc/ppp/peers +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) $(INSTALL_DIR) ${IDIR_PPP}/etc/network/if-pre-up.d $(INSTALL_BIN) ./files/ppp.pre-up \ ${IDIR_PPP}/etc/network/if-pre-up.d/05-ppp +endif mod-radius-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient @@ -110,11 +112,13 @@ mod-pppumts-install: ${INSTALL_DIR} ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates ${INSTALL_DATA} ./files/etc/ppp/templates/umts \ ${IDIR_PPP_MOD_PPPUMTS}/etc/ppp/templates/ +ifeq (${ADK_INSTALL_PACKAGE_NETWORK_SCRIPTS},y) $(INSTALL_DIR) ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-pre-up.d $(INSTALL_DIR) ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-post-down.d $(INSTALL_BIN) ./files/hso.if-up \ ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-pre-up.d/06-hso $(INSTALL_BIN) ./files/hso.if-down \ ${IDIR_PPP_MOD_PPPUMTS}/etc/network/if-post-down.d/06-hso +endif include ${TOPDIR}/mk/pkg-bottom.mk |