sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

commands/setup: fixes for new sh & renamed fsck

Browse source 
- adapt an arithmetic expression for the new sh
 - update the fsck call to use the main fsck wrapper instead of a
   specific fsck version.

Change-Id: I7e25bf6e54b5c9f564082459e78b9ce5c39254cf
This commit is contained in:
Lionel Sambuc 2014-09-05 10:01:18 +02:00
parent c48c7d47f7
commit 3f072cf30f
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
minix/commands/setup/setup.sh
View file

@ -365,8 +365,8 @@ then
read ok read ok
if [ "$ok" = "y" -o "$ok" = "Y" -o "$ok" = "" ] if [ "$ok" = "y" -o "$ok" = "Y" -o "$ok" = "" ]
then then
fsck.mfs -a "/dev/$root" >/dev/null fsck -t mfs -T mfs:-a "/dev/$root" >/dev/null
fsck.mfs -a "/dev/$usr" >/dev/null fsck -t mfs -T mfs:-a "/dev/$usr" >/dev/null
fi fi
# If there is no ELF stuff and not enough space after repartitioning, # If there is no ELF stuff and not enough space after repartitioning,
@ -378,7 +378,7 @@ then
cp -pf /bin/update_bootcfg /mnt/bin/ && \ cp -pf /bin/update_bootcfg /mnt/bin/ && \
cp -pf /etc/boot.cfg.default /mnt/etc/ && \ cp -pf /etc/boot.cfg.default /mnt/etc/ && \
cp -pf /boot_monitor /mnt/ || exit cp -pf /usr/mdec/boot_monitor /mnt/ || exit
if [ ! -d /mnt/boot/minix_default -o ! -r /mnt/boot/minix_default/kernel ] if [ ! -d /mnt/boot/minix_default -o ! -r /mnt/boot/minix_default/kernel ]
then then
@ -419,7 +419,7 @@ then
umount /mnt/usr && umount /mnt || exit umount /mnt/usr && umount /mnt || exit
# Check if enough space for new boot # Check if enough space for new boot
let bootspace=`devsize /dev/$primary`-`devsize /dev/$root`-`devsize /dev/$home`-`devsize /dev/$usr` >/dev/null bootspace=$((`devsize /dev/$primary`-`devsize /dev/$root`-`devsize /dev/$home`-`devsize /dev/$usr`)) >/dev/null
if [ $bootspace -lt $BOOTXXSECTS ] if [ $bootspace -lt $BOOTXXSECTS ]
then then
echo "" echo ""
@ -591,7 +591,7 @@ else
fi fi
# Check if enough space for new boot (even if old used) # 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 bootspace=$((`devsize /dev/$primary`-`devsize /dev/$root`-`devsize /dev/$home`-`devsize /dev/$usr`)) >/dev/null
if [ $bootspace -lt $BOOTXXSECTS ] if [ $bootspace -lt $BOOTXXSECTS ]
then then
echo "Root partition size will be reduced by up to 16Kb to fit new bootloader." echo "Root partition size will be reduced by up to 16Kb to fit new bootloader."