diff options
| author | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-12 05:22:15 +0200 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@tele2.at> | 2018-04-12 09:50:07 +0200 |
| commit | e148e873e05e4ebe4d7a90cdbe8cdd72618eb7ac (patch) | |
| tree | 797208a6ad8e7bde171ae2c9cdd27e7a323390ed | |
| parent | 24043cc4eedd11bca8adc27491aafe80e14a8a86 (diff) | |
Add configure switch to disable pygos specific config defaults
Signed-off-by: David Oberhollenzer <david.oberhollenzer@tele2.at>
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | scripts/Makemodule.am | 6 | ||||
| -rw-r--r-- | services/Makemodule.am | 7 |
4 files changed, 23 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 42111b4..2323042 100644 --- a/Makefile.am +++ b/Makefile.am @@ -27,9 +27,11 @@ install-data-local: $(LN_S) $(TEMPLATEDIR)/sysfs $(DESTDIR)$(SVCDIR)/sysfs $(LN_S) $(TEMPLATEDIR)/devfs $(DESTDIR)$(SVCDIR)/devfs $(LN_S) $(TEMPLATEDIR)/tmpfs $(DESTDIR)$(SVCDIR)/tmpfs +if PYGOSCFG $(LN_S) $(TEMPLATEDIR)/tmpfsrun $(DESTDIR)$(SVCDIR)/tmpfsrun $(LN_S) $(TEMPLATEDIR)/tmpfsvar $(DESTDIR)$(SVCDIR)/tmpfsvar $(LN_S) $(TEMPLATEDIR)/rootusr $(DESTDIR)$(SVCDIR)/rootusr +endif $(LN_S) $(TEMPLATEDIR)/vfs $(DESTDIR)$(SVCDIR)/vfs $(LN_S) $(TEMPLATEDIR)/shutdown $(DESTDIR)$(SVCDIR)/shutdown $(LN_S) $(TEMPLATEDIR)/reboot $(DESTDIR)$(SVCDIR)/reboot diff --git a/configure.ac b/configure.ac index 3ac614a..2f16261 100644 --- a/configure.ac +++ b/configure.ac @@ -10,6 +10,17 @@ AC_PROG_RANLIB AC_PROG_MKDIR_P AC_PROG_LN_S +AC_ARG_WITH([pygos], + [AS_HELP_STRING([--without-pygos], + [Disable Pygos specific default configuration])], + [case "${withval}" in + yes) AM_CONDITIONAL([PYGOSCFG], [true]) ;; + no) AM_CONDITIONAL([PYGOSCFG], [false]) ;; + *) AC_MSG_ERROR([bad value ${withval} for --without-pygos]) ;; + esac], + [AM_CONDITIONAL([PYGOSCFG], [true])]) + + AC_CONFIG_HEADERS([lib/include/config.h]) AC_DEFINE_DIR(SVCDIR, sysconfdir/init.d, [Startup service directory]) AC_DEFINE_DIR(TEMPLATEDIR, datadir/init, [Service template directory]) diff --git a/scripts/Makemodule.am b/scripts/Makemodule.am index d09b603..7ed5b10 100644 --- a/scripts/Makemodule.am +++ b/scripts/Makemodule.am @@ -1,2 +1,6 @@ scriptdir = @SCRIPTDIR@ -script_SCRIPTS = scripts/devfs.sh scripts/trymount.sh scripts/overlay.sh +script_SCRIPTS = scripts/devfs.sh scripts/trymount.sh + +if PYGOSCFG +script_SCRIPTS += scripts/overlay.sh +endif diff --git a/services/Makemodule.am b/services/Makemodule.am index a19d833..5f3c1bb 100644 --- a/services/Makemodule.am +++ b/services/Makemodule.am @@ -4,7 +4,10 @@ init_DATA += services/sysctl services/hwclock services/sysinit init_DATA += services/reboot services/shutdown services/sigkill init_DATA += services/sigterm services/sync services/devfs init_DATA += services/sysfs services/procfs services/tmpfs -init_DATA += services/tmpfsrun services/tmpfsvar services/vfs -init_DATA += services/rootusr +init_DATA += services/vfs + +if PYGOSCFG +init_DATA += services/rootusr services/tmpfsrun services/tmpfsvar +endif EXTRA_DIST += services/sysinit services/vfs |