--- convertfs/contrib/convertfs.orig 2005-01-13 13:27:35.000000000 +0100 +++ convertfs/contrib/convertfs 2005-01-16 15:08:49.376275560 +0100 @@ -120,13 +120,23 @@ } error() { + echo "Trying to clean up" 1>&2 umount $loopdev 2>/dev/null losetup -d $loopdev 2>/dev/null umount $dev 2>/dev/null - rm -rf $tmp + rmdir $fs1root + rmdir $fs2root + rmdir $tmp exit 1 } +for I in devclone devremap prepindex; do + if [ -z "$(which "$I")" ]; then + echo "Your it is not complete" 1>&2 + exit 1 + fi +done + # device to convert dev=$1 # filesystem to convert from @@ -193,7 +203,7 @@ echo "== Creating clone of \`$from_fs_type' filesystem that's on \`$dev'. ==" umount $dev 2>/dev/null mount -t $from_fs_type $dev $fs1root || error -./devclone $dev $fsimage || error +devclone $dev $fsimage || error echo "===== Creating destination \`$to_fs_type' filesystem. =====" umount $loopdev 2>/dev/null @@ -217,17 +227,17 @@ losetup -d $loopdev 2>/dev/null echo "=== Preparing info for block relocation ===" -./prepindex $fsimage $fsindex $fssuper || error +prepindex $fsimage $fsindex $fssuper || error umount $dev || error dd if=$fssuper of=$dev || exit sync echo "============ Relocating blocks ============" -./devremap $dev || exit +devremap $dev || exit echo "=== Filesystem conversion accomplished! ===" rm -rf $tmp echo "NOTE: If you want to boot the new filesystem on \`$dev' you" echo " should edit \`/etc/fstab' and add something like this." -echo " $dev / $to_fs_type defaults 1 1" +echo " $dev /mountpoint $to_fs_type defaults 1 1"