From 05915b5c5fe149d2942d77c2831d3019dd786376 Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Fri, 17 Mar 2006 20:22:39 +0000
Subject: [PATCH] Install setup in /bin

---
 commands/scripts/Makefile | 4 ++--
 commands/scripts/setup.sh | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/commands/scripts/Makefile b/commands/scripts/Makefile
index 28a5efb77..f45b3031e 100755
--- a/commands/scripts/Makefile
+++ b/commands/scripts/Makefile
@@ -38,7 +38,7 @@ usr:	\
 	/usr/bin/makewhatis \
 	/usr/bin/mkdep \
 	/usr/bin/mkdist \
-	/usr/bin/setup \
+	/bin/setup \
 	/usr/bin/binsizes \
 	/usr/bin/rotate \
 	/usr/bin/floppysetup \
@@ -133,7 +133,7 @@ clean:
 /usr/bin/rotate:	rotate.sh
 	install -m 755 -c -o bin $? $@
 
-/usr/bin/setup:	setup.sh
+/bin/setup:	setup.sh
 	install -m 755 -c -o bin $? $@
 
 /usr/bin/binsizes:	binsizes.sh
diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index ac5458ea7..a85f9c148 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -637,6 +637,9 @@ then	if mount /dev/$home /home 2>/dev/null
 	fi
 fi
 
+echo "Saving random data.."
+dd if=/dev/random of=/mnt/usr/adm/random.dat bs=1024 count=1
+
 # Now chroot-mount the new system and run the postinstall script
 umount /dev/$usr || exit 1
 if umount ${cddrive}p2
@@ -650,9 +653,6 @@ then
 else	echo "Skipping post-install."
 fi
 
-echo "Saving random data.."
-dd if=/dev/random of=/mnt/usr/adm/random.dat bs=1024 count=1
-
 echo "
 Please type 'shutdown' to exit MINIX 3 and enter the boot monitor. At
 the boot monitor prompt, type 'boot $bios', where X is the bios drive
-- 
2.44.0