Author: krejzi
Date: Sat May 18 05:28:30 2013
New Revision: 10279
Log:
Rename systemd-units to network-scripts.
Added:
branches/systemd/BOOK/network-scripts/
- copied from r10278, branches/systemd/BOOK/systemd-units/
Deleted:
branches/systemd/BOOK/systemd-units/
Modified:
branches/systemd/BOOK/Makefile
branches/systemd/BOOK/aux-file-data.sh
branches/systemd/BOOK/chapter03/packages.xml
branches/systemd/BOOK/make-aux-files.sh
branches/systemd/BOOK/packages.ent
branches/systemd/BOOK/process-scripts.sh
Modified: branches/systemd/BOOK/Makefile
==============================================================================
--- branches/systemd/BOOK/Makefile Sat May 18 04:52:02 2013 (r10278)
+++ branches/systemd/BOOK/Makefile Sat May 18 05:28:30 2013 (r10279)
@@ -110,7 +110,7 @@
$(Q)xsltproc --xinclude --nonet --output $(BASEDIR)/md5sums \
stylesheets/md5sum.xsl chapter03/chapter03.xml
$(Q)sed -i -e \
- "s/LFS-UNITS-MD5SUM/$(shell md5sum lfs-systemd-units*.tar.bz2 | cut -d'
' -f1)/" \
+ "s/LFS-NETSCRIPTS-MD5SUM/$(shell md5sum lfs-network-scripts*.tar.bz2 |
cut -d' ' -f1)/" \
$(BASEDIR)/md5sums
dump-commands: validate
Modified: branches/systemd/BOOK/aux-file-data.sh
==============================================================================
--- branches/systemd/BOOK/aux-file-data.sh Sat May 18 04:52:02 2013
(r10278)
+++ branches/systemd/BOOK/aux-file-data.sh Sat May 18 05:28:30 2013
(r10279)
@@ -10,7 +10,7 @@
./make-aux-files.sh
# Bootscript data
-bootscripts=$(ls lfs-systemd-units*.bz2)
+bootscripts=$(ls lfs-network-scripts*.bz2)
base=$(basename $bootscripts .tar.bz2)
bootsize=$(ls -lk $bootscripts | cut -f5 -d" ")
bootmd5=$(md5sum $bootscripts | cut -f1 -d" ")
@@ -24,7 +24,7 @@
popd > /dev/null
rm -rf $TMP_DIR
-sed -i -e s/LFS-UNITS-SIZE/$bootsize/ \
- -e s/LFS-UNITS-INSTALL-KB/$bootinstallsize/ \
- -e s/LFS-UNITS-MD5SUM/$bootmd5/ $FILE
+sed -i -e s/LFS-NETSCRIPTS-SIZE/$bootsize/ \
+ -e s/LFS-NETSCRIPTS-INSTALL-KB/$bootinstallsize/ \
+ -e s/LFS-NETSCRIPTS-MD5SUM/$bootmd5/ $FILE
Modified: branches/systemd/BOOK/chapter03/packages.xml
==============================================================================
--- branches/systemd/BOOK/chapter03/packages.xml Sat May 18 04:52:02
2013 (r10278)
+++ branches/systemd/BOOK/chapter03/packages.xml Sat May 18 05:28:30
2013 (r10279)
@@ -357,11 +357,11 @@
</varlistentry>
<varlistentry>
- <term>LFS-Systemd-Units (&lfs-systemd-units-version;) -
<token>&lfs-systemd-units-size;</token>:</term>
+ <term>LFS-Network-Scripts (&lfs-network-scripts-version;) -
<token>&lfs-network-scripts-size;</token>:</term>
<listitem>
- <para>Home page: <ulink url="&lfs-systemd-units-home;"/></para>
- <para>Download: <ulink url="&lfs-systemd-units-url;"/></para>
- <para>MD5 sum: <literal>&lfs-systemd-units-md5;</literal></para>
+ <para>Home page: <ulink url="&lfs-network-scripts-home;"/></para>
+ <para>Download: <ulink url="&lfs-network-scripts-url;"/></para>
+ <para>MD5 sum: <literal>&lfs-network-scripts-md5;</literal></para>
</listitem>
</varlistentry>
Modified: branches/systemd/BOOK/make-aux-files.sh
==============================================================================
--- branches/systemd/BOOK/make-aux-files.sh Sat May 18 04:52:02 2013
(r10278)
+++ branches/systemd/BOOK/make-aux-files.sh Sat May 18 05:28:30 2013
(r10279)
@@ -1,11 +1,11 @@
#!/bin/bash
-rm -f lfs-systemd-units*.tar.bz2
+rm -f lfs-network-scripts*.tar.bz2
# Get base file name and move bootscripts directory to that name
-version=`grep "ENTITY lfs-systemd-units-version" packages.ent |cut -d'"' -f2`
-mv systemd-units lfs-systemd-units-$version
+version=`grep "ENTITY lfs-network-scripts-version" packages.ent |cut -d'"' -f2`
+mv network-scripts lfs-network-scripts-$version
# Create the tarball and clean up
-tar -cjf lfs-systemd-units-$version.tar.bz2 --exclude .svn
lfs-systemd-units-$version
-mv lfs-systemd-units-$version systemd-units
+tar -cjf lfs-network-scripts-$version.tar.bz2 --exclude .svn
lfs-network-scripts-$version
+mv lfs-network-scripts-$version network-scripts
Modified: branches/systemd/BOOK/packages.ent
==============================================================================
--- branches/systemd/BOOK/packages.ent Sat May 18 04:52:02 2013 (r10278)
+++ branches/systemd/BOOK/packages.ent Sat May 18 05:28:30 2013 (r10279)
@@ -350,13 +350,13 @@
<!ENTITY less-ch6-du "3.6 MB">
<!ENTITY less-ch6-sbu "less than 0.1 SBU">
-<!ENTITY lfs-systemd-units-version "20130518"> <!-- Scripts
depend on this format -->
-<!ENTITY lfs-systemd-units-size "LFS-UNITS-SIZE KB"> <!-- Updated in
Makefile -->
-<!ENTITY lfs-systemd-units-url
"&downloads-root;lfs-systemd-units-&lfs-systemd-units-version;.tar.bz2">
-<!ENTITY lfs-systemd-units-md5 "LFS-UNITS-MD5SUM"> <!-- Updated in
Makefile -->
-<!ENTITY lfs-systemd-units-home " ">
-<!ENTITY lfs-systemd-units-ch7-du "LFS-UNITS-INSTALL-KB KB"> <!-- Updated in
Makefile -->
-<!ENTITY lfs-systemd-units-ch7-sbu "less than 0.1 SBU">
+<!ENTITY lfs-network-scripts-version "20130518"> <!-- Scripts
depend on this format -->
+<!ENTITY lfs-network-scripts-size "LFS-NETSCRIPTS-SIZE KB"> <!--
Updated in Makefile -->
+<!ENTITY lfs-network-scripts-url
"&downloads-root;lfs-network-scripts-&lfs-network-scripts-version;.tar.bz2">
+<!ENTITY lfs-network-scripts-md5 "LFS-NETSCRIPTS-MD5SUM"> <!--
Updated in Makefile -->
+<!ENTITY lfs-network-scripts-home " ">
+<!ENTITY lfs-network-scripts-ch7-du "LFS-NETSCRIPTS-INSTALL-KB KB"> <!--
Updated in Makefile -->
+<!ENTITY lfs-network-scripts-ch7-sbu "less than 0.1 SBU">
<!ENTITY libcap-version "2.22">
<!ENTITY libcap-size "66 KB">
Modified: branches/systemd/BOOK/process-scripts.sh
==============================================================================
--- branches/systemd/BOOK/process-scripts.sh Sat May 18 04:52:02 2013
(r10278)
+++ branches/systemd/BOOK/process-scripts.sh Sat May 18 05:28:30 2013
(r10279)
@@ -1,10 +1,10 @@
#!/bin/bash
# Boot scripts
-for s in systemd-units/lfs/lib/services/* \
- systemd-units/lfs/sbin/* \
- systemd-units/lfs/tmpfiles/* \
- systemd-units/lfs/units/*
+for s in network-scripts/lfs/lib/services/* \
+ network-scripts/lfs/sbin/* \
+ network-scripts/lfs/tmpfiles/* \
+ network-scripts/lfs/units/*
do
script=$(basename $s)
--
http://linuxfromscratch.org/mailman/listinfo/lfs-book
FAQ: http://www.linuxfromscratch.org/lfs/faq.html
Unsubscribe: See the above information page