aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-11-23 22:07:03 +0100
committerDavid Oberhollenzer <david.oberhollenzer@tele2.at>2018-11-23 22:16:50 +0100
commit6ed7e164c8b9e6a15e74ed92f49f156298aa50cb (patch)
tree453a19c3409a757d6d54e4a25ff5e13f797e0a92
parent39fcca747f535ceeb7fb7e30b55eaab7e72fbf9d (diff)
Add configure flag for dhcpcd
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
-rw-r--r--Makefile.am3
-rw-r--r--configure.ac9
-rw-r--r--services/Makemodule.am6
3 files changed, 16 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am
index 06bf306..3fb4686 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -40,6 +40,9 @@ install-data-local:
$(LN_S) $(TEMPLATEDIR)/tmpfsrun $(DESTDIR)$(SVCDIR)/tmpfsrun
$(LN_S) $(TEMPLATEDIR)/tmpfsvar $(DESTDIR)$(SVCDIR)/tmpfsvar
$(LN_S) $(TEMPLATEDIR)/gcrond $(DESTDIR)$(SVCDIR)/gcrond
+if DHCPCLIENT
+ $(LN_S) $(TEMPLATEDIR)/dhcpcdmaster $(DESTDIR)$(SVCDIR)/dhcpcdmaster
+endif
if SWCLOCK
$(LN_S) $(TEMPLATEDIR)/swclock $(DESTDIR)$(SVCDIR)/swclock
$(LN_S) $(TEMPLATEDIR)/swclocksave $(DESTDIR)$(SVCDIR)/swclocksave@reboot
diff --git a/configure.ac b/configure.ac
index fcd0e67..f447465 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,4 +50,13 @@ AC_ARG_ENABLE([swclock],
esac],
[AM_CONDITIONAL([SWCLOCK], [false])])
+AC_ARG_ENABLE([dhcpclient],
+ [AS_HELP_STRING([--enable-dhcpclient], [Enable DHCP client])],
+ [case "${enableval}" in
+ yes) AM_CONDITIONAL([DHCPCLIENT], [true]) ;;
+ no) AM_CONDITIONAL([DHCPCLIENT], [false]) ;;
+ *) AC_MSG_ERROR([bad value ${enableval} for --enable-dhcpclient]) ;;
+ esac],
+ [AM_CONDITIONAL([DHCPCLIENT], [false])])
+
AC_OUTPUT([Makefile])
diff --git a/services/Makemodule.am b/services/Makemodule.am
index b2a0309..3baf46f 100644
--- a/services/Makemodule.am
+++ b/services/Makemodule.am
@@ -4,14 +4,16 @@ init_DATA += services/sysctl services/hwclock services/sysinit
init_DATA += services/sigterm services/sync services/devfs
init_DATA += services/sysfs services/procfs services/tmpfs
init_DATA += services/vfs services/ifrename services/ifcfg
-init_DATA += services/dhcpcd services/dhcpcdmaster services/unbound
-init_DATA += services/dnsmasq services/ifdown services/modules
+init_DATA += services/unbound services/dnsmasq services/ifdown services/modules
init_DATA += services/network services/hostapd services/nft services/sigkill
init_DATA += services/sshd services/sshd_keygen services/consolefont
init_DATA += services/nginx services/usyslogd services/klogd
init_DATA += services/gcrond services/mountusr
init_DATA += services/tmpfsrun services/tmpfsvar
+if DHCPCLIENT
+init_DATA += services/dhcpcd services/dhcpcdmaster
+endif
if SWCLOCK
init_DATA += services/swclock services/swclocksave
endif