summaryrefslogtreecommitdiff
path: root/package/ppp
diff options
context:
space:
mode:
authorPhil Sutter <phil.sutter@viprinet.com>2012-01-12 19:36:25 +0100
committerWaldemar Brodkorb <wbx@openadk.org>2012-01-15 11:03:39 +0100
commit6eb624f2ea2133cfb5d8f9a6e8633c386a75a8f9 (patch)
tree007eda4c1803042ceff04eed912107b7ead61480 /package/ppp
parent361b9c3c78c1b51c2fc0c496b99ce99d7be423f2 (diff)
Allow leaving /etc as untouched as possible
For customized setups, it's hard to control what files get installed into /etc since in addition to the base-files package, any other package may install a sample config. When two packages provide the same file, which one of them makes it into the image depends on the order of them being installed. Solving this problem is not as trivial, as there are packages which must be allowed to install stuff into /etc. Best examples are base-files and ca-certificates. This patch solves the problem by adding another PKG_template flag "force_etc", which one can define in order to override the as well new Config.in symbol "ADK_LEAVE_ETC_ALONE".
Diffstat (limited to 'package/ppp')
-rw-r--r--package/ppp/Makefile4
1 files changed, 0 insertions, 4 deletions
diff --git a/package/ppp/Makefile b/package/ppp/Makefile
index 250089b4b..cc0928f20 100644
--- a/package/ppp/Makefile
+++ b/package/ppp/Makefile
@@ -57,11 +57,9 @@ post-install:
${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
ppp-mod-radius-install:
${INSTALL_DIR} ${IDIR_PPP_MOD_RADIUS}/etc/radiusclient
@@ -104,13 +102,11 @@ ppp-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