Changeset 5497725

Timestamp:

08/16/2022 11:53:17 AM (14 months ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

s6-init

Parents:

f836989

Message:

Updates...

Files:

• bootscripts/Makefile (modified) (2 diffs)
• bootscripts/s6/services/default/contents.d/hostname (added)
• bootscripts/s6/services/default/contents.d/mount-virtfs (added)
• bootscripts/s6/services/default/type (added)
• bootscripts/s6/services/hostname/up (added)
• bootscripts/s6/services/mount-procfs/type (added)
• bootscripts/s6/services/mount-procfs/up (added)
• bootscripts/s6/services/mount-sysfs/type (added)
• bootscripts/s6/services/mount-sysfs/up (added)
• bootscripts/s6/services/mount-virtfs/contents.d/mount-procfs (added)
• bootscripts/s6/services/mount-virtfs/contents.d/mount-sysfs (added)
• bootscripts/s6/services/mount-virtfs/type (added)
• chapter03/packages.xml (modified) (4 diffs)
• chapter09/bootscripts6.xml (modified) (1 diff)
• chapter09/usage6.xml (modified) (1 diff)

bootscripts/Makefile

@@ -11 +11 @@
 
 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:
@@ -129 +141 @@
           ${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
 

chapter03/packages.xml

@@ -184 +184 @@
 
     <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>
@@ -410 +410 @@
     </varlistentry>
 
-    <varlistentry revision="sysv">
+    <varlistentry revision="sysv,s6">
       <term>LFS-Bootscripts (&lfs-bootscripts-version;) - <token>&lfs-bootscripts-size;</token>:</term>
       <listitem>
@@ -667 +667 @@
 
     <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>
@@ -699 +699 @@
         <para>Download: <ulink url="&s6-init-url;"/></para>
         <para>MD5 sum: <literal>&s6-init-md5;</literal></para>
+      </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>

chapter09/bootscripts6.xml

@@ -46 +46 @@
     <para>Install the package:</para>
 
-<screen><userinput remap="install">make install</userinput></screen>
+<screen><userinput remap="install">make install-s6</userinput></screen>
 
   </sect2>

chapter09/usage6.xml

@@ -103 +103 @@
 
 <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>