[FE training-materials-updates] Replace /media by /media/$USER
Michael Opdenacker
michael.opdenacker at free-electrons.com
Mon Sep 29 13:17:30 CEST 2014
Repository : git://git.free-electrons.com/training-materials.git
On branch : master
Link : http://git.free-electrons.com/training-materials/commit/?id=c282e296a49aba02ca7d1bedbbbc588f28c2b222
>---------------------------------------------------------------
commit c282e296a49aba02ca7d1bedbbbc588f28c2b222
Author: Michael Opdenacker <michael.opdenacker at free-electrons.com>
Date: Mon Sep 29 13:16:30 2014 +0200
Replace /media by /media/$USER
- According to the switch from Ubuntu 12.04 to 14.04
Signed-off-by: Michael Opdenacker <michael.opdenacker at free-electrons.com>
>---------------------------------------------------------------
c282e296a49aba02ca7d1bedbbbc588f28c2b222
lab-data/linux-kernel/bootloader/beaglebone-black/README.txt | 2 +-
labs/boottime-getting-started/boottime-getting-started.tex | 4 ++--
labs/boottime-init-scripts/boottime-init-scripts.tex | 4 ++--
labs/boottime-install/boottime-install.tex | 4 ++--
labs/boottime-kernel/boottime-kernel.tex | 4 ++--
labs/boottime-measuring/boottime-measuring.tex | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/lab-data/linux-kernel/bootloader/beaglebone-black/README.txt b/lab-data/linux-kernel/bootloader/beaglebone-black/README.txt
index 9137c06..e342b4f 100644
--- a/lab-data/linux-kernel/bootloader/beaglebone-black/README.txt
+++ b/lab-data/linux-kernel/bootloader/beaglebone-black/README.txt
@@ -46,7 +46,7 @@ Now, format the first partition in FAT format:
sudo mkfs.vfat -F 16 /dev/mmcblk0p1 -n boot
Remove the card and insert it again. It should automatically be mounted
-'/media/boot' (or '/media/$USER/boot' if you are using Ubuntu 12.10 or later).
+on '/media/$USER/boot'.
Now, copy the below files to this partition:
diff --git a/labs/boottime-getting-started/boottime-getting-started.tex b/labs/boottime-getting-started/boottime-getting-started.tex
index ab9b126..a56ec8e 100644
--- a/labs/boottime-getting-started/boottime-getting-started.tex
+++ b/labs/boottime-getting-started/boottime-getting-started.tex
@@ -91,7 +91,7 @@ ATMEL. You can download SAM-BA at
flash drive as follows:
\begin{verbatim}
-cp /media/BootTime/downloads/sam-ba_2.12.zip .
+cp /media/$USER/BootTime/downloads/sam-ba_2.12.zip .
unzip sam-ba_2.12.zip
\end{verbatim}
@@ -117,7 +117,7 @@ not broken by Atmel updates.}.
Let's take the copy of the demo from the USB flash drive and extract it:
\begin{verbatim}
-cp /media/BootTime/downloads/sama5d3xek-demo.tar.xz .
+cp /media/$USER/BootTime/downloads/sama5d3xek-demo.tar.xz .
tar xf sama5d3xek-demo.tar.xz
\end{verbatim}
diff --git a/labs/boottime-init-scripts/boottime-init-scripts.tex b/labs/boottime-init-scripts/boottime-init-scripts.tex
index 39d172d..856d4c8 100644
--- a/labs/boottime-init-scripts/boottime-init-scripts.tex
+++ b/labs/boottime-init-scripts/boottime-init-scripts.tex
@@ -87,11 +87,11 @@ chart:
\begin{verbatim}
cd /opt/boot-time-labs/buildroot/
-cp /media/BootTime/downloads/bootchart-0.9.tar.bz2 .
+cp /media/$USER/BootTime/downloads/bootchart-0.9.tar.bz2 .
tar xf bootchart-0.9.tar.bz2
cd bootchart-0.9
ant
-java -jar bootchart.jar /media/BootTime/bootlog.tgz
+java -jar bootchart.jar /media/$USER/BootTime/bootlog.tgz
\end{verbatim}
This produces the \code{bootlog.png} image which you can visualize to
diff --git a/labs/boottime-install/boottime-install.tex b/labs/boottime-install/boottime-install.tex
index 96c3857..07e4d93 100644
--- a/labs/boottime-install/boottime-install.tex
+++ b/labs/boottime-install/boottime-install.tex
@@ -114,9 +114,9 @@ should appear:
Now let's fill this disk with data needed during the workshop:
{\small
\begin{verbatim}
-cd /media/BootTime
+cd /media/$USER/BootTime
wget -r -np -nH --cut-dirs=2 --reject "index.html*" http://free-electrons.com/labs/boottime/
-sudo umount /media/BootTime
+sudo umount /media/$USER/BootTime
\end{verbatim}
}
diff --git a/labs/boottime-kernel/boottime-kernel.tex b/labs/boottime-kernel/boottime-kernel.tex
index a70efeb..c40f693 100644
--- a/labs/boottime-kernel/boottime-kernel.tex
+++ b/labs/boottime-kernel/boottime-kernel.tex
@@ -16,7 +16,7 @@ Plug-in your USB disk and type the below commands:
\begin{verbatim}
cd /opt/boot-time-labs/kernel
-cp /media/BootTime/downloads/linux-3.6.9-at91.tar.xz .
+cp /media/$USER/BootTime/downloads/linux-3.6.9-at91.tar.xz .
tar xf linux-3.6.9-at91.tar.xz
source env.sh
cd linux-3.6.9-at91
@@ -88,7 +88,7 @@ from this debug information:
\begin{verbatim}
cd /opt/boot-time-labs/kernel
-cp /media/BootTime/initcall_debug.log .
+cp /media/$USER/BootTime/initcall_debug.log .
perl linux-3.6.9-at91/scripts/bootgraph.pl initcall_debug.log > boot.svg
\end{verbatim}
diff --git a/labs/boottime-measuring/boottime-measuring.tex b/labs/boottime-measuring/boottime-measuring.tex
index 08c74ea..5bee81a 100644
--- a/labs/boottime-measuring/boottime-measuring.tex
+++ b/labs/boottime-measuring/boottime-measuring.tex
@@ -43,7 +43,7 @@ Download it and put it in your \code{PATH}:
\begin{verbatim}
cd
mkdir bin && cd bin
-cp /media/BootTime/downloads/grabserial .
+cp /media/$USER/BootTime/downloads/grabserial .
chmod a+x grabserial
\end{verbatim}
@@ -186,7 +186,7 @@ won't work):
\begin{verbatim}
cd /opt/boot-time-labs/buildroot/
-tar xf /media/BootTime/precompiled/buildroot-at91-`arch`.tar.xz
+tar xf /media/$USER/BootTime/precompiled/buildroot-at91-`arch`.tar.xz
\end{verbatim}
You can see that the above command automatically picks up the right
More information about the training-materials-updates
mailing list