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

diff --git a/beagle/debian-rfs/usr/share/pam-configs/unix b/beagle/debian-rfs/usr/share/pam-configs/unix
deleted file mode 100644
index 23a04f1..0000000
--- a/beagle/debian-rfs/usr/share/pam-configs/unix
+++ /dev/null
@@ -1,23 +0,0 @@
-Name: Unix authentication
-Default: yes
-Priority: 256
-Auth-Type: Primary
-Auth:
-	[success=end default=ignore]	pam_unix.so nullok_secure try_first_pass
-Auth-Initial:
-	[success=end default=ignore]	pam_unix.so nullok_secure
-Account-Type: Primary
-Account:
-	[success=end new_authtok_reqd=done default=ignore]	pam_unix.so
-Account-Initial:
-	[success=end new_authtok_reqd=done default=ignore]	pam_unix.so
-Session-Type: Additional
-Session:
-	required	pam_unix.so
-Session-Initial:
-	required	pam_unix.so
-Password-Type: Primary
-Password:
-	[success=end default=ignore]	pam_unix.so obscure use_authtok try_first_pass sha512
-Password-Initial:
-	[success=end default=ignore]	pam_unix.so obscure sha512