X-Git-Url: http://git.equinoxoli.org/?p=ext%2Finstance-debootstrap.git;a=blobdiff_plain;f=import;h=2a4542e12b82d641a4ad54793383ff0e578c0d4c;hp=0207fa62f1806d8ad7279ecef454aa4272f87982;hb=427f2957eb63079bd534bef94dcdc942da93313f;hpb=3474d1eb7a8f033ad59b2b00d30b2aadb8392ddc

diff --git a/import b/import
index 0207fa6..2a4542e 100755
--- a/import
+++ b/import
@@ -21,10 +21,12 @@ set -e
 
 . common.sh
 
-mkswap $swapdev
 mke2fs -Fjq $blockdev
-swap_uuid=$(/sbin/vol_id --uuid $swapdev )
 root_uuid=$(/sbin/vol_id --uuid $blockdev )
+if [ -n "$swapdev" ]; then
+  mkswap $swapdev
+  swap_uuid=$(/sbin/vol_id --uuid $swapdev )
+fi
 
 TMPDIR=`mktemp -d` || exit 1
 trap "umount $TMPDIR; rmdir $TMPDIR" EXIT
@@ -43,11 +45,17 @@ rm -f $TMPDIR/etc/udev/rules.d/z25_persistent-net.rules
 # Fix /etc/fstab with the new volumes' UUIDs
 if [ -e $TMPDIR/etc/fstab ]; then
   ROOT_LINE="UUID=$root_uuid  /     ext3  defaults  0  1"
-  SWAP_LINE="UUID=$swap_uuid  swap  swap  defaults  0  0"
-  cat $TMPDIR/etc/fstab | \
-    sed -re "s#^(/dev/sda|UUID=[a-f0-9-]+)\s+/\s+.*\$#$ROOT_LINE#" \
-        -re "s#^(/dev/sdb|UUID=[a-f0-9-]+)\s+swap\s+.*\$#$SWAP_LINE#" \
-    > $TMPDIR/etc/fstab.new
+  if [ -n "$swapdev" ]; then
+    SWAP_LINE="UUID=$swap_uuid  swap  swap  defaults  0  0"
+    cat $TMPDIR/etc/fstab | \
+      sed -re "s#^(/dev/sda|UUID=[a-f0-9-]+)\s+/\s+.*\$#$ROOT_LINE#" \
+          -re "s#^(/dev/sdb|UUID=[a-f0-9-]+)\s+swap\s+.*\$#$SWAP_LINE#" \
+      > $TMPDIR/etc/fstab.new
+  else
+    cat $TMPDIR/etc/fstab | \
+      sed -re "s#^(/dev/sda|UUID=[a-f0-9-]+)\s+/\s+.*\$#$ROOT_LINE#" \
+      > $TMPDIR/etc/fstab.new
+  fi
   mv $TMPDIR/etc/fstab.new  $TMPDIR/etc/fstab
 fi