From 957a365668fd48977bf5b8b4f582baddc62d7e35 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Thu, 7 Aug 2014 13:15:50 +0200
Subject: [PATCH] Removing the ast account

We used to have an account "ast" as a token to Andrew S. Tannebaum,
the creator of MINIX. The account was disable by default, with no
possible way to login.

It seems it generates more confusion than it is worth, so this removes it.

The default skeleton user profile is still stored into /etc/ast instead
of the usual /etc/skel.

Change-Id: I71818c0bb9580cdecfa9621f8693586fc48d17cb
---
 distrib/sets/lists/minix/mi   | 6 +++---
 etc/Makefile                  | 1 -
 etc/master.passwd             | 1 -
 etc/mtree/NetBSD.dist.base    | 3 ---
 minix/commands/setup/setup.sh | 2 +-
 5 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 7f3b8e262..c05052af6 100644
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -121,9 +121,9 @@
 ./etc/ttys				minix-sys
 ./etc/utmp				minix-sys
 ./home					minix-sys
-./home/ast				minix-sys
-./home/ast/.exrc			minix-sys
-./home/ast/.profile			minix-sys
+./home/ast				minix-sys	obsolete
+./home/ast/.exrc			minix-sys	obsolete
+./home/ast/.profile			minix-sys	obsolete
 ./home/bin				minix-sys
 ./home/bin/.exrc			minix-sys
 ./home/bin/.profile			minix-sys
diff --git a/etc/Makefile b/etc/Makefile
index c1835d81d..b5e522353 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -435,7 +435,6 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ singlechar \
 		${BINOWN} ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/usr/ast/ .[aepv]* \
 		${BINOWN} ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/root/ .[aepv]* \
-		ast	  users		${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/home/ast/ .[aepv]* \
 		bin	  ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/home/bin/ .[aepv]* \
 
 	${_MKMSG_INSTALL} ${DESTDIR}${tdir}${files:T}
diff --git a/etc/master.passwd b/etc/master.passwd
index c6307edff..9cf0c81ed 100644
--- a/etc/master.passwd
+++ b/etc/master.passwd
@@ -4,7 +4,6 @@ bin:*:2:0::0:0:Binaries:/home/bin:/bin/sh
 uucp:*:5:5::0:0:UNIX to UNIX copy:/usr/spool/uucp:/usr/bin/uucico
 news:*:6:6::0:0:Usenet news:/usr/spool/news:/bin/sh
 ftp:*:7:7::0:0:Anonymous FTP:/usr/ftp:/bin/sh
-ast:*:8:100::0:0:Andrew S. Tanenbaum:/home/ast:/bin/sh
 www:*:9:9::0:0:World Wide Web:/usr/www:/bin/sh
 driver:*:10:10::0:0:Device Drivers:/:/bin/sh
 server:*:11:11::0:0:OS Servers:/:/bin/sh
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index 20f0663e3..5bbabd7b0 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -168,9 +168,6 @@
 ./tmp
 ./usr/tmp
 
-/set type=dir uid=8 gid=0 mode=755
-./home/ast
-
 /set type=dir uid=2 gid=0 mode=755
 ./home/bin
 
diff --git a/minix/commands/setup/setup.sh b/minix/commands/setup/setup.sh
index 927dff0fb..ffc62538b 100644
--- a/minix/commands/setup/setup.sh
+++ b/minix/commands/setup/setup.sh
@@ -746,7 +746,7 @@ bios="`echo $primary | sed -e 's/d./dX/g' -e 's/c.//g'`"
 
 if [ ! "$auto" = "r" ]
 then	if mount /dev/$home /home 2>/dev/null
-	then	for u in bin ast
+	then	for u in bin
 		do	h=`eval echo "~$u"`
 			if mkdir $h
 			then	echo " * Creating home directory for $u in $h"