From a212fd1ba508e82f261dcfbae27203035b8b0581 Mon Sep 17 00:00:00 2001
From: Lionel Sambuc <lionel@minix3.org>
Date: Fri, 8 Mar 2013 19:18:09 +0100
Subject: [PATCH] Install default users directly

Install /home/ast and /home/bin as part of the system build procedure,
as the setup script is not ran on the arm image.

/home/bin is needed for successful completion of our test suite.

This patch does not change the setup script, as it is not bothered by
those files/directiories being already there, and may be useful during
reinstallation on intel systems.

Change-Id: I358c881df09223c343442673aa0822937f9ea33c
---
 distrib/sets/lists/minix/mi |  8 ++++++++
 etc/Makefile                | 18 +++++++++---------
 etc/mtree/NetBSD.dist.base  | 10 +++++++++-
 3 files changed, 26 insertions(+), 10 deletions(-)

diff --git a/distrib/sets/lists/minix/mi b/distrib/sets/lists/minix/mi
index 89c61c46d..8fb7c7685 100644
--- a/distrib/sets/lists/minix/mi
+++ b/distrib/sets/lists/minix/mi
@@ -107,6 +107,14 @@
 ./etc/ttys				minix-sys
 ./etc/utmp				minix-sys
 ./home					minix-sys
+./home/ast				minix-sys
+./home/ast/.ashrc			minix-sys
+./home/ast/.exrc			minix-sys
+./home/ast/.profile			minix-sys
+./home/bin				minix-sys
+./home/bin/.ashrc			minix-sys
+./home/bin/.exrc			minix-sys
+./home/bin/.profile			minix-sys
 ./lib/cpp 				minix-sys
 ./libexec/ld-elf.so.1			minix-sys
 ./libexec/ld.elf_so			minix-sys
diff --git a/etc/Makefile b/etc/Makefile
index 9e5d25fe4..530e5296a 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -423,28 +423,28 @@ install-etc-files-safe: .PHONY .MAKE check_DESTDIR MAKEDEV
 	${MAKEDIRTARGET} ${NETBSDSRCDIR}/external/bsd/atf/etc/atf configinstall
 .endif
 .else # LSC Minix Specific
-.for owner group mode sdir tdir file in \
+.for owner group mode sdir tdir files in \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ daily \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ dhcptags.conf \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/etc/ rc \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/ ${DESTDIR}/usr/lib/ crontab \
 		${BINOWN} ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/usr/ ${DESTDIR}/usr/ Makefile \
 		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ block  \
-		${BINOWN} ${BINGRP}	${BINMODE}	${NETBSDSRCDIR}/etc/devmand/scripts/ ${DESTDIR}/etc/devmand/scripts/ singlechar
+		${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	  ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/home/ast/ .[aepv]* \
+		bin	  ${BINGRP}	${NONBINMODE}	${NETBSDSRCDIR}/etc/ast/ ${DESTDIR}/home/bin/ .[aepv]* \
+
 	${_MKMSG_INSTALL} ${DESTDIR}${_dir}${file}
 	if [ ! -e ${tdir} ]; then \
-		mkdir -p ${tdir}; \
+		${INSTALL_DIR} ${tdir}; \
 	fi; \
-	if [ ! -e ${tdir}${file} -o -s ${tdir}${file} ]; then \
-		${ETC_INSTALL_FILE} -o ${owner} -g ${group} -m ${mode} \
-    			${sdir}${file} ${tdir}${file}; \
-	else true; fi
+	${INSTALL_FILE} -o ${owner} -g ${group} -m ${mode} ${sdir}${files} ${tdir};
 .endfor
 .for subdir in . defaults mtree
 	${MAKEDIRTARGET} ${subdir} configinstall
 .endfor
-	${_MKMSG_INSTALL} ${DESTDIR}/usr/ast and ${DESTDIR}/root
-	for u in ${DESTDIR}/usr/ast ${DESTDIR}/root; do  ${INSTALL_DIR} $$u; cp ${NETBSDSRCDIR}/etc/ast/.[aepv]* $$u; done
 	${_MKMSG_INSTALL} ${DESTDIR}/usr/lib/fonts
 	${INSTALL_DIR} ${DESTDIR}/usr/lib/fonts
 	${INSTALL_FILE} -m ${BINMODE} -o ${BINOWN} -g ${BINGRP} ${NETBSDSRCDIR}/etc/fonts/*.fnt ${DESTDIR}/usr/lib/fonts/
diff --git a/etc/mtree/NetBSD.dist.base b/etc/mtree/NetBSD.dist.base
index 664be6ac0..648b8c03b 100644
--- a/etc/mtree/NetBSD.dist.base
+++ b/etc/mtree/NetBSD.dist.base
@@ -133,7 +133,6 @@
 ./usr/spool/mail
 ./usr/src
 ./usr/tests
-./usr/tests/minix-posix
 ./usr/var
 ./usr/var/db
 ./usr/var/db/pkg
@@ -148,6 +147,15 @@
 ./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
+
+/set type=dir uid=2 gid=0 mode=755
+./usr/tests/minix-posix
+
 # this one is for term(1)
 /set type=dir uid=0 gid=5 mode=775
 ./usr/spool/locks
-- 
2.44.0