[FE training-materials-updates] Let every session have its own lab archives

[Michael Opdenacker]

Repository : git://git.free-electrons.com/training-materials.git

On branch  : master
Link       : http://git.free-electrons.com/training-materials/commit/?id=5a8228b10686864c1943c60ddcf796950a9c670d

>---------------------------------------------------------------

commit 5a8228b10686864c1943c60ddcf796950a9c670d
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date:   Wed Sep 18 15:32:44 2013 +0200

    Let every session have its own lab archives
    
    - Useful to allow different sessions to use different
      versions of the lab archives, instead of a file that
      is the same for everyone.
    
    Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>


>---------------------------------------------------------------

5a8228b10686864c1943c60ddcf796950a9c670d
 Makefile             |    3 ++-
 labs/setup/setup.tex |   15 +++++++++------
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index aace23e..41b9ee8 100644
--- a/Makefile
+++ b/Makefile
@@ -392,12 +392,13 @@ LABS_TEX      = \
 	common/labs-footer.tex
 LABS_PICTURES = $(call PICTURES,$(foreach s,$(LABS_CHAPTERS),labs/$(s))) $(COMMON_PICTURES)
 
-%-labs.pdf: common/labs.sty $(LABS_TEX) $(LABS_PICTURES)
+%-labs.pdf: common/labs.sty $(VARS) $(LABS_TEX) $(LABS_PICTURES)
 	@mkdir -p $(OUTDIR)
 # We generate a .tex file with \input{} directives (instead of just
 # concatenating all files) so that when there is an error, we are
 # pointed at the right original file and the right line in that file.
 	rm -f $(OUTDIR)/$(basename $@).tex
+	echo "\input{$(VARS)}" >> $(OUTDIR)/$(basename $@).tex
 	for f in $(filter %.tex,$^) ; do \
 		echo -n "\input{../"          >> $(OUTDIR)/$(basename $@).tex ; \
 		echo -n $$f | sed 's%\.tex%%' >> $(OUTDIR)/$(basename $@).tex ; \
diff --git a/labs/setup/setup.tex b/labs/setup/setup.tex
index af6708c..5b05b78 100644
--- a/labs/setup/setup.tex
+++ b/labs/setup/setup.tex
@@ -6,12 +6,15 @@ For the different labs in the training, your instructor has prepared a
 set of data (kernel images, kernel configurations, root filesystems
 and more). Download and extract its tarball from a terminal:
 
-\begin{verbatim}
-cd
-wget http://free-electrons.com/labs/labs.tar.xz
-sudo tar Jxf labs.tar.xz
-sudo chown -R <user>.<user> felabs
-\end{verbatim}
+
+{\small
+{\tt
+cd \\
+wget \sessionurl/labs.tar.xz \\
+sudo tar Jxf labs.tar.xz \\
+sudo chown -R <user>.<user> felabs \\
+}
+}
 
 Note that using \code{root} permissions are required to extract the
 character and block device files contained in this lab archive. This is