diff --git a/lectures/froscon/kiss.tex b/lectures/froscon/kiss.tex
index 6aa56c1318ebb2104186318ba2f7f58bf4ed75a1..0d1f6525b85167f3b368f4c329fd7e1a528937d0 100644
--- a/lectures/froscon/kiss.tex
+++ b/lectures/froscon/kiss.tex
@@ -59,7 +59,7 @@
\item im Sommersemester anhaltend niedrig
\item möglich Gründe \pause
\begin{itemize}\setlength{\itemsep}{.35ex}
- \item Linux ist Selbsterklärend
+ \item Linux ist selbsterklärend
\item Anleitungen gut / Videos vom letzten Mal
\item schlechte / zu wenig Werbung
\item ungünstige Termine
diff --git a/lectures/froscon/lip.tex b/lectures/froscon/lip.tex
index d503412e67054da10faf9c805d79867226758168..e8f9c37387269fd87406e675f6148b8facea0d5c 100644
--- a/lectures/froscon/lip.tex
+++ b/lectures/froscon/lip.tex
@@ -7,7 +7,7 @@
\end{figure}
\pause
\begin{itemize}
-\item einmal pro Semester im großen Hörsaal Physik
+\item am Anfang jedes Semester im großen Hörsaal Physik (Anfang April SS / Mitte Oktober WS )
\item überwiegend gut besucht (WS ca. 80 Teilnehmer, SS ca. 40)
\item meist Erst- und Zweitsemester (der MPI-Fächer)
\item offen für alle
@@ -83,7 +83,7 @@
};
}
- \visible<8->{\draw [thick](1.3cm, 3cm) -- (0, 3 cm) node [above,align=center,midway] { WS 11 };
+ \visible<7->{\draw [thick](1.3cm, 3cm) -- (0, 3 cm) node [above,align=center,midway] { WS 11 };
\draw [thick](1.3cm, 3cm) -- (2, 3cm) -- (2.5, 3cm) node[right, align=left] {
ab hier überwiegend \\
gute Teilnehmerzahlen
@@ -91,7 +91,7 @@
};
}
-\visible<11->{ \draw [thick](1.3cm, 2cm) -- (0, 2 cm) node [above,align=center,midway] { SS 12 };
+\visible<9->{ \draw [thick](1.3cm, 2cm) -- (0, 2 cm) node [above,align=center,midway] { SS 12 };
\draw [thick](1.3cm, 2cm) -- (2, 1.5cm) -- (2.5, 1.5cm) node[right, align=left] {
MBR-Platten mit 4 Partionen ab Werk\\
Lösung: LDM + LVM + GRUB4DOS \\
@@ -100,7 +100,7 @@
};
}
- \visible<14->{\draw [thick](1.3cm, 1cm) -- (0, 1 cm) node [above,align=center,midway] { WS 12 };
+ \visible<11->{\draw [thick](1.3cm, 1cm) -- (0, 1 cm) node [above,align=center,midway] { WS 12 };
\draw [thick](1.3cm, 1cm) -- (2, 0cm) -- (2.5, 0cm) node[right, align=left] {
\textbf{1. Custom Image} mit UCK\\
Image ohne Kernel, Nacht davor zum Fixen
@@ -113,11 +113,11 @@
% draw nodes
\visible<3->{\draw [thick] (0, 5.7) -- (-6pt, 5.7) node[left] {\textcolor<3-4>{releaseColor}{Ubuntu 10.04}};}
-\visible<4->{\draw [thick] (0, 4.7) -- (-6pt, 4.7) node[left] {\textcolor<6-7>{releaseColor}{Ubuntu 10.10}};}
-\visible<7->{\draw [thick] (0, 3.7) -- (-6pt, 3.7) node[left] {\textcolor<9-10>{releaseColor}{Ubuntu 11.04}};}
-\visible<10->{\draw [thick] (0, 3.0) -- (-6pt, 3.0) node[left] {\textcolor<12-13>{releaseColor}{Ubuntu 11.10}};}
-\visible<13->{\draw [thick] (0, 1.7) -- (-6pt, 1.7) node[left] {\textcolor<15->{releaseColor}{Ubuntu 12.04}};}
-\visible<16->{\draw [thick] (0, 0.7) -- (-6pt, 0.7) node[left] {Ubuntu 12.10};}
+\visible<4->{\draw [thick] (0, 4.7) -- (-6pt, 4.7) node[left] {\textcolor<5-6>{releaseColor}{Ubuntu 10.10}};}
+\visible<6->{\draw [thick] (0, 3.7) -- (-6pt, 3.7) node[left] {\textcolor<7-8>{releaseColor}{Ubuntu 11.04}};}
+\visible<8->{\draw [thick] (0, 3.0) -- (-6pt, 3.0) node[left] {\textcolor<9-10>{releaseColor}{Ubuntu 11.10}};}
+\visible<10->{\draw [thick] (0, 1.7) -- (-6pt, 1.7) node[left] {\textcolor<11->{releaseColor}{Ubuntu 12.04}};}
+\visible<12->{\draw [thick] (0, 0.7) -- (-6pt, 0.7) node[left] {Ubuntu 12.10};}
\end{tikzpicture}
@@ -147,7 +147,7 @@
Boot-Schwierigkeiten mit \textbf{UEFI}
};}
- \visible<5->{ \draw [thick](1.3cm, 4cm) -- (0, 4 cm) node [above,align=center,midway] { WS 13 };
+ \visible<4->{ \draw [thick](1.3cm, 4cm) -- (0, 4 cm) node [above,align=center,midway] { WS 13 };
\draw [thick](1.3cm, 4cm) -- (2, 4.4cm) -- (2.5, 4.4cm) node[right, align=left] {
Image wird 8GB groß \\
Probleme mit Secure Boot\\
@@ -156,22 +156,22 @@
};}
- \visible<8->{\draw [thick](1.3cm, 3cm) -- (0, 3 cm) node [above,align=center,midway] { SS 14 };
+ \visible<6->{\draw [thick](1.3cm, 3cm) -- (0, 3 cm) node [above,align=center,midway] { SS 14 };
\draw [thick](1.3cm, 3cm) -- (2, 2.75cm) -- (2.5, 2.75cm) node[right, align=left] {
UCK zerfällt, immer mehr Patches nötig \\
-Gegen UEFI: die EFI-Axt und GRUB 2
+Gegen UEFI: die \textbf{EFI-Axt} und GRUB 2
};
}
- \visible<11->{ \draw [thick](1.3cm, 2cm) -- (0, 2 cm) node [above,align=center,midway] { WS 14 };
+ \visible<8->{ \draw [thick](1.3cm, 2cm) -- (0, 2 cm) node [above,align=center,midway] { WS 14 };
\draw [thick](1.3cm, 2cm) -- (2, 1.5cm) -- (2.5, 1.5cm) node[right, align=left] {
\texttt{make image} \\
sehr viele Teilnehmer \\
EFI ohne Passwort zickt rum
};
}
- \visible<14->{ \draw [thick](1.3cm, 1cm) -- (0, 1 cm) node [above,align=center,midway] { SS 15 };
+ \visible<10->{ \draw [thick](1.3cm, 1cm) -- (0, 1 cm) node [above,align=center,midway] { SS 15 };
\draw [thick](1.3cm, 1cm) -- (2, 0cm) -- (2.5, 0cm) node[right, align=left] {
\textbf{10. LIP} \\
Probleme mit \textbf{BIOS und MBR}\\
@@ -181,15 +181,22 @@ Gegen UEFI: die EFI-Axt und GRUB 2
% draw nodes
%\draw (0,5) node[left=3pt] {WS 10} ;
-\visible<3->{\draw [thick] (0, 5.7) -- (-6pt, 5.7) node[left] {\textcolor<3-7>{releaseColor}{Ubuntu 12.04}};}
-\visible<4->{\draw [thick] (0, 4.7) -- (-6pt, 4.7) node[left] {Ubuntu 13.04};}
-\visible<7->{\draw [thick] (0, 4.0) -- (-6pt, 4.0) node[left] {\textcolor<9-10>{releaseColor}{Ubuntu 13.10}};}
-\visible<10->{\draw [thick] (0, 2.7) -- (-6pt, 2.7) node[left] {\textcolor<12->{releaseColor}{Ubuntu 14.04}};}
-\visible<13->{\draw [thick] (0, 1.7) -- (-6pt, 1.7) node[left] {Ubuntu 14.10};}
-\visible<16->{\draw [thick] (0, 0.7) -- (-6pt, 0.7) node[left] {Ubuntu 15.04};}
+\visible<1->{\draw [thick] (0, 5.7) -- (-6pt, 5.7) node[left] {\textcolor<-5>{releaseColor}{Ubuntu 12.04}};}
+\visible<3->{\draw [thick] (0, 4.7) -- (-6pt, 4.7) node[left] {Ubuntu 13.04};}
+\visible<5->{\draw [thick] (0, 4.0) -- (-6pt, 4.0) node[left] {\textcolor<6-7>{releaseColor}{Ubuntu 13.10}};}
+\visible<7->{\draw [thick] (0, 2.7) -- (-6pt, 2.7) node[left] {\textcolor<8->{releaseColor}{Ubuntu 14.04}};}
+\visible<9->{\draw [thick] (0, 1.7) -- (-6pt, 1.7) node[left] {Ubuntu 14.10};}
+\visible<11->{\draw [thick] (0, 0.7) -- (-6pt, 0.7) node[left] {Ubuntu 15.04};}
\end{tikzpicture}
+ \only<7>{
+ \vspace{-7.8cm}
+ \begin{figure}
+ \includegraphics[width=\textwidth]{image/axt.jpg}
+ \end{figure}
+ }
+
\hfill
% \end{center}
@@ -505,7 +512,7 @@ Gegen UEFI: die EFI-Axt und GRUB 2
\subsubsection*{LIPCLMS}
\begin{frame}{LIPCLMS}
\begin{itemize}
-\item Linux Install Party Customer Lifecycle Managment System \pause
+\item Linux Install Party Customer Lifecycle Management System \pause
\item aka Anmeldesystem \pause
\item drittes Anmeldesystem
\item Nutzen
@@ -521,9 +528,9 @@ Gegen UEFI: die EFI-Axt und GRUB 2
\end{itemize}
\end{frame}
-\subsection{Motivation}
+\subsection{Fazit}
-\begin{frame}{Motivation}
+\begin{frame}{Fazit}
\begin{itemize}
\item Förderung von freier und quelloffener Software -- insbesondere Linux
\item Studierenden bei der Installation von Linux helfen
diff --git a/lectures/froscon/main.pdf b/lectures/froscon/main.pdf
index 39faf786be857097cbe1309b39f23b35601e4cbc..4d82a8f4856fcdddb13a98969eee196d8180461b 100644
Binary files a/lectures/froscon/main.pdf and b/lectures/froscon/main.pdf differ
diff --git a/lectures/froscon/main.tex b/lectures/froscon/main.tex
index 680b8e563eee1001d0bba88543dc49d7e988e5c0..604a287fff28aa11ed3aa1ab0d936264338e637e 100644
--- a/lectures/froscon/main.tex
+++ b/lectures/froscon/main.tex
@@ -37,7 +37,7 @@
\title{Einmal Linux zum Mitnehmen, bitte?}
\subtitle[Linux Install Partys]{10 Semester erfolgreiche Linux Install Partys an der RWTH Aachen}
\author{Daniel Schulte \and Hinrikus Wolf}
-\institute[OSAK]{Open Source Arbeitskreis der \\ Fachschaft Mathematik/Physik/Informatik an der RWTH Aachen \\ und der Aachner Linux User Group}
+\institute[OSAK]{Open Source Arbeitskreis der \\ Fachschaft Mathematik/Physik/Informatik an der RWTH Aachen \\ und der Aachener Linux User Group}
%\setbeamertemplate{footline}[frame number]
\setbeamertemplate{itemize item}[default]
\setbeamertemplate{itemize subitem}[default]