3 files changed, 35 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 61dc8e30..063d7647 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,7 +9,12 @@ hurd (20101029-1) UNRELEASED; urgency=low
     memory.  Tell the user he needs to be patient while the d-i templates get
     loaded.
 
- -- Samuel Thibault <sthibault@debian.org>  Fri, 29 Oct 2010 22:16:06 +0000
+  [ Justus Winter ]
+  * debian/hurd.{postinst,postrm}: Add/remove loginpr shell and login user with
+    loginpr shell, to drop the login shell in order to match common Debian
+    convention, in particular for remote telnet access...
+
+ -- Samuel Thibault <sthibault@debian.org>  Sun, 16 Jan 2011 14:34:16 +0100
 
 hurd (20100926-1) unstable; urgency=low
 
diff --git a/debian/hurd.postinst b/debian/hurd.postinst
index 807366b7..98945eed 100644
--- a/debian/hurd.postinst
+++ b/debian/hurd.postinst
@@ -20,6 +20,15 @@ update-alternatives \
 update-alternatives \
 	--install /usr/bin/w w /usr/bin/w-hurd 60
 
+if [ "$1" = configure ]; then
+  add-shell /bin/loginpr || true
+  if ! getent passwd login >/dev/null; then
+    adduser --disabled-password  --quiet --system \
+      --home /etc/login --no-create-home --shell /bin/loginpr \
+      --gecos "login user" --group login
+  fi
+fi
+
 #DEBHELPER#
 
 if [ "$1" = configure ] && [ "$2" ]; then
diff --git a/debian/hurd.postrm b/debian/hurd.postrm
new file mode 100644
index 00000000..ea209f71
--- /dev/null
+++ b/debian/hurd.postrm
@@ -0,0 +1,20 @@
+#!/bin/sh
+set -e
+
+if [ "$1" = purge ]; then
+  remove-shell /bin/loginpr
+  if ! deluser --quiet --system login > /dev/null; then
+    echo "
+Removing the user 'login' failed, most likely because the user is still
+logged in. To remove the user and group terminate the session in question
+and execute
+
+    deluser --quiet --system login
+    delgroup --quiet --system login
+"
+  else
+    delgroup --quiet --system login > /dev/null || true
+  fi
+fi
+
+#DEBHELPER#