Changeset 1b85bf1

Timestamp:

03/28/2022 03:45:09 AM (2 years ago)

Author:

Thomas Trepl (Moody) <thomas@…>

Branches:

multilib

Children:

a7e5537

Parents:

355d761 (diff), cf30814b (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Automatic merge of trunk into multilib

Files:

• appendices/acknowledgments.xml (modified) (2 diffs)
• bootscripts/Makefile (modified) (1 diff)
• chapter08/man-db.xml (modified) (3 diffs)
• packages.ent (modified) (1 diff)

appendices/acknowledgments.xml

@@ -98 +98 @@
       translation project</para>
     </listitem>
-
+<!--
     <listitem>
       <para><ulink url="mailto:info@linuxfromscratch.org.ru">Anton Maisak</ulink>
@@ -110 +110 @@
       translation project</para>
     </listitem>
-
+-->
   </itemizedlist>
 

bootscripts/Makefile

@@ -118 +118 @@
         ln -sf ../init.d/network     ${ETCDIR}/rc.d/rc6.d/K80network
         ln -sf ../init.d/sysklogd    ${ETCDIR}/rc.d/rc6.d/K90sysklogd
-        ln -sf ../init.d/sendsignals ${ETCDIR}/rc.d/rc0.d/K92sendsignals
-        ln -sf ../init.d/swap        ${ETCDIR}/rc.d/rc0.d/K94swap
-        ln -sf ../init.d/mountfs     ${ETCDIR}/rc.d/rc0.d/K96mountfs
-        ln -sf ../init.d/localnet    ${ETCDIR}/rc.d/rc0.d/K98localnet
+        ln -sf ../init.d/sendsignals ${ETCDIR}/rc.d/rc6.d/K92sendsignals
+        ln -sf ../init.d/swap        ${ETCDIR}/rc.d/rc6.d/K94swap
+        ln -sf ../init.d/mountfs     ${ETCDIR}/rc.d/rc6.d/K96mountfs
+        ln -sf ../init.d/localnet    ${ETCDIR}/rc.d/rc6.d/K98localnet
         ln -sf ../init.d/reboot      ${ETCDIR}/rc.d/rc6.d/S99reboot
 

chapter08/man-db.xml

@@ -210 +210 @@
             <entry>Indonesian (id)</entry>
             <entry>ISO-8859-1</entry>
-            <entry>Russian (ru)</entry>
-            <entry>KOI8-R</entry>
+            <entry>Greek (el)</entry>
+            <entry>ISO-8859-7</entry>
+            <!--<entry>Russian (ru)</entry>-->
+            <!--<entry>KOI8-R</entry>-->
           </row>
           <row>
@@ -279 +281 @@
             <entry>BIG5</entry>
           </row>
-          <row>
+<!--          <row>
             <entry>Greek (el)</entry>
             <entry>ISO-8859-7</entry>
@@ -285 +287 @@
             <entry></entry>
           </row>
-
+-->
         </tbody>
 

packages.ent

@@ -395 +395 @@
 <!ENTITY less-fin-sbu "less than 0.1 SBU">
 
-<!ENTITY lfs-bootscripts-version "20220324">      <!-- Scripts depend on this format -->
+<!ENTITY lfs-bootscripts-version "20220327">      <!-- Scripts depend on this format -->
 <!ENTITY lfs-bootscripts-size "BOOTSCRIPTS-SIZE KB">
 <!ENTITY lfs-bootscripts-url "&downloads-root;lfs-bootscripts-&lfs-bootscripts-version;.tar.xz">