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

Support reinstall and new boot.

Browse Source
This commit is contained in:
Evgeniy Ivanov 2012-02-07 19:14:27 +04:00 committed by Ben Gras
parent d4ddfeb2c0
commit 6f88dc8713
1 changed files with 25 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
commands/setup/setup.sh
View File

@ -12,6 +12,7 @@ LOCALRC=/usr/etc/rc.local
MYLOCALRC=/mnt/etc/rc.local MYLOCALRC=/mnt/etc/rc.local
ROOTMB=64 ROOTMB=64
ROOTSECTS="`expr $ROOTMB '*' 1024 '*' 2`" ROOTSECTS="`expr $ROOTMB '*' 1024 '*' 2`"
BOOTXXSECTS=32
USRKBFILE=/.usrkb USRKBFILE=/.usrkb
if [ ! -f "$USRKBFILE" ] if [ ! -f "$USRKBFILE" ]
then echo "Are you really running from CD?" then echo "Are you really running from CD?"
@ -391,11 +392,21 @@ else
ROOTMB="`expr $ROOTSECTS / 2048`" ROOTMB="`expr $ROOTSECTS / 2048`"
if [ $ROOTSECTS -ne $ROOTSECTSDEFAULT ] if [ $ROOTSECTS -ne $ROOTSECTSDEFAULT ]
then then
# Check if we
echo "Root partition size `expr $ROOTSECTS / 2`kb differs from default `expr $ROOTSECTSDEFAULT / 2`kb." echo "Root partition size `expr $ROOTSECTS / 2`kb differs from default `expr $ROOTSECTSDEFAULT / 2`kb."
echo "This is not a problem, but you may want to do a fresh install at some point to" echo "This is not a problem, but you may want to do a fresh install at some point to"
echo "be able to benefit from the new default." echo "be able to benefit from the new default."
fi fi
# Check if enough space for new boot (even if old used)
let bootspace=`devsize /dev/$primary`-`devsize /dev/$root`-`devsize /dev/$home`-`devsize /dev/$usr` >/dev/null
if [ $bootspace -lt $BOOTXXSECTS ]
then
echo "Root partition size will be reduced by up to 16Kb to fit new bootloader."
echo "This is not a problem."
ROOTSECTS=`expr $ROOTSECTS - $BOOTXXSECTS + $bootspace`
fi
# Recompute totals based on root size # Recompute totals based on root size
TOTALMB="`expr 3 + $USRKB / 1024 + $ROOTMB`" TOTALMB="`expr 3 + $USRKB / 1024 + $ROOTMB`"
maxhome="`expr $devsizemb - $TOTALMB - 1`" maxhome="`expr $devsizemb - $TOTALMB - 1`"
@ -441,26 +452,22 @@ else
blocksize=$blockdefault blocksize=$blockdefault
fi fi
usenewboot=1 blocksizebytes="`expr $blocksize '*' 1024`"
bootsectors=32
if [ ! "$auto" = "r" ]
then
echo ""
echo " --- Step 7: Select a boot scheme --------------------------------------"
echo ""
echo -n "Do you want to use new boot? [Y] " usenewboot=1
read ok bootsectors=$BOOTXXSECTS
if [ "$ok" != Y -a "$ok" != y -a "$ok" != "" ] echo ""
then echo " --- Step 7: Select a boot scheme --------------------------------------"
echo ""
echo -n "Do you want to use new boot? [Y] "
read ok
if [ "$ok" != Y -a "$ok" != y -a "$ok" != "" ]
then
usenewboot=0 usenewboot=0
bootsectors=1 bootsectors=1
fi
fi fi
blocksizebytes="`expr $blocksize '*' 1024`"
echo " echo "
You have selected to (re)install MINIX 3 in the partition /dev/$primary. You have selected to (re)install MINIX 3 in the partition /dev/$primary.
The following subpartitions are now being created on /dev/$primary: The following subpartitions are now being created on /dev/$primary: