diff options
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | Makefile.am | 5 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | scripts/Makemodule.am | 6 | ||||
| -rw-r--r-- | scripts/overlay.sh | 21 | ||||
| -rw-r--r-- | services/Makemodule.am | 5 | ||||
| -rw-r--r-- | services/rootusr.in | 5 | ||||
| -rw-r--r-- | services/tmpfsrun | 11 | ||||
| -rw-r--r-- | services/tmpfsvar.in | 12 |
9 files changed, 1 insertions, 79 deletions
@@ -25,8 +25,6 @@ services/sigterm services/devfs services/procfs services/sysfs -services/tmpfsvar -services/rootusr scripts/devfs.sh diff --git a/Makefile.am b/Makefile.am index e7d1982..ad977d4 100644 --- a/Makefile.am +++ b/Makefile.am @@ -28,11 +28,6 @@ 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 dbdbf75..c7a870b 100644 --- a/configure.ac +++ b/configure.ac @@ -13,17 +13,6 @@ 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])]) - - UL_WARN_ADD([-Wall]) UL_WARN_ADD([-Wextra]) UL_WARN_ADD([-Wunused]) @@ -63,8 +52,6 @@ AC_CONFIG_FILES([services/sigterm]) AC_CONFIG_FILES([services/sysfs]) AC_CONFIG_FILES([services/devfs]) AC_CONFIG_FILES([services/procfs]) -AC_CONFIG_FILES([services/tmpfsvar]) -AC_CONFIG_FILES([services/rootusr]) AC_CONFIG_FILES([scripts/devfs.sh]) AC_CONFIG_FILES([etc/initd.env]) diff --git a/scripts/Makemodule.am b/scripts/Makemodule.am index dd3fa0b..3326860 100644 --- a/scripts/Makemodule.am +++ b/scripts/Makemodule.am @@ -1,7 +1,3 @@ helper_SCRIPTS += scripts/devfs.sh scripts/trymount.sh -if PYGOSCFG -helper_SCRIPTS += scripts/overlay.sh -endif - -EXTRA_DIST += scripts/trymount.sh scripts/overlay.sh +EXTRA_DIST += scripts/trymount.sh diff --git a/scripts/overlay.sh b/scripts/overlay.sh deleted file mode 100644 index 090671c..0000000 --- a/scripts/overlay.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/sh - -lower=/cfg/preserve/${1} -upper=/cfg/overlay/${1} -work=/cfg/overlay/${1}_work -target=${2} - -if [ ! -d "$target" ]; then - exit -fi - -if [ -d "$lower" ]; then - if [ -d "$upper" ]; then - mkdir -p "$work" - mount -t overlay overlay \ - -olowerdir=${lower},upperdir=${upper},workdir=${work} \ - ${target} - else - mount --bind "$lower" "$target" - fi -fi diff --git a/services/Makemodule.am b/services/Makemodule.am index 3c714a6..7187aab 100644 --- a/services/Makemodule.am +++ b/services/Makemodule.am @@ -6,11 +6,6 @@ init_DATA += services/sigterm services/sync services/devfs init_DATA += services/sysfs services/procfs services/tmpfs init_DATA += services/vfs -if PYGOSCFG -init_DATA += services/rootusr services/tmpfsrun services/tmpfsvar -endif - EXTRA_DIST += services/sysinit services/vfs services/agetty services/hostname EXTRA_DIST += services/hwclock services/loopback services/reboot EXTRA_DIST += services/shutdown services/sync services/sysctl services/tmpfs -EXTRA_DIST += services/tmpfsrun diff --git a/services/rootusr.in b/services/rootusr.in deleted file mode 100644 index fb173db..0000000 --- a/services/rootusr.in +++ /dev/null @@ -1,5 +0,0 @@ -description "mount /root" -type wait -target boot -before vfs -exec "@SCRIPTDIR@/overlay.sh" root /root diff --git a/services/tmpfsrun b/services/tmpfsrun deleted file mode 100644 index 07dbd0a..0000000 --- a/services/tmpfsrun +++ /dev/null @@ -1,11 +0,0 @@ -description "mount /run" -type wait -target boot -before vfs -after tmpfsvar -exec { - mount -t tmpfs none /run - mkdir /run/lock -m 0755 - ln -s /run /var/run - ln -s /run/lock /var/lock -} diff --git a/services/tmpfsvar.in b/services/tmpfsvar.in deleted file mode 100644 index 5f45ecd..0000000 --- a/services/tmpfsvar.in +++ /dev/null @@ -1,12 +0,0 @@ -description "mount /var" -type wait -target boot -before vfs -exec { - mount -t tmpfs none /var - mkdir /var/log -m 0755 - mkdir /var/spool -m 0755 - mkdir /var/lib -m 0755 - mkdir /var/tmp -m 0755 - "@SCRIPTDIR@/overlay.sh" var_lib /var/lib -} |