--- cdrom.image/upgrade.cfg 2005/07/09 20:20:39 1.10 +++ cdrom.image/upgrade.cfg 2005/07/14 21:22:39 1.11 @@ -42,7 +42,7 @@ if [ $found -gt "0" ] ; then # Check if we have any ext2/3 or swap partitions if grep -q 'Id=8[23]' /tmp/oldparts; then - echo -n "Converting partitions to RAID..." >/dev/tty1 + echo -en "\n\nConverting partitions to RAID..." >/dev/tty1 # Convert ext2/3 and swap partitions to raid autodetect sed 's/Id=8[32]/Id=fd/' /tmp/oldparts > /tmp/newparts @@ -69,15 +69,14 @@ if [ $found -gt "0" ] ; then # Write out new converted partition table sfdisk --force /dev/$disk < /tmp/newparts - echo "Checking filesystems on converted partitions. This may take a few minutes." >/dev/tty1 - echo -n "Checking filesystems..." >/dev/tty1 + echo -e "\nChecking filesystems on converted partitions. This may take a few minutes." >/dev/tty1 mkdir /mnt/tmp for part in `grep 'Id=fd' /tmp/newparts | sed "s/$disk\([0-9]\+\) :.*/md\1/"`; do if [ "$part" != "$swap" ]; then # Resize ext2/3 partitions (fix superblock - part 2) - echo -n "$part..." >/dev/tty1 - e2fsck -f $part + echo -e "\n\nChecking $part..." >/dev/tty1 + e2fsck -f -C0 $part >/dev/tty1 # Check for /etc/fstab on partitions and convert entries mount $part /mnt/tmp @@ -88,7 +87,6 @@ if [ $found -gt "0" ] ; then umount /mnt/tmp fi done - echo "done" >/dev/tty1 rmdir /mnt/tmp mdadm --stop --scan fi