oneechanhax/phunix
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Extra setup umounts in case of aborted previous installs.

Browse Source 
Forget about the /usr re-mounting, it's not necessary and (potentially)
causes problems during setup.
This commit is contained in:
Ben Gras 2005-08-22 10:01:52 +00:00
parent 0ab4039806
commit 10ba94be2b
1 changed files with 2 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
commands/scripts/setup.sh
View File

@ -206,6 +206,8 @@ done
root=${primary}s0 root=${primary}s0
swap=${primary}s1 swap=${primary}s1
usr=${primary}s2 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."
hex2int() hex2int()
{ {
@ -388,32 +390,6 @@ files="`find /usr | wc -l`"
cpdir -v /usr /mnt | progressbar "$files" || exit # Copy the usr floppy. cpdir -v /usr /mnt | progressbar "$files" || exit # Copy the usr floppy.
umount /dev/$usr >/dev/null || exit # Unmount the intended /usr. umount /dev/$usr >/dev/null || exit # Unmount the intended /usr.
umount $fdusr >/dev/null # Unmount the /usr floppy.
mount /dev/$usr /usr >/dev/null || exit # A new /usr
if [ $fdroot = unknown ]
then
echo "
By now the floppy USR has been copied to /dev/$usr, and it is now in use as
/usr. Please insert the installation ROOT floppy in a floppy drive."
drive=
while [ -z "$drive" ]
do
echo -n "What floppy drive is it in? [0] "; read drive
case $drive in
'') drive=0
;;
[01])
;;
*) echo "It must be 0 or 1, not \"$drive\"."
drive=
esac
done
fdroot=/dev/fd$drive
fi
mount /dev/$root /mnt >/dev/null || exit mount /dev/$root /mnt >/dev/null || exit
# Running from the installation CD. # Running from the installation CD.
files="`find / -xdev | wc -l`" files="`find / -xdev | wc -l`"