diff --git a/lectures/froscon/cryptoparty.tex b/lectures/froscon/cryptoparty.tex index 43601d73908994ded11223e7369af430c8fa0266..1042de5a4b22684a1b3f6696c3de72fbbd3333e3 100644 --- a/lectures/froscon/cryptoparty.tex +++ b/lectures/froscon/cryptoparty.tex @@ -1,6 +1,8 @@ +\section{Cryptopartys} + { \nologo -\section{Cryptopartys} + \begin{frame}{Cryptoparty} \begin{itemize} \item nach den Snowdon-Leaks diff --git a/lectures/froscon/kiss.tex b/lectures/froscon/kiss.tex index 97d2848e7c839fb139cdd045e8c57a97db4f48e2..368db2b38b4c6d1f308058d6b426550fde9a4da5 100644 --- a/lectures/froscon/kiss.tex +++ b/lectures/froscon/kiss.tex @@ -1,4 +1,5 @@ \section{Linux-Workshops} + { \nologo \subsection{Idee} diff --git a/lectures/froscon/lip.tex b/lectures/froscon/lip.tex index e3bd33ee070730fa3313893d15a9fd568ecae1e6..39930931d6d952b9ae26dcb14a18ebdebe50b958 100644 --- a/lectures/froscon/lip.tex +++ b/lectures/froscon/lip.tex @@ -271,6 +271,8 @@ Gegen UEFI: die EFI-Axt und GRUB 2 % Zeitstrahl: bis Woche vor der LIP, Woche vor der LIP, "Tag vor der LIP (72h)", Nacht vor der LIP, Tag der LIP, LIP selbst \subsection{Software} \subsubsection*{LIPCK / LIPStick} +{ + \nologo \begin{frame}{Motivation eigenes Image} \begin{itemize} \item Offline Repository um Netzwerkbandbreite zu sparen @@ -280,7 +282,39 @@ Gegen UEFI: die EFI-Axt und GRUB 2 \item Erster Ansatz: \texttt{linuxparty.sh} -- Installation zusätzlicher Software %\item \todo{LIPSTICK GRAFIK} \end{itemize} +\center\scriptsize +\begin{tikzpicture} +\coordinate (sw) at (0, 0); +\coordinate (nw) at (0, 2); +\coordinate (no) at (3, 2); +\coordinate (so) at (3, 0); +\coordinate (nsw) at (3, 0.4); +\coordinate (nnw) at (3, 1.6); +\coordinate (nno) at (4.4, 1.6); +\coordinate (nso) at (4.4, 0.4); +\coordinate (h1a) at (3.95, 1.5); +\coordinate (h1b) at (3.75, 1.2); +\coordinate (h2a) at (3.95, 0.8); +\coordinate (h2b) at (3.75, 0.5); + +\draw[rounded corners=4pt,fill=red!80!black] (so) -- (sw) -- (nw) -- (no); +\draw [fill=LightGrey] (no) -- (nnw) -- (nno) -- (nso) -- (nsw) -- (so) -- (no); + +\draw [fill=gray] (h1a) rectangle (h1b); +\draw [fill=gray] (h2a) rectangle (h2b); + +\visible<1>{\node at (1.5,1) [white] {32 bit};} +\visible<2>{\node at (1,1) [white] {32 bit};} +\visible<3->{\node at (.5,1) [align=center, white] {32 bit \\ binaries};} +\visible<2->{\draw [fill=blue!40!white] (2,0) rectangle (3,2);\node at (2.5,1) [align=center] {offline \\ Repo};} +\visible<3->{\draw [fill=yellow!40!white] (1,0) rectangle (2,2);\node at (1.5,1) [align=center] {non \\ arch};} + +\node [right] at (3.0, 1.4) {4GB}; + + +\end{tikzpicture} \scriptsize +\hspace{1cm} \begin{tikzpicture} \coordinate (sw) at (0, 0); \coordinate (nw) at (0, 2); @@ -295,8 +329,13 @@ Gegen UEFI: die EFI-Axt und GRUB 2 \coordinate (h2a) at (3.95, 0.8); \coordinate (h2b) at (3.75, 0.5); -\draw[rounded corners=4pt] (so) -- (sw) -- (nw) -- (no); -\draw (no) -- (nnw) -- (nno) -- (nso) -- (nsw) -- (so) -- (no); +\draw[fill=green!40!white, rounded corners=4pt] (so) -- (sw) -- (nw) -- (no); +\draw [fill=LightGrey] (no) -- (nnw) -- (nno) -- (nso) -- (nsw) -- (so) -- (no) ; +\visible<1>{\node at (1.5,1) {64 bit};} +\visible<2>{\node at (1,1) {64 bit};} +\visible<3->{\node at (.5,1) [align=center] {64 bit \\ binaries};} +\visible<2->{\draw [fill=blue!40!white] (2,0) rectangle (3,2);\node at (2.5,1) [align=center] {offline \\ Repo};} +\visible<3->{\draw [fill=yellow!40!white] (1,0) rectangle (2,2);\node at (1.5,1) [align=center] {non \\ arch};} \draw [fill=gray] (h1a) rectangle (h1b); \draw [fill=gray] (h2a) rectangle (h2b); @@ -305,7 +344,45 @@ Gegen UEFI: die EFI-Axt und GRUB 2 \end{tikzpicture} + +\vspace*{.5cm} +\begin{tikzpicture} +\coordinate (sw) at (0, 0); +\coordinate (nw) at (0, 2); +\coordinate (no) at (3, 2); +\coordinate (so) at (3, 0); +\coordinate (om) at (3 ,1); +\coordinate (wm) at (0 ,1); +\coordinate (nsw) at (3, 0.4); +\coordinate (nnw) at (3, 1.6); +\coordinate (nno) at (4.4, 1.6); +\coordinate (nso) at (4.4, 0.4); +\coordinate (h1a) at (3.95, 1.5); +\coordinate (h1b) at (3.75, 1.2); +\coordinate (h2a) at (3.95, 0.8); +\coordinate (h2b) at (3.75, 0.5); +\visible<4->{ +\draw[fill=green!40!white, rounded corners=4pt] (om) -- (so) -- (sw) -- (wm); +\draw[fill=red!80!black, rounded corners=4pt] (om) -- (no) -- (nw) -- (wm); +\draw [fill=LightGrey] (no) -- (nnw) -- (nno) -- (nso) -- (nsw) -- (so) -- (no) ; +\draw (om)--(wm); + +\node at (.5,1.5) [align=center, white] {32 bit \\ binaries}; +\node at (.5,.5) [align=center] {64 bit \\ binaries}; +\draw [fill=blue!40!white] (2,0) rectangle (3,2);\node at (2.5,1) [align=center] {offline \\ Repo}; +\draw [fill=yellow!40!white] (1,0) rectangle (2,2);\node at (1.5,1) [align=center] {non \\ arch}; + +\draw [fill=gray] (h1a) rectangle (h1b); +\draw [fill=gray] (h2a) rectangle (h2b); + +\node [right] at (3.0, 1.4) {4GB}; + +} +\end{tikzpicture} + + \end{frame} +} \begin{frame}{LIPCK / LIPStick} \begin{itemize} diff --git a/lectures/froscon/main.pdf b/lectures/froscon/main.pdf index c9d6db3d8576905f823da1628c20a71130f19f7a..afe5d69a5ce62022e5c8587b835dcc6a02cfbba7 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 335bd713f04fb351b3b33fce9a5a848627243a9d..404cc382fae2f81236499ea419a53e1e9977e46d 100644 --- a/lectures/froscon/main.tex +++ b/lectures/froscon/main.tex @@ -58,14 +58,14 @@ \AtBeginSection[] { - \begin{frame}{Inhalt} + \begin{frame}{Einmal Linux zum Mitnehmen, bitte?}{10 Semester erfolgreiche Linux Install Partys an der RWTH Aachen} \tableofcontents[currentsection] \end{frame} } \maketitle %erstelle eine Titelfolie -\begin{frame}{Inhalt} +\begin{frame} {Einmal Linux zum Mitnehmen, bitte?}{10 Semester erfolgreiche Linux Install Partys an der RWTH Aachen} \tableofcontents[]