From 1e0469ce7497dc8173a9c98f43e90296aa38942d Mon Sep 17 00:00:00 2001
From: Ben Gras <ben@minix3.org>
Date: Wed, 31 Aug 2005 16:57:13 +0000
Subject: [PATCH] *** empty log message ***

---
 commands/scripts/setup.sh | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/commands/scripts/setup.sh b/commands/scripts/setup.sh
index a2982e5e2..27e3cc9a2 100755
--- a/commands/scripts/setup.sh
+++ b/commands/scripts/setup.sh
@@ -304,9 +304,9 @@ fi
 root=${primary}s0
 home=${primary}s1
 usr=${primary}s2
-umount /dev/$usr 2>/dev/null && echo "Unmounted $usr for you."
 umount /dev/$root 2>/dev/null && echo "Unmounted $root for you."
 umount /dev/$home 2>/dev/null && echo "Unmounted $home for you."
+umount /dev/$usr 2>/dev/null && echo "Unmounted $usr for you."
 
 blockdefault=4
 
@@ -351,14 +351,15 @@ partition /dev/$primary 1 81:32768* 81:$homesize 81:0+ > /dev/null || exit
 
 echo "Creating /dev/$root .."
 mkfs -B $blocksizebytes /dev/$root || exit
-echo "Creating /dev/$usr .."
-mkfs -B $blocksizebytes /dev/$usr || exit
 
 if [ ! "$auto" = r ]
 then	echo "Creating /dev/$home .."
 	mkfs -B $blocksizebytes /dev/$home || exit
 fi
 
+echo "Creating /dev/$usr .."
+mkfs -B $blocksizebytes /dev/$usr || exit
+
 echo ""
 echo " --- Step 5: Wait for bad block detection ------------------------------"
 echo ""
@@ -369,13 +370,15 @@ trap ': nothing;echo' 2
 echo ""
 echo "Scanning /dev/$root for bad blocks:"
 readall -b /dev/$root | sh
+
+echo "Scanning /dev/$home for bad blocks:"
+readall -b /dev/$home | sh
+trap 2
+
 echo ""
 echo "Scanning /dev/$usr for bad blocks:"
 readall -b /dev/$usr | sh
 trap 2
-echo "Scanning /dev/$home for bad blocks:"
-readall -b /dev/$home | sh
-trap 2
 
 echo ""
 echo " --- Step 6: Wait for files to be copied -------------------------------"
-- 
2.44.0