Revision 77449e7c import

b/import
33 33

  
34 34
format_disk0 $blockdev
35 35
filesystem_base_dev=$(map_disk0 $blockdev)
36
if [ "${SWAP}" = "yes" ] ; then
37
    boot_dev="${filesystem_base_dev}-1"
38
    swap_dev="${filesystem_base_dev}-2"
39
    root_dev="${filesystem_base_dev}-3"
40
else
41
    boot_dev="${filesystem_base_dev}-1"
42
    root_dev="${filesystem_base_dev}-2"
43
fi
44 36
CLEANUP+=("unmap_disk0 $blockdev")
45 37

  
46
mkfs_disk0 $boot_dev $root_dev $swap_dev
38
mkfs_disk0
47 39

  
48 40
TARGET=`mktemp -d` || exit 1
49 41
CLEANUP+=("rmdir $TARGET")
50 42
DUMPDIR=`mktemp -d` || exit 1
51 43
CLEANUP+=("rm -rf $DUMPDIR")
52 44

  
53
mount_disk0 $TARGET $root_dev $boot_dev
45
mount_disk0 $TARGET
54 46

  
55 47
# import dumps from tar file
56 48
( cd $DUMPDIR; tar -xf - )
57 49
( cd $TARGET ; restore -r -y -f ${DUMPDIR}/root.dump )
58
( cd ${TARGET}/boot ; restore -r -y -f ${DUMPDIR}/boot.dump )
50
if [ -n "${boot_dev}" ] ; then
51
    ( cd ${TARGET}/boot ; restore -r -y -f ${DUMPDIR}/boot.dump )
52
fi
59 53

  
60 54
rm -f $TARGET/etc/udev/rules.d/z*_persistent-net.rules
61 55

  

Also available in: Unified diff