summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Korsgaard <jacmet@sunsite.dk>2011-04-22 13:27:14 +0200
committerPeter Korsgaard <jacmet@sunsite.dk>2011-04-22 13:38:17 +0200
commitaf6b3ecf401935edfe613c2d90423f34bc38460e (patch)
tree0ba16be322aa69c63b113c88878ee8e2e46ca2db
parent983158e225c2947010e078bcd2f62205d9ee6911 (diff)
downloadbuildroot-novena-af6b3ecf401935edfe613c2d90423f34bc38460e.tar.gz
buildroot-novena-af6b3ecf401935edfe613c2d90423f34bc38460e.zip
proftpd: remove UseIPv6 option from sample config if built without IPv6
proftpd refuses to start if it finds a UseIPv6 option in the configuration file (even if set to off) when built without IPv6 support, so comment out line. Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
-rw-r--r--package/proftpd/proftpd.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/package/proftpd/proftpd.mk b/package/proftpd/proftpd.mk
index 191f61149..75ab930ff 100644
--- a/package/proftpd/proftpd.mk
+++ b/package/proftpd/proftpd.mk
@@ -31,6 +31,7 @@ define PROFTPD_INSTALL_TARGET_CMDS
$(INSTALL) -D -m 0755 $(@D)/proftpd $(TARGET_DIR)/usr/sbin/proftpd
@if [ ! -f $(TARGET_DIR)/etc/proftpd.conf ]; then \
$(INSTALL) -m 0644 -D $(@D)/sample-configurations/basic.conf $(TARGET_DIR)/etc/proftpd.conf; \
+ $(if $(BR2_INET_IPV6),,$(SED) 's/^UseIPv6/# UseIPv6/' $(TARGET_DIR)/etc/proftpd.conf;) \
fi
$(INSTALL) -m 0755 package/proftpd/S50proftpd $(TARGET_DIR)/etc/init.d
endef