Changeset 31

Timestamp:

03/27/09 01:31:30 (18 months ago)

Author:

cryx

Message:

only calculate swapsize when there is one, create at least an empty fstab

Files:

• manageBE/create-zfsboot-gpt.sh (modified) (3 diffs)

manageBE/create-zfsboot-gpt.sh

@@ -10 +10 @@
 fi
 
-swapsize=`echo "${swapsize}"|tr GMKBWX gmkbwx|sed -Ees:g:km:g -es:m:kk:g -es:k:"*2b":g -es:b:"*128w":g -es:w:"*4 ":g -e"s:(^|[^0-9])0x:\1\0X:g" -ey:x:"*":|bc |sed "s:\.[0-9]*$::g"`
-swapsize=`echo "${swapsize}/512" |bc`
 
 gpart create -s gpt $geom
@@ -18 +16 @@
 
 if [ "$swapsize" ]; then
+  swapsize=`echo "${swapsize}"|tr GMKBWX gmkbwx|sed -Ees:g:km:g -es:m:kk:g -es:k:"*2b":g -es:b:"*128w":g -es:w:"*4 ":g -e"s:(^|[^0-9])0x:\1\0X:g" -ey:x:"*":|bc |sed "s:\.[0-9]*$::g"`
+  swapsize=`echo "${swapsize}/512" |bc`
   offset=`gpart show $geom | grep '\- free \-' | awk '{print $1}'`
   gpart add -b $offset -s $swapsize -t freebsd-swap $geom
@@ -66 +66 @@
 echo "vfs.root.mountfrom=\"zfs:$pool/ROOT/$pool\"" >> /$pool/ROOT/$pool/boot/loader.conf
 echo 'zfs_enable="YES"' >> /$pool/ROOT/$pool/etc/rc.conf
+touch /$pool/ROOT/$pool/etc/fstab
 
 if [ "$swapsize" ]; then