Changeset 193913e


Ignore:
Timestamp:
08/07/2022 04:00:23 PM (8 months ago)
Author:
Thomas Trepl (Moody) <thomas@…>
Branches:
s6-init
Children:
57c4c384
Parents:
f628276
Message:

First commit to add S6 as init system (like systemd)

Files:
8 added
21 edited

Legend:

Unmodified
Added
Removed

  • Makefile

    rf628276 r193913e  
    1919ifneq ($(REV), sysv)
    2020  ifneq ($(REV), systemd)
    21     $(error REV must be 'sysv' (default) or 'systemd'.)
     21    ifneq ($(REV), s6)
     22      $(error REV must be 'sysv' (default), 'systemd' or 's6'.)
     23    endif
    2224  endif
    2325endif
    2426
    2527ifeq ($(REV), sysv)
     28  # SysV
    2629  BASEDIR         ?= ~/lfs-book
    2730  PDF_OUTPUT      ?= LFS-BOOK.pdf
    … …  
    2932  DUMPDIR         ?= ~/cross-lfs-commands
    3033else
     34ifeq ($(REV), systemd)
     35  # systemd
    3136  BASEDIR         ?= ~/lfs-systemd
    3237  PDF_OUTPUT      ?= LFS-SYSD-BOOK.pdf
    3338  NOCHUNKS_OUTPUT ?= LFS-SYSD-BOOK.html
    3439  DUMPDIR         ?= ~/lfs-sysd-commands
     40else
     41  # S6
     42  BASEDIR         ?= ~/lfs-s6
     43  PDF_OUTPUT      ?= LFS-S6-BOOK.pdf
     44  NOCHUNKS_OUTPUT ?= LFS-S6-BOOK.html
     45  DUMPDIR         ?= ~/lfs-s6-commands
     46endif
    3547endif
    3648

  • chapter01/whatsnew.xml

    rf628276 r193913e  
    7272       <para>E2fsprogs-&e2fsprogs-version;</para>
    7373    </listitem>
    74     <!--<listitem revision="sysv">
     74    <!--<listitem revision="sysv,s6">
    7575       <para>Eudev-&eudev-version;</para>
    7676    </listitem>-->

  • chapter03/packages.xml

    rf628276 r193913e  
    175175    </varlistentry>
    176176
    177     <varlistentry revision="sysv">
     177    <varlistentry revision="sysv,s6">
    178178      <term>Eudev (&eudev-version;) - <token>&eudev-size;</token>:</term>
    179179      <listitem>
    180180        <para>Download: <ulink url="&eudev-url;"/></para>
    181181        <para>MD5 sum: <literal>&eudev-md5;</literal></para>
     182      </listitem>
     183    </varlistentry>
     184
     185    <varlistentry revision="s6">
     186      <term>execline (&execline-version;) - <token>&execline-size;</token>:</term>
     187      <listitem>
     188        <para>Home page: <ulink url="&execline-home;"/></para>
     189        <para>Download: <ulink url="&execline-url;"/></para>
     190        <para>MD5 sum: <literal>&execline-md5;</literal></para>
    182191      </listitem>
    183192    </varlistentry>
    … …  
    657666    </varlistentry>
    658667
     668    <varlistentry revision="s6">
     669      <term>skalibs (&skalibs-version;) - <token>&skalibs-size;</token>:</term>
     670      <listitem>
     671        <para>Home page: <ulink url="&skalibs-home;"/></para>
     672        <para>Download: <ulink url="&skalibs-url;"/></para>
     673        <para>MD5 sum: <literal>&skalibs-md5;</literal></para>
     674      </listitem>
     675    </varlistentry>
     676
     677    <varlistentry revision="s6">
     678      <term>S6 (&s6-version;) - <token>&s6-size;</token>:</term>
     679      <listitem>
     680        <para>Home page: <ulink url="&s6-home;"/></para>
     681        <para>Download: <ulink url="&s6-url;"/></para>
     682        <para>MD5 sum: <literal>&s6-md5;</literal></para>
     683      </listitem>
     684    </varlistentry>
     685
     686    <varlistentry revision="s6">
     687      <term>S6-rc (&s6-rc-version;) - <token>&s6-rc-size;</token>:</term>
     688      <listitem>
     689        <para>Home page: <ulink url="&s6-rc-home;"/></para>
     690        <para>Download: <ulink url="&s6-rc-url;"/></para>
     691        <para>MD5 sum: <literal>&s6-rc-md5;</literal></para>
     692      </listitem>
     693    </varlistentry>
     694
     695    <varlistentry revision="s6">
     696      <term>S6-linux-init (&s6-init-version;) - <token>&s6-init-size;</token>:</term>
     697      <listitem>
     698        <para>Home page: <ulink url="&s6-init-home;"/></para>
     699        <para>Download: <ulink url="&s6-init-url;"/></para>
     700        <para>MD5 sum: <literal>&s6-init-md5;</literal></para>
     701      </listitem>
     702    </varlistentry>
     703
    659704    <varlistentry revision="sysv">
    660705      <term>Sysklogd (&sysklogd-version;) - <token>&sysklogd-size;</token>:</term>
    … …  
    690735    </varlistentry>
    691736
    692 
    693737    <varlistentry revision="sysv">
    694738      <term>Sysvinit (&sysvinit-version;) - <token>&sysvinit-size;</token>:</term>
    … …  
    744788    </varlistentry>
    745789
    746     <varlistentry revision="sysv">
     790    <varlistentry revision="sysv,s6">
    747791      <term>Udev-lfs Tarball (&udev-lfs-version;) - <token>&udev-lfs-size;</token>:</term>
    748792      <listitem>

  • chapter07/createfiles.xml

    rf628276 r193913e  
    6161  command:</para>
    6262
    63 <screen revision="sysv"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
     63<screen revision="sysv,s6"><userinput>cat &gt; /etc/passwd &lt;&lt; "EOF"
    6464<literal>root:x:0:0:root:/root:/bin/bash
    6565bin:x:1:1:bin:/dev/null:/usr/bin/false
    … …  
    9393  command:</para>
    9494
    95 <screen revision="sysv"><userinput>cat &gt; /etc/group &lt;&lt; "EOF"
     95<screen revision="sysv,s6"><userinput>cat &gt; /etc/group &lt;&lt; "EOF"
    9696<literal>root:x:0:
    9797bin:x:1:daemon
    … …  
    169169  <systemitem class="groupname">tty</systemitem> group, and the number 5 is
    170170  also used in <phrase revision="systemd">systemd</phrase>
    171   <phrase revision="sysv"><filename>/etc/fstab</filename></phrase> for the
     171  <phrase revision="sysv,s6"><filename>/etc/fstab</filename></phrase> for the
    172172  <systemitem class="filesystem">devpts</systemitem> filesystem.
    173173  All other group names and GIDs can be chosen freely by the system

  • chapter08/chapter08.xml

    rf628276 r193913e  
    9797  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="procps.xml"/>
    9898  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="util-linux.xml"/>
    99 
    100   <!-- Both sysv and systemd builds -->
    10199  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="e2fsprogs.xml"/>
    102100
    … …  
    105103  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="sysvinit.xml"/>
    106104
     105  <!-- s6 only -->
     106  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="skalibs.xml"/>
     107  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="execline.xml"/>
     108  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="s6.xml"/>
     109  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="s6-rc.xml"/>
     110  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="s6-init.xml"/>
     111
    107112  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="aboutdebug.xml"/>
    108113  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="stripping.xml"/>

  • chapter08/eudev.xml

    rf628276 r193913e  
    66]>
    77
    8 <sect1 id="ch-system-eudev" role="wrap" revision="sysv">
     8<sect1 id="ch-system-eudev" role="wrap" revision="sysv,s6">
    99  <?dbhtml filename="eudev.html"?>
    1010
    … …  
    134134      <?dbfo list-presentation="list"?>
    135135      <?dbhtml list-presentation="table"?>
    136       <varlistentry id="udevadm" revision="sysv">
     136      <varlistentry id="udevadm" revision="sysv,s6">
    137137        <term><command>udevadm</command></term>
    138138        <listitem>

  • chapter08/man-db.xml

    rf628276 r193913e  
    5353            --with-grap=/usr/bin/grap</userinput></screen>
    5454
    55 <screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                         \
     55<screen revision="sysv,s6"><userinput remap="configure">./configure --prefix=/usr                         \
    5656            --docdir=/usr/share/doc/man-db-&man-db-version; \
    5757            --sysconfdir=/etc                     \
    … …  
    9898      </varlistentry>
    9999
    100       <varlistentry revision="sysv">
     100      <varlistentry revision="sysv,s6">
    101101        <term><parameter>--with-systemd...</parameter></term>
    102102        <listitem>

  • chapter08/meson.xml

    rf628276 r193913e  
    3636    </segmentedlist>
    3737
    38     <tip revision="sysv">
     38    <tip revision="sysv,s6">
    3939      <para>This section is not strictly required for LFS if not using
    4040      systemd. On the other hand, meson/ninja is a powerful build system,

  • chapter08/procps.xml

    rf628276 r193913e  
    4343    <para>Prepare procps-ng for compilation:</para>
    4444
    45 <screen revision="sysv"><userinput remap="configure">./configure --prefix=/usr                            \
     45<screen revision="sysv,s6"><userinput remap="configure">./configure --prefix=/usr                            \
    4646            --docdir=/usr/share/doc/procps-ng-&procps-ng-version; \
    4747            --disable-static                         \

  • chapter08/util-linux.xml

    rf628276 r193913e  
    4545    <para>Prepare Util-linux for compilation:</para>
    4646
    47 <screen revision="sysv"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
     47<screen revision="sysv,s6"><userinput remap="configure">./configure ADJTIME_PATH=/var/lib/hwclock/adjtime   \
    4848            --bindir=/usr/bin    \
    4949            --libdir=/usr/lib    \

  • chapter09/chapter09.xml

    rf628276 r193913e  
    2020  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="networkd.xml"/>
    2121
     22  <!-- s6 -->
     23  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="introduction6.xml"/>
     24  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="network6.xml"/>
     25  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="usage6.xml"/>
     26 
    2227  <!-- common -->
    2328  <xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="udev.xml"/>

  • chapter09/profile.xml

    rf628276 r193913e  
    66]>
    77
    8 <sect1 id="ch-config-profile" revision="sysv">
     8<sect1 id="ch-config-profile" revision="sysv,s6">
    99  <?dbhtml filename="profile.html"?>
    1010

  • chapter09/symlinks.xml

    rf628276 r193913e  
    1111  <title>Managing Devices</title>
    1212
    13   <sect2 revision="sysv">
     13  <sect2 revision="sysv,s6">
    1414
    1515    <title>Network Devices</title>
    … …  
    117117  </sect2>
    118118
    119   <sect2 revision="sysv">
     119  <sect2 revision="sysv,s6">
    120120
    121121    <title>CD-ROM symlinks</title>

  • chapter09/udev.xml

    rf628276 r193913e  
    1717
    1818  <para>In <xref linkend="chapter-building-system"/>, we installed the udev
    19   package when <phrase revision="sysv">eudev</phrase>
     19  package when <phrase revision="sysv,s6">eudev</phrase>
    2020  <phrase revision="systemd">systemd</phrase> was built. Before we go into the
    2121  details regarding how this works, a brief history of previous methods of
    … …  
    228228      on <quote>softdep</quote> syntax and capabilities.</para>
    229229
    230       <para revision="sysv">If the module in question is not a wrapper and is
     230      <para revision="sysv,s6">If the module in question is not a wrapper and is
    231231      useful by itself, configure the <command>modules</command> bootscript to
    232232      load this module on system boot. To do this, add the module name to the

  • chapter10/fstab.xml

    rf628276 r193913e  
    2020  file systems table like this:</para>
    2121
    22 <screen revision="sysv"><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
     22<screen revision="sysv,s6"><userinput>cat &gt; /etc/fstab &lt;&lt; "EOF"
    2323<literal># Begin /etc/fstab
    2424

  • chapter10/kernel.xml

    rf628276 r193913e  
    106106      not work correctly or boot at all:</para>
    107107
    108       <screen role="nodump" revision="sysv">General setup -->
     108      <screen role="nodump" revision="sysv,s6">General setup -->
    109109   [ ] Compile the kernel with warnings as errors [CONFIG_WERROR]
    110110   &lt; &gt; Enable kernel headers through /sys/kernel/kheaders.tar.xz [CONFIG_IKHEADERS]
    … …  
    157157    </note>
    158158
    159     <para revision="sysv">There are several other options that may be desired
     159    <para revision="sysv,s6">There are several other options that may be desired
    160160    depending on the requirements for the system. For a list of options needed
    161161    for BLFS packages, see the <ulink

  • chapter11/reboot.xml

    rf628276 r193913e  
    7676        <listitem><para>/root/.bash_profile          </para></listitem>
    7777        <listitem><para>/root/.bashrc                </para></listitem>
    78         <listitem revision="sysv"><para>/etc/sysconfig/ifconfig.eth0 </para></listitem>
     78        <listitem revision="sysv,s6"><para>/etc/sysconfig/ifconfig.eth0 </para></listitem>
    7979      </itemizedlist>
    8080    </listitem>

  • general.ent

    rf628276 r193913e  
    3131<!ENTITY errata          "&lfs-root;lfs/errata/systemd/">
    3232]]>
     33<![ %s6; [
     34<!ENTITY short-version   "svn-s6">    <!-- Used below in &blfs-book; -->
     35<!ENTITY errata          "&lfs-root;lfs/errata/development/">
     36]]>
    3337<!ENTITY generic-version "development"> <!-- Used below in
    3438                                             &patches-root;,
    … …  
    4549<!ENTITY version         "%relnum;-systemd">
    4650<!ENTITY short-version   "stable-systemd"> <!-- Used below in &blfs-book; -->
     51]]>
     52<![ %s6; [
     53<!ENTITY version         "%relnum;-s6">
     54<!ENTITY short-version   "%relnum;-s6">  <!-- Used below in &blfs-book; -->
    4755]]>
    4856<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
    … …  
    6472<!ENTITY short-version   "systemd">  <!-- Used below in &blfs-book; -->
    6573]]>
     74<![ %s6; [
     75<!ENTITY version         "%relnum;-s6-rc%rcnum;">
     76<!ENTITY short-version   "s6">  <!-- Used below in &blfs-book; -->
     77]]>
    6678<!ENTITY errata          "&lfs-root;lfs/errata/&version;/">
    6779<!ENTITY generic-version "%relnum;-rc%rcnum;"> <!-- Used below in
    … …  
    7890<![ %systemd; [
    7991<!ENTITY wget-list       "wget-list-systemd">
     92]]>
     93<![ %s6; [
     94<!ENTITY wget-list       "wget-list-s6">
    8095]]>
    8196

  • git-version.sh

    rf628276 r193913e  
    44        SYSV="INCLUDE"
    55        SYSTEMD="IGNORE "
     6        S6="IGNORE "
    67elif [ "$1" = systemd ]; then
    78        SYSV="IGNORE "
    89        SYSTEMD="INCLUDE"
     10        S6="IGNORE "
     11elif [ "$1" = s6 ]; then
     12        SYSV="IGNORE "
     13        SYSTEMD="IGNORE "
     14        S6="INCLUDE "
    915else
    1016        echo You must provide either \"sysv\" or \"systemd\" as argument
    … …  
    1420echo "<!ENTITY % sysv    \"$SYSV\">"     >  conditional.ent
    1521echo "<!ENTITY % systemd \"$SYSTEMD\">"  >> conditional.ent
     22echo "<!ENTITY % s6      \"$S6\">"       >> conditional.ent
    1623
    1724if ! git status > /dev/null; then
    … …  
    2330        echo "<![ %systemd; ["                                 >> version.ent
    2431        echo "<!ENTITY version           \"unknown-systemd\">" >> version.ent
     32        echo "]]>"                                             >> version.ent
     33        echo "<![ %s6; ["                                      >> version.ent
     34        echo "<!ENTITY version           \"unknown-s6\">"      >> version.ent
    2535        echo "]]>"                                             >> version.ent
    2636        echo "<!ENTITY releasedate       \"unknown\">"         >> version.ent
    … …  
    5262version="$rev"
    5363versiond="$rev-systemd"
     64version6="$rev-s6"
    5465
    5566if [ "$(git diff HEAD | wc -l)" != "0" ]; then
    5667        version="$version+"
    5768        versiond="$versiond+"
     69        version6="$version6+"
    5870fi
    5971
    … …  
    6476echo "<!ENTITY version          \"$versiond\">"            >> version.ent
    6577echo "]]>"                                                 >> version.ent
     78echo "<![ %s6; ["                                          >> version.ent
     79echo "<!ENTITY version          \"$version6\">"            >> version.ent
     80echo "]]>"                                                 >> version.ent
    6681echo "<!ENTITY releasedate       \"$full_date\">"          >> version.ent
    6782echo "<!ENTITY copyrightdate     \"1999-$year\">"          >> version.ent

  • packages.ent

    rf628276 r193913e  
    163163<!ENTITY eudev-fin-du "83 MB">
    164164<!ENTITY eudev-fin-sbu "0.2 SBU">
     165
     166<!ENTITY execline-version "2.9.0.1"><!-- S6 init -->
     167<!ENTITY execline-size "9999 KB">
     168<!ENTITY execline-url "https://skarnet.org/software/execline/execline-&execline-version;.tar.gz">
     169<!ENTITY execline-md5 "8652a16f687ff766da137e199f9183e0">
     170<!ENTITY execline-home "https://skarnet.org/software/execline/">
     171<!ENTITY execline-tmp-du "9999 MB">
     172<!ENTITY execline-tmp-sbu "9999 SBU">
     173<!ENTITY execline-fin-du "9999 MB">
     174<!ENTITY execline-fin-sbu "9999 SBU">
    165175
    166176<!ENTITY expat-version "2.4.8">
    … …  
    615625<!ENTITY readline-fin-sbu "0.1 SBU">
    616626
     627<!ENTITY skalibs-version "2.12.0.1"><!-- S6 init -->
     628<!ENTITY skalibs-size "9999 KB">
     629<!ENTITY skalibs-url "https://skarnet.org/software/skalibs/skalibs-&skalibs-version;.tar.gz">
     630<!ENTITY skalibs-md5 "296c02c94adea3355faed44e65893d2e">
     631<!ENTITY skalibs-home "https://skarnet.org/software/skalibs/">
     632<!ENTITY skalibs-tmp-du "9999 MB">
     633<!ENTITY skalibs-tmp-sbu "9999 SBU">
     634<!ENTITY skalibs-fin-du "9999 MB">
     635<!ENTITY skalibs-fin-sbu "9999 SBU">
     636
     637<!ENTITY s6-version "2.11.1.2"><!-- S6 init -->
     638<!ENTITY s6-size "9999 KB">
     639<!ENTITY s6-url "https://skarnet.org/software/s6/s6-&s6-version;.tar.gz">
     640<!ENTITY s6-md5 "55725b335698c79d41ebde5608bf313d">
     641<!ENTITY s6-home "https://skarnet.org/software/s6/">
     642<!ENTITY s6-tmp-du "9999 MB">
     643<!ENTITY s6-tmp-sbu "9999 SBU">
     644<!ENTITY s6-fin-du "9999 MB">
     645<!ENTITY s6-fin-sbu "9999 SBU">
     646
     647<!ENTITY s6-rc-version "0.5.3.2"><!-- S6 init -->
     648<!ENTITY s6-rc-size "9999 KB">
     649<!ENTITY s6-rc-url "https://skarnet.org/software/s6-rc/s6-rc-&s6-rc-version;.tar.gz">
     650<!ENTITY s6-rc-md5 "30395a4bfaea2b1720765b087a0d7aa9">
     651<!ENTITY s6-rc-home "https://skarnet.org/software/s6-rc/">
     652<!ENTITY s6-rc-tmp-du "9999 MB">
     653<!ENTITY s6-rc-tmp-sbu "9999 SBU">
     654<!ENTITY s6-rc-fin-du "9999 MB">
     655<!ENTITY s6-rc-fin-sbu "9999 SBU">
     656
     657<!ENTITY s6-init-version "1.0.8.0"><!-- S6 init -->
     658<!ENTITY s6-init-size "9999 KB">
     659<!ENTITY s6-init-url "https://skarnet.org/software/s6-linux-init/s6-linux-init-&s6-init-version;.tar.gz">
     660<!ENTITY s6-init-md5 "c970118871adc59c2c8126a83fb93589">
     661<!ENTITY s6-init-home "https://skarnet.org/software/s6-linux-init/">
     662<!ENTITY s6-init-tmp-du "9999 MB">
     663<!ENTITY s6-init-tmp-sbu "9999 SBU">
     664<!ENTITY s6-init-fin-du "9999 MB">
     665<!ENTITY s6-init-fin-sbu "9999 SBU">
     666
    617667<!ENTITY sed-version "4.8">
    618668<!ENTITY sed-size "1,317 KB">

  • prologue/why.xml

    rf628276 r193913e  
    138138      </listitem>
    139139
    140       <listitem revision="sysv">
     140      <listitem revision="sysv,s6">
    141141        <para>Eudev</para>
    142142
Note: See TracChangeset for help on using the changeset viewer.