Install setup in /bin

diff --git a/commands/scripts/Makefile b/commands/scripts/Makefile
index 28a5efb77b12e1177754d61fc98d90bfab83652a..f45b3031efe5b1ad7776a2b92d9f380d38c9144c 100755 (executable)
--- 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 ac5458ea763c113f4e1ea412dfce12c5959bfd71..a85f9c14821e41ce4a56dc2a683d347feaae6175 100755 (executable)
--- 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