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, 51 deletions

diff --git a/beagle/debian-rfs/etc/init.d/stop-bootlogd-single b/beagle/debian-rfs/etc/init.d/stop-bootlogd-single
deleted file mode 100755
index 2e76f16..0000000
--- a/beagle/debian-rfs/etc/init.d/stop-bootlogd-single
+++ /dev/null
@@ -1,51 +0,0 @@
-#! /bin/sh
-### BEGIN INIT INFO
-# Provides:          stop-bootlogd-single
-# Required-Start:    $local_fs $all
-# Required-Stop:
-# Default-Start:     S
-# Default-Stop:
-# Short-Description: Stop bootlogd in single user mode
-# Description:       See the init.d/bootlogd script
-### END INIT INFO
-#
-# This has to run in the boot sequence (rcS.d), and not in the "single
-# user" sequence (rc1.d), because rc1.d/ is not used when booting into
-# single user.  "grep :[S1]: /etc/inittab" show that single user is just
-# a call to /sbin/sulogin, while runlevel 1 is a call to
-# "/etc/init.d/rc 1" which in the end switches to runlevel S to run
-# /sbin/sulogin.
-
-PATH=/sbin:/usr/sbin:/bin:/usr/bin
-NAME=stop-bootlogd-single
-DAEMON=/sbin/bootlogd
-
-[ -x "$DAEMON" ] || exit 0
-
-case "$1" in
-  start)
-	single=false
-	for word in $(cat /proc/cmdline); do
-		case "$word" in
-		S|single|1)
-			single=true
-		;;
-		esac
-	done
-	if [ true = "$single" ] ; then
-		/etc/init.d/bootlogd stop
-	fi
-	;;
-  stop|restart|force-reload)
-	# No-op
-	;;
-  status)
-	exec /etc/init.d/bootlogd status
-	;;
-  *)
-	echo "Usage: $NAME {start|stop|restart|force-reload}" >&2
-	exit 3
-	;;
-esac
-
-: