diff options
| -rw-r--r-- | bootscripts/Makefile | 14 | ||||
| -rw-r--r-- | bootscripts/s6/services/default/contents.d/hostname | 0 | ||||
| -rw-r--r-- | bootscripts/s6/services/default/contents.d/mount-virtfs | 0 | ||||
| -rw-r--r-- | bootscripts/s6/services/default/type | 1 | ||||
| -rw-r--r-- | bootscripts/s6/services/hostname/up | 1 | ||||
| -rw-r--r-- | bootscripts/s6/services/mount-procfs/type | 1 | ||||
| -rw-r--r-- | bootscripts/s6/services/mount-procfs/up | 1 | ||||
| -rw-r--r-- | bootscripts/s6/services/mount-sysfs/type | 1 | ||||
| -rw-r--r-- | bootscripts/s6/services/mount-sysfs/up | 1 | ||||
| -rw-r--r-- | bootscripts/s6/services/mount-virtfs/contents.d/mount-procfs | 0 | ||||
| -rw-r--r-- | bootscripts/s6/services/mount-virtfs/contents.d/mount-sysfs | 0 | ||||
| -rw-r--r-- | bootscripts/s6/services/mount-virtfs/type | 1 | ||||
| -rw-r--r-- | chapter03/packages.xml | 15 | ||||
| -rw-r--r-- | chapter09/bootscripts6.xml | 2 | ||||
| -rw-r--r-- | chapter09/usage6.xml | 4 |
15 files changed, 35 insertions, 7 deletions
diff --git a/bootscripts/Makefile b/bootscripts/Makefile index 16d26b317..47de45ad0 100644 --- a/bootscripts/Makefile +++ b/bootscripts/Makefile @@ -11,6 +11,18 @@ all: links install: all +install-s6: s6-files + +s6-dirs: + install -d -m ${DIRMODE} ${ETCDIR}/s6-rc/services + +s6-files: s6-dirs + cp -a s6/services/mount-virtfs ${ETCDIR}/s6-rc/services/ + cp -a s6/services/mount-procfs ${ETCDIR}/s6-rc/services/ + cp -a s6/services/mount-sysfs ${ETCDIR}/s6-rc/services/ + cp -a s6/services/hostname ${ETCDIR}/s6-rc/services/ + cp -a s6/services/default ${ETCDIR}/s6-rc/services/ + create-dirs: install -d -m ${DIRMODE} ${ETCDIR}/rc.d/rc0.d install -d -m ${DIRMODE} ${ETCDIR}/rc.d/rc1.d @@ -128,5 +140,5 @@ uninstall: ${SBIN}/ifup ${SBIN}/ifdown ${MAN8}/ifup.8 ${MAN8}/ifdown.8 \ ${ETCDIR}/sysconfig/rc -.PHONY: all create-dirs install files links rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6 uninstall +.PHONY: all create-dirs install files links rcS rc0 rc1 rc2 rc3 rc4 rc5 rc6 uninstall install-s6 diff --git a/bootscripts/s6/services/default/contents.d/hostname b/bootscripts/s6/services/default/contents.d/hostname new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/bootscripts/s6/services/default/contents.d/hostname diff --git a/bootscripts/s6/services/default/contents.d/mount-virtfs b/bootscripts/s6/services/default/contents.d/mount-virtfs new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/bootscripts/s6/services/default/contents.d/mount-virtfs diff --git a/bootscripts/s6/services/default/type b/bootscripts/s6/services/default/type new file mode 100644 index 000000000..757b42211 --- /dev/null +++ b/bootscripts/s6/services/default/type @@ -0,0 +1 @@ +bundle diff --git a/bootscripts/s6/services/hostname/up b/bootscripts/s6/services/hostname/up new file mode 100644 index 000000000..a10440d60 --- /dev/null +++ b/bootscripts/s6/services/hostname/up @@ -0,0 +1 @@ +backtick -En hostname { cat /etc/hostname } s6-hostname $hostname diff --git a/bootscripts/s6/services/mount-procfs/type b/bootscripts/s6/services/mount-procfs/type new file mode 100644 index 000000000..bdd22a185 --- /dev/null +++ b/bootscripts/s6/services/mount-procfs/type @@ -0,0 +1 @@ +oneshot diff --git a/bootscripts/s6/services/mount-procfs/up b/bootscripts/s6/services/mount-procfs/up new file mode 100644 index 000000000..f198029aa --- /dev/null +++ b/bootscripts/s6/services/mount-procfs/up @@ -0,0 +1 @@ +s6-mount -wt proc proc /proc diff --git a/bootscripts/s6/services/mount-sysfs/type b/bootscripts/s6/services/mount-sysfs/type new file mode 100644 index 000000000..bdd22a185 --- /dev/null +++ b/bootscripts/s6/services/mount-sysfs/type @@ -0,0 +1 @@ +oneshot diff --git a/bootscripts/s6/services/mount-sysfs/up b/bootscripts/s6/services/mount-sysfs/up new file mode 100644 index 000000000..780be7bc4 --- /dev/null +++ b/bootscripts/s6/services/mount-sysfs/up @@ -0,0 +1 @@ +s6-mount -wt sysfs sys /sys diff --git a/bootscripts/s6/services/mount-virtfs/contents.d/mount-procfs b/bootscripts/s6/services/mount-virtfs/contents.d/mount-procfs new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/bootscripts/s6/services/mount-virtfs/contents.d/mount-procfs diff --git a/bootscripts/s6/services/mount-virtfs/contents.d/mount-sysfs b/bootscripts/s6/services/mount-virtfs/contents.d/mount-sysfs new file mode 100644 index 000000000..e69de29bb --- /dev/null +++ b/bootscripts/s6/services/mount-virtfs/contents.d/mount-sysfs diff --git a/bootscripts/s6/services/mount-virtfs/type b/bootscripts/s6/services/mount-virtfs/type new file mode 100644 index 000000000..757b42211 --- /dev/null +++ b/bootscripts/s6/services/mount-virtfs/type @@ -0,0 +1 @@ +bundle diff --git a/chapter03/packages.xml b/chapter03/packages.xml index 4edc5950c..fa6080f0f 100644 --- a/chapter03/packages.xml +++ b/chapter03/packages.xml @@ -183,7 +183,7 @@ </varlistentry> <varlistentry revision="s6"> - <term>execline (&execline-version;) - <token>&execline-size;</token>:</term> + <term>Execline (&execline-version;) - <token>&execline-size;</token>:</term> <listitem> <para>Home page: <ulink url="&execline-home;"/></para> <para>Download: <ulink url="&execline-url;"/></para> @@ -409,7 +409,7 @@ </listitem> </varlistentry> - <varlistentry revision="sysv"> + <varlistentry revision="sysv,s6"> <term>LFS-Bootscripts (&lfs-bootscripts-version;) - <token>&lfs-bootscripts-size;</token>:</term> <listitem> <para>Home page: <ulink url="&lfs-bootscripts-home;"/></para> @@ -666,7 +666,7 @@ </varlistentry> <varlistentry revision="s6"> - <term>skalibs (&skalibs-version;) - <token>&skalibs-size;</token>:</term> + <term>Skalibs (&skalibs-version;) - <token>&skalibs-size;</token>:</term> <listitem> <para>Home page: <ulink url="&skalibs-home;"/></para> <para>Download: <ulink url="&skalibs-url;"/></para> @@ -701,6 +701,15 @@ </listitem> </varlistentry> + <varlistentry revision="s6"> + <term>S6-utils (&s6-utils-version;) - <token>&s6-utils-size;</token>:</term> + <listitem> + <para>Home page: <ulink url="&s6-utils-home;"/></para> + <para>Download: <ulink url="&s6-utils-url;"/></para> + <para>MD5 sum: <literal>&s6-utils-md5;</literal></para> + </listitem> + </varlistentry> + <varlistentry revision="sysv"> <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term> <listitem> diff --git a/chapter09/bootscripts6.xml b/chapter09/bootscripts6.xml index 3e3d2779f..8b966b5f8 100644 --- a/chapter09/bootscripts6.xml +++ b/chapter09/bootscripts6.xml @@ -45,7 +45,7 @@ <para>Install the package:</para> -<screen><userinput remap="install">make install</userinput></screen> +<screen><userinput remap="install">make install-s6</userinput></screen> </sect2> diff --git a/chapter09/usage6.xml b/chapter09/usage6.xml index 081340d17..ae1ea7f51 100644 --- a/chapter09/usage6.xml +++ b/chapter09/usage6.xml @@ -102,12 +102,12 @@ directory representing the current setup:</para> <screen><userinput>s6-linux-init-maker -1 -G "/sbin/agetty -J 38400 tty1" $tmpdir -mv $tmpdir /etc/etc/s6-linux-init/current +mv $tmpdir /etc/s6-linux-init/current </userinput></screen> <para>Install the essential programs in the file system:</para> -<screen><userinput>cp -av /etc/etc/s6-linux-init/current/bin/* /sbin/</userinput></screen> +<screen><userinput>cp -av /etc/s6-linux-init/current/bin/* /sbin/</userinput></screen> </sect2> |