diff options
| author | Alex Gronenwoud <alex@linuxfromscratch.org> | 2003-11-05 22:27:01 +0000 |
|---|---|---|
| committer | Alex Gronenwoud <alex@linuxfromscratch.org> | 2003-11-05 22:27:01 +0000 |
| commit | 24351aab563ccf53b0a723a289883b34ad17db55 (patch) | |
| tree | 5364523266319e2b66da6ae4743bae9c17a9d4b6 | |
| parent | 33ea9e926c8167fa94935d33bcbd7c15cf111f7d (diff) | |
Moving keyboard configuration and password setting to Kbd and Shadow.
git-svn-id: http://svn.linuxfromscratch.org/LFS/trunk/BOOK@3065 4aa44e1e-78dd-0310-a6d2-fbcd4c07a689
| -rw-r--r-- | chapter06/chapter06.xml | 1 | ||||
| -rw-r--r-- | chapter06/configure.xml | 11 | ||||
| -rw-r--r-- | chapter06/kbd.xml | 2 | ||||
| -rw-r--r-- | chapter06/shadowpwd.xml | 3 | ||||
| -rw-r--r-- | entities/book-structure.xml | 1 |
5 files changed, 5 insertions, 13 deletions
diff --git a/chapter06/chapter06.xml b/chapter06/chapter06.xml index 9f482c1f7..bb8db1fad 100644 --- a/chapter06/chapter06.xml +++ b/chapter06/chapter06.xml @@ -63,7 +63,6 @@ &c6-gcc-2953; &c6-revisedchroot; &c6-bootscripts; -&c6-configure; </chapter> diff --git a/chapter06/configure.xml b/chapter06/configure.xml deleted file mode 100644 index c80f29a3a..000000000 --- a/chapter06/configure.xml +++ /dev/null @@ -1,11 +0,0 @@ -<sect1 id="ch06-configure"> -<title>Configuring system components</title> -<?dbhtml filename="configure.html" dir="chapter06"?> - -<para>Now that all software is installed, all that we need to do is perform -a few configuration tasks.</para> - -&c6-cf-keyboard; -&c6-cf-password; - -</sect1> diff --git a/chapter06/kbd.xml b/chapter06/kbd.xml index 14b20f15a..0f4894751 100644 --- a/chapter06/kbd.xml +++ b/chapter06/kbd.xml @@ -33,5 +33,7 @@ not installed. First enable the compilation of these utilities:</para> </sect2> +&c6-cf-keyboard; + </sect1> diff --git a/chapter06/shadowpwd.xml b/chapter06/shadowpwd.xml index 271f8c8f5..7aa21651f 100644 --- a/chapter06/shadowpwd.xml +++ b/chapter06/shadowpwd.xml @@ -112,6 +112,9 @@ installed by Shadow:</para> <screen><userinput>rm /bin/groups</userinput></screen> </sect2> + &c6-cf-shadowpwd; +&c6-cf-password; + </sect1> diff --git a/entities/book-structure.xml b/entities/book-structure.xml index 1b9a3181d..dd94fadc6 100644 --- a/entities/book-structure.xml +++ b/entities/book-structure.xml @@ -45,7 +45,6 @@ <!ENTITY c6-createfiles SYSTEM "../chapter06/createfiles.xml"> <!ENTITY c6-adjustingtoolchain SYSTEM "../chapter06/adjustingtoolchain.xml"> <!ENTITY c6-revisedchroot SYSTEM "../chapter06/revisedchroot.xml"> -<!ENTITY c6-configure SYSTEM "../chapter06/configure.xml"> <!ENTITY c6-cf-keyboard SYSTEM "../chapter06/config-keyboard.xml"> <!ENTITY c6-cf-password SYSTEM "../chapter06/create-password.xml"> |