X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-p2v.sh;h=2bc82a492ada752703b775bc0575988777102cb8;hb=52433696d9755eb0e6cc5caa0f35b6690ace67fd;hp=274b087fc04ea6740db6e948b5ab8291aae75327;hpb=fe0ff26b9757ac927f13bf97692974be41e07e23;p=virt-p2v.git

diff --git a/virt-p2v.sh b/virt-p2v.sh
index 274b087..2bc82a4 100755
--- a/virt-p2v.sh
+++ b/virt-p2v.sh
@@ -22,7 +22,11 @@
 #
 # $Id$
 
+# Because we're running from a start-up script, we don't have much
+# of a login environment, so set one up.
 export PATH=/usr/sbin:/sbin:/usr/local/bin:/usr/kerberos/bin:/usr/bin:/bin
+export HOME=/root
+export LOGNAME=root
 
 # The defaults here make a generic virt-p2v.sh script, but if you want
 # to build a partially-/fully-automatic P2V solution, then you can set
@@ -58,12 +62,27 @@ override_root_filesystem=""
 override_network=""
 
 #----------------------------------------------------------------------
-# Logging.
+# General script setup and logging.
+
+exec 2>> /tmp/virt-p2v.log
 
 function log {
-    echo "$@" >> /tmp/virt-p2v.log
+    echo "$@" 1>&2
 }
 
+log
+log virt-p2v starting up at `date`
+
+# The first and only parameter must be the tty.  Connect
+# stdin/stdout to this device.
+if [ -n "$1" ]; then
+    log connecting to /dev/$1
+    exec </dev/$1 >/dev/$1
+fi
+
+# We can safely write files into /tmp without modifying anything.
+cd /tmp
+
 #----------------------------------------------------------------------
 # Helper functions.
 
@@ -96,12 +115,12 @@ function word_in_list {
 # Use the function read_line instead of the shell built-in read.
 # It reads from the console.
 function read_line {
-    read "$*" </dev/console
+    read "$*"
 }
 
 # Launch a bash subshell connected to the console.
 function shell {
-    PS1='\u@\h:\w\$ ' bash </dev/console >/dev/console 2>&1
+    PS1='\u@\h:\w\$ ' bash
 }
 
 #----------------------------------------------------------------------
@@ -165,7 +184,17 @@ function device_of_lvs_device {
 # Get list of physical block devices.  Sets variable $devices
 # to something like "sda sdb".
 function search_devices {
-    devices=$(cd /sys/block && /bin/ls -d [hs]d*)
+    devices1=$(cd /sys/block && /bin/ls -d [hs]d*)
+    log search_devices: devices1: $devices1
+    # Ignore devices which fail 'blockdev --getsize' - probably
+    # removable devices or other strange ones.
+    devices=""
+    for d in $devices1; do
+	if blockdev --getsize /dev/$d > /dev/null; then
+	    devices="$devices${devices:+ }$d"
+	fi
+    done
+    log search_devices: devices: $devices
 }
 
 # Get list of partitions from a physical block device.  Sets
@@ -247,6 +276,13 @@ function search_parts {
     # $parts is returned.
 }
 
+# This generates a snapshot device name from a device name.
+# eg. sda -> snap_sda
+# Sets $dname.
+function snap_name {
+    dname=`echo -n snap_"$1" | tr -cs '[:alnum:]' _`
+}
+
 #----------------------------------------------------------------------
 # Network configuration functions.
 
@@ -286,7 +322,7 @@ function auto_network {
 	echo "(Hint: if not sure, there is a shell on console [ALT] [F2])"
 	echo -n "    (y/n) "
 	local line
-	read_line line </dev/console
+	read_line line
 	if [ "$line" = "y" -o "$line" = "yes" ]; then return 0; fi
 	return 1
     fi
@@ -295,19 +331,9 @@ function auto_network {
     return $status
 }
 
-
-#----------------------------------------------------------------------
-# General script setup.
-
-# We can safely write files into /tmp without modifying anything.
-cd /tmp
-
 #----------------------------------------------------------------------
 # Dialog with the user.
 
-log
-log virt-p2v starting up at `date`
-
 if [ "$greeting" != "no" ]; then
     dialog \
 	--title "virt-p2v" \
@@ -419,9 +445,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 \
@@ -529,13 +558,14 @@ rm -f /etc/lvm/cache/.cache
 
 # Snapshot the block devices.
 for d in $devices_to_send; do
-    log snapshotting block device /dev/$d ...
+    snap_name $d
+    log snapshotting block device /dev/$d to $dname ...
 
-    snapshot $d snap_$d
+    snapshot $d $dname
 
     # The block devices are whole disks.  Use kpartx to repartition them.
-    log running kpartx -a /dev/mapper/snap_$d ...
-    kpartx -a /dev/mapper/snap_$d
+    log running kpartx -a /dev/mapper/$dname ...
+    kpartx -a /dev/mapper/$dname
 done
 
 # Rescan for LVs.
@@ -549,8 +579,11 @@ vgchange -a y
 
 log mount $root_filesystem as /mnt/root
 
-if [ -f /dev/mapper/snap_$root_filesystem ]; then
-    mount /dev/mapper/snap_$root_filesystem /mnt/root
+snap_name $root_filesystem
+root_filesystem_dname="$dname"
+
+if [ -b /dev/mapper/$root_filesystem_dname ]; then
+    mount /dev/mapper/$root_filesystem_dname /mnt/root
 else
     mount /dev/$root_filesystem /mnt/root
 fi
@@ -594,7 +627,7 @@ log rewriting /etc/fstab
 cp /mnt/root/etc/fstab /mnt/root/etc/fstab.p2vsaved
 while read dev mountpoint fstype options freq passno; do
     # If device is /dev/sd* then on the target fullvirt machine
-    # it will be /dev/sd*
+    # it will be /dev/hd*
     if matches_regexp "^/dev/sd[[:alpha:]]+[[:digit:]]+$" "$dev"; then
 	dev=`echo $dev | sed 's|^/dev/sd|/dev/hd|'`
     fi
@@ -634,20 +667,23 @@ for dev in $devices_to_send; do
     name="$basename-$rdev.img"
     log sending $dev to $name
 
-    sectors=`blockdev --getsize /dev/mapper/snap_$dev`
+    snap_name $dev
+
+    sectors=`blockdev --getsize /dev/mapper/$dname`
 
     gigs=$(($sectors/2/1024/1024))
     echo "Sending /dev/$dev (${gigs} GB) to remote machine"
 
-    dd if=/dev/mapper/snap_$dev |
+    dd if=/dev/mapper/$dname | gzip --best |
     case "$remote_transport" in
 	ssh)
 	    ssh -p "$remote_port" "$remote_host" \
-		"cat > $remote_directory/$name"
+		"zcat > $remote_directory/$name"
 	    ;;
 	tcp)
 	    echo "p2v $name $sectors" > header
-	    cat header - | nc "$remote_host" "$remote_port"
+	    echo > newline
+	    cat header - newline | nc "$remote_host" "$remote_port"
 	    ;;
     esac
 done
@@ -657,8 +693,9 @@ done
 # Clean up.
 
 #for d in $devices_to_send; do
-#    kpartx -d /dev/mapper/snap_$d
-#    drop_snapshot snap_$d
+#    snap_name $d
+#    kpartx -d /dev/mapper/$dname
+#    drop_snapshot $dname
 #done
 
 # This file must end with a newline