From: rjones <devnull@localhost>
Date: Fri, 11 Jan 2008 16:50:05 +0000 (+0000)
Subject: Additional logging on the failing "devices" state.
X-Git-Url: http://git.annexia.org/?a=commitdiff_plain;h=ed6daabef5e8dfab691520e94e2c39458cd3a8ec;p=virt-p2v.git

Additional logging on the failing "devices" state.
Comment out the squid proxy.
Version 0.6 for release to UP.COM.
---

diff --git a/Makefile b/Makefile
index 123efae..fc61da1 100644
--- a/Makefile
+++ b/Makefile
@@ -23,7 +23,7 @@
 # General configuration
 
 PACKAGE  := virt-p2v
-VERSION  := 0.5
+VERSION  := 0.6
 
 # i386 images also work on x86-64, so best to stick with i386.
 ARCH     := i386
@@ -32,12 +32,12 @@ LANG	 := en_US.UTF-8
 KEYBOARD := us
 TIMEZONE := US/Eastern
 
-BASEREPO := http://download.fedora.redhat.com/pub/fedora/linux/releases/7/Fedora/$(ARCH)/os/
+BASEREPO := http://download.fedora.redhat.com/pub/fedora/linux/releases/8/Fedora/$(ARCH)/os/
 
 # Select a suitable HTTP proxy.
 # The default assumes a local squid proxy.
-export http_proxy := http://127.0.0.1:3128/
-export ftp_proxy := http://127.0.0.1:3128/
+#export http_proxy := http://127.0.0.1:3128/
+#export ftp_proxy := http://127.0.0.1:3128/
 
 LABEL	 := $(PACKAGE)-$(VERSION)
 
diff --git a/virt-p2v.sh b/virt-p2v.sh
index 7bae812..228e1fc 100755
--- a/virt-p2v.sh
+++ b/virt-p2v.sh
@@ -437,9 +437,12 @@ while [ "$state" != "exit" ]; do
 		    else
 			stat=off
 		    fi
+		    log running blockdev --getsize /dev/$d
 		    gigs=$(($(blockdev --getsize /dev/$d)/2/1024/1024))
+		    log /dev/$d has size $gigs
 		    deviceslist="$deviceslist $d /dev/$d(${gigs}GB) $stat"
 		done
+		log deviceslist="$deviceslist"
 
 		dialog \
 		    --extra-button --extra-label "Back" --nocancel \