Merge from bittboy/buildroot@26c91a9

package/radvd/50-radvd.preset

@@ -0,0 +1 @@
+disable radvd.service

package/radvd/Config.in

@@ -1,8 +1,15 @@
 config BR2_PACKAGE_RADVD
 	bool "radvd"
 	depends on BR2_USE_MMU # fork()
-	select BR2_PACKAGE_FLEX
 	help
 	  IPv6 Router Advertisement Daemon.
 
+	  On busybox and sysvinit systems, radvd will be started only if
+	  a /etc/radvd.conf exists.
+
+	  To enable it at build time with systemd, add /etc/radvd.conf
+	  and a /etc/systemd/system-preset/40-radvd.preset file with
+
+	    enable radvd.service
+
 	  http://www.litech.org/radvd/

package/radvd/radvd.mk

@@ -6,7 +6,7 @@
 
 RADVD_VERSION = 2.18
 RADVD_SITE = http://www.litech.org/radvd/dist
-RADVD_DEPENDENCIES = host-bison flex host-flex host-pkgconf
+RADVD_DEPENDENCIES = host-bison host-flex host-pkgconf
 # We need to ignore <linux/if_arp.h>, because radvd already includes
 # <net/if_arp.h>, which conflicts with <linux/if_arp.h>.
 RADVD_CONF_ENV = \
@@ -17,6 +17,12 @@ RADVD_AUTORECONF = YES
 RADVD_LICENSE = BSD-4-Clause-like
 RADVD_LICENSE_FILES = COPYRIGHT
 
+# We don't provide /etc/radvd.conf, so disable the service by default.
+define RADVD_INSTALL_INIT_SYSTEMD
+	$(INSTALL) -D -m 0644 package/radvd/50-radvd.preset \
+		$(TARGET_DIR)/usr/lib/systemd/system-preset/50-radvd.preset
+endef
+
 define RADVD_INSTALL_INIT_SYSV
 	$(INSTALL) -D -m 0755 package/radvd/S50radvd $(TARGET_DIR)/etc/init.d/S50radvd
 endef