8:48 a.m.
ClassRoomManual/en-US/Class_Room_Manual.xml | 13 ++++--
ClassRoomManual/en-US/Manual-Appendix.xml | 59 +++++++++++++++++++++++++++-
Makefile | 4 -
3 files changed, 69 insertions(+), 7 deletions(-)
New commits:
commit 0f1c74c6125109bf82867a21410544498bf45897
Author: Jeroen van Meeuwen (Fedora Unity) <kanarip(a)fedoraunity.org>
Date: Wed Dec 10 15:47:52 2008 +0100
Minor updates
diff --git a/ClassRoomManual/en-US/Class_Room_Manual.xml
b/ClassRoomManual/en-US/Class_Room_Manual.xml
index 9f2fa69..3f3c294 100644
--- a/ClassRoomManual/en-US/Class_Room_Manual.xml
+++ b/ClassRoomManual/en-US/Class_Room_Manual.xml
@@ -505,9 +505,14 @@ service tftp
<formalpara>
<title>startrom.n12</title>
<para>
- <filename>startrom.n12</filename> or
<filename>startrom.n1_</filename> in the
<filename>\i386\</filename> folder)
+ <filename>startrom.n12</filename> or
<filename>startrom.n1_</filename> in the
<filename>\i386\</filename> folder
</para>
</formalpara>
+ <warning>
+ <para>
+ In case you experience errors with the
<filename>startrom.n12</filename> or
<filename>startrom.n1_</filename> from the Windows XP CD-ROM, try using the
version from Windows 2003.
+ </para>
+ </warning>
</listitem>
<listitem>
<formalpara>
@@ -554,10 +559,10 @@ service tftp
</listitem>
<listitem>
<para>
- If what you find is a file
<filename>startrom.n1_</filename>, copy it to a temporary location and expand
it using the following commands:
+ If what you find is a file
<filename>startrom.n1_</filename>, install the
<application>cabextract</application> package, copy
<filename>startrom.n1_</filename> to a temporary location and expand it using
the following commands:
<screen>$ <userinput>cp startrom.n1_
/tmp/</userinput>
$ <userinput>cd /tmp/</userinput>
-$ <userinput>expand startrom.n1_</userinput></screen>
+$ <userinput>cabextract startrom.n1_</userinput></screen>
</para>
</listitem>
<listitem>
@@ -620,7 +625,7 @@ $ <userinput>expand
startrom.n1_</userinput></screen>
<section
id="ClassRoomManual-WindowsInstallationsOverTheNetwork-WindowsVista">
<title>Windows Vista</title>
<para>
- Nothing on this subject, yet.
+ We've not figured this one out, yet.
</para>
</section>
diff --git a/ClassRoomManual/en-US/Manual-Appendix.xml
b/ClassRoomManual/en-US/Manual-Appendix.xml
index 02207f7..c506f60 100644
--- a/ClassRoomManual/en-US/Manual-Appendix.xml
+++ b/ClassRoomManual/en-US/Manual-Appendix.xml
@@ -277,6 +277,9 @@ exit
<appendix id="ClassRoomManual-Appendix-VLANs">
<title>Switch VLAN Overview</title>
<para>
+ Each VLAN in this list has specific features. In general, a VLAN may have a
router interface, may have a DHCP server, may have a DNS server.
+ </para>
+ <para>
<segmentedlist>
<segtitle>VLAN #</segtitle>
<segtitle>Description</segtitle>
@@ -353,8 +356,62 @@ exit
<appendix id="ClassRoomManual-Appendix-ExampleNetworkSetups">
<title>Example Network Setups</title>
<para>
- para
+ Listed are some example network setups with an explanation of the exercise
and what the network is supposed to look like.
</para>
+
+ <section
id="ClassRoomManual-Appendix-ExampleNetworkSetups-MCSA-70-291">
+ <title>MCSA 70-291</title>
+ <para>
+ In the Microsoft Certified Systems Administrator track, exam 70-291 is
titled "Windows 2003 Network Infrastructure", and amongst other things,
attendees learn to set up a DHCP server, RAS, a DNS server, zone-specific forwarders and
static network routes.
+ </para>
+ <para>
+ When attendees start running DHCP servers, we will want their clients to
be in a private network segment so their client computers (each odd machine out of 8
machines in total) can only pick up DHCP leases from the server system (each even machine
out of 8 machines in total).
+ </para>
+ <para>
+ When attendees start configuring static routes between one server-client
pair of computers and another server-client pair, we will want each of the servers
connected to the same network segment.
+ </para>
+ <para>
+ To this end, we configure one network interface of the systems that are
going to be used as clients (pc1, pc3, pc5 and pc7) to be in a VLAN without a router and
without a DHCP server. The other interface on the system remains disconnected.
+ </para>
+ <para>
+ The systems that are going to be used as a server (pc2, pc4, pc6 and pc8)
need one interface connected to the same network segment as the clients, while the other
interface can remain connected to the default network segment (VLAN 1).
+ </para>
+ <para>
+ Log on to the switch using telnet or a terminal emulator;
+ </para>
+ <para>
+ <screen>Username: jmeeuwen
+Password:
+switch1#sis
+
+Port Name Status Vlan Duplex Speed Type
+------- ------------------ ------------ -------- ------ ------- ----
+Fa0/1 ** pc1/nic1 ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/2 ** pc1/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/3 ** pc2/nic1 ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/4 ** pc2/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/5 ** pc3/nic1 ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/6 ** pc3/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/7 ** pc4/nic1 ** notconnect 1 Auto Auto 100BaseTX/FX
+Fa0/8 ** pc4/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/9 ** pc5/nic1 ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/10 ** pc5/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/11 ** pc6/nic1 ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/12 ** pc6/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/13 ** pc7/nic1 ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/14 ** pc7/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/15 ** pc8/nic1 ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/16 ** pc8/nic2 ** disabled 1 Auto Auto 100BaseTX/FX
+Fa0/17 ** guest ** notconnect 1 Auto Auto 100BaseTX/FX
+Fa0/18 ** guest ** notconnect 1 Auto Auto 100BaseTX/FX
+Fa0/19 ** guest ** notconnect 1 Auto Auto 100BaseTX/FX
+Fa0/20 ** SERVER ** connected trunk A-Full A-100 100BaseTX/FX
+Fa0/21 notconnect 1 Auto Auto 100BaseTX/FX
+Fa0/22 ** Bar PC ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/23 ** GELE Kabel ** connected 1 A-Full A-100 100BaseTX/FX
+Fa0/24 ** NASU ** connected 1 A-Full A-100 100BaseTX/FX
+</screen>
+ </section>
</appendix>
<appendix id="ClassRoomManual-Appendix-ExampleWinnt.sif">
diff --git a/Makefile b/Makefile
index c3b8ec2..ca4cdac 100644
--- a/Makefile
+++ b/Makefile
@@ -35,8 +35,8 @@ int-workshop:
html: clean int-workshop html-en-US
fpeople: html
- rsync -aHvz --delete --progress --rsh=ssh tmp/en-US/html/
fedorapeople.org:./public_html/Courses/
+ rsync -aHvz --progress --rsh=ssh tmp/en-US/html/
fedorapeople.org:./public_html/Courses/
kanarip: html
- rsync -rlHvz --delete --progress --rsh=ssh tmp/en-US/html/
pinky:/data/www/kanarip.com/www/public_html/courses/
+ rsync -rlHvz --progress --rsh=ssh tmp/en-US/html/
pinky:/data/www/kanarip.com/www/public_html/courses/