Merge branch 'schulung'

updates from current linutronix schulung.git

Conflicts:
	Makefile
	configpres.tex
	flash-memory/ubi/handout_ubi_de.tex
	handout.tex
	index.txt
	pres_master.tex
	vorl.tex
	vorl1.tex
	vorl2.tex
	vorl3.tex
	vorl4.tex
	vorl5.tex

Signed-off-by: Manuel Traut <manut@mecka.net>

1 files changed, 0 insertions, 40 deletions

diff --git a/beagle/debian-rfs/usr/sbin/add-shell b/beagle/debian-rfs/usr/sbin/add-shell
deleted file mode 100755
index f7a4a55..0000000
--- a/beagle/debian-rfs/usr/sbin/add-shell
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/sh -e
-
-if test $# -eq 0
-then
-	echo usage: $0 shellname [shellname ...]
-	exit 1
-fi
-
-file=/etc/shells
-# I want this to be GUARANTEED to be on the same filesystem as $file
-tmpfile=${file}.tmp
-
-set -o noclobber
-
-trap "rm -f $tmpfile" EXIT
-        
-if ! cat $file > $tmpfile
-then
-        cat 1>&2 <<EOF
-Either another instance of $0 is running, or it was previously interrupted.
-Please examine ${tmpfile} to see if it should be moved onto ${file}.
-EOF
-        exit 1
-fi
-
-for i
-do
-        if ! grep -q "^${i}$" $tmpfile
-        then
-                echo $i >> $tmpfile
-        fi
-done
-
-chmod --reference=$file $tmpfile
-chown --reference=$file $tmpfile
-
-mv $tmpfile $file
-
-trap "" EXIT
-exit 0