X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=virt-p2v.sh;h=ab62404aff1602db4a73efeb4e2cdcad4a03d3f9;hb=73f18e249d542d8c2d406565b0690d7c47194100;hp=faaaf20fd843e6a68196ccbc4eaa827ad02d5d60;hpb=1b397fce73c2fb3141250518a408b5196a577577;p=virt-p2v.git

diff --git a/virt-p2v.sh b/virt-p2v.sh
index faaaf20..ab62404 100755
--- a/virt-p2v.sh
+++ b/virt-p2v.sh
@@ -28,22 +28,18 @@ override_remote_transport=
 # (only if override_remote_transport is 'ssh')
 override_remote_directory=
 
-# list of local physical devices to examine, separated by spaces,
+# list of local physical devices to send, separated by spaces,
 # if empty ask user.
 # this is usually a list of whole disk devices (eg. "sda")
-override_physical_devices=""
+override_devices_to_send=""
 
-# list of filesystems to send (eg. "sda1 sda2 VolGroup00/LogVol00")
-override_filesystems_to_send=""
-
-# list of root filesystems to examine (eg. "sda3" or
+# the root filesystem containing /etc/fstab (eg. "sda3" or
 # "VolGroup00/LogVol00")
-override_root_filesystems=""
+override_root_filesystem=""
 
 # network configuration
 #  - if empty, ask user
-#  - if contains a filesystem name (eg. "VolGroup00/LogVol00") try to
-#    auto-configure network from that
+#  - "auto" means try to autoconfigure from root filesystem
 # (XXX needs to contain more ways to override in future)
 override_network=""
 
@@ -81,8 +77,24 @@ function word_in_list {
 }
 
 #----------------------------------------------------------------------
+# I/O functions
+
+# Use the function read_line instead of the shell built-in read.
+# It reads from the console.
+function read_line {
+    read "$*" </dev/console
+}
+
+# Launch a bash subshell connected to the console.
+function shell {
+    PS1='\u@\h:\w\$ ' bash </dev/console >/dev/console 2>&1
+}
+
+#----------------------------------------------------------------------
 # Device mapper snapshotting.
 
+next_ramdisk=1
+
 # Create a device-mapper snapshot of a device with ramdisk overlay.
 # Example:
 #   snapshot sda1 snap
@@ -90,6 +102,10 @@ function word_in_list {
 function snapshot {
     local dev=$1 name=$2
 
+    # Next free ramdisk (/dev/ram$i)
+    local i=$next_ramdisk
+    next_ramdisk=$(($next_ramdisk+1))
+
     # Get size of the device in sectors.
     local sectors=`blockdev --getsize /dev/$dev`
 
@@ -97,7 +113,7 @@ function snapshot {
 	--table="0 $sectors snapshot-origin /dev/$dev"
     if [ $? -ne 0 ]; then exit 1; fi
     dmsetup create $name \
-	--table="0 $sectors snapshot /dev/mapper/${name}_org /dev/ram1 n 64"
+	--table="0 $sectors snapshot /dev/mapper/${name}_org /dev/ram$i n 64"
     if [ $? -ne 0 ]; then exit 1; fi
 }
 
@@ -106,6 +122,8 @@ function snapshot {
 #   drop_snapshot snap
 # drops a snapshot called /dev/mapper/snap
 function drop_snapshot {
+    local name=$1
+
     dmsetup remove /dev/mapper/$name
     dmsetup remove /dev/mapper/${name}_org
 }
@@ -218,10 +236,11 @@ function search_parts {
 #----------------------------------------------------------------------
 # Network configuration functions.
 
-# `auto_network $fs' mounts /dev/$fs read-only on /mnt/root and then
-# tries to configure the network from it.  Returns true or false.
+# `auto_network $fs' tries to configure the network from the
+# root filesystem.  Returns true or false.
 function auto_network {
-    if ! mount -o ro /dev/$1 /mnt; then return 1; fi
+    # Make sure this file exists, otherwise Fedora gives a warning.
+    touch /etc/resolv.conf
 
     pushd /etc/sysconfig
 
@@ -229,25 +248,31 @@ function auto_network {
     mv networking networking.saved
     mv network-scripts network-scripts.saved
 
-    ln -s /mnt/etc/sysconfig/network
-    ln -s /mnt/etc/sysconfig/networking
-    ln -s /mnt/etc/sysconfig/network-scripts
+    # Originally I symlinked these, but that causes dhclient to
+    # keep open /mnt/root (as its cwd is in network-scripts subdir).
+    # So now we will copy them recursively instead.
+    cp -r /mnt/root/etc/sysconfig/network .
+    cp -r /mnt/root/etc/sysconfig/networking .
+    cp -r /mnt/root/etc/sysconfig/network-scripts .
 
     /etc/init.d/network start
     local status=$?
 
-    rm network networking network-scripts
+    rm -rf network networking network-scripts
     mv network.saved network
     mv networking.saved networking
     mv network-scripts.saved network-scripts
-    umount /mnt
+
+    popd
+
+    ping -c 3 $remote_host
 
     if [ "$greeting" != "no" ]; then
 	echo "Did automatic network configuration work?"
 	echo "(Hint: if not sure, there is a shell on console [ALT] [F2])"
 	echo -n "    (y/n) "
 	local line
-	read line
+	read_line line </dev/console
 	if [ "$line" = "y" -o "$line" = "yes" ]; then return 0; fi
 	return 1
     fi
@@ -364,9 +389,9 @@ while [ "$state" != "exit" ]; do
 
 	# Block devices configuration.
 	devices)
-	    if [ -n "$override_physical_devices" ]; then
-		physical_devices="$override_physical_devices"
-		state=filesystems
+	    if [ -n "$override_devices_to_send" ]; then
+		devices_to_send="$override_devices_to_send"
+		state=root
 	    else
 		# Returns the list of physical devices in $devices
 		search_devices
@@ -375,7 +400,7 @@ while [ "$state" != "exit" ]; do
 
 		deviceslist=""
 		for d in $devices; do
-		    if word_in_list $d $physical_devices; then
+		    if word_in_list $d $devices_to_send; then
 			stat=on
 		    else
 			stat=off
@@ -387,58 +412,31 @@ while [ "$state" != "exit" ]; do
 		dialog \
 		    --extra-button --extra-label "Back" --nocancel \
 		    --single-quoted \
-		    --checklist "Pick local disks to examine" 15 50 8 \
+		    --checklist "Pick disks to send" 15 50 8 \
 		    $deviceslist \
 		    2> line
 		if [ $? -eq 3 ]; then state=directory
 		else
-		    physical_devices=`cat line`
-		    state=filesystems
+		    devices_to_send=`cat line`
+		    state=root
 		fi
 	    fi
 	    ;;
-	filesystems)
-	    if [ -n "$override_filesystems_to_send" ]; then
-		filesystems_to_send="$override_filesystems_to_send"
-		state=roots
+
+	# Root filesystem.
+	root)
+	    if [ -n "$override_root_filesystem" ]; then
+		root_filesystem="$override_root_filesystem"
+		state=network
 	    else
 		# Returns the list of possible partitions / LVs in $parts
-		search_parts $physical_devices
+		search_parts $devices_to_send
 
 		log partitions returned by search_parts: $parts
 
 		partslist=""
-		for p in $parts; do
-		    if word_in_list $p $filesystems_to_send; then
-			stat=on
-		    else
-			stat=off
-		    fi
-		    gigs=$(($(blockdev --getsize /dev/$p)/2/1024/1024))
-		    partslist="$partslist $p /dev/$p(${gigs}GB) $stat"
-		done
-
-		dialog \
-		    --extra-button --extra-label "Back" --nocancel \
-		    --single-quoted \
-		    --checklist "Pick filesystems to send" 15 70 8 \
-		    $partslist \
-		    2> line
-		if [ $? -eq 3 ]; then state=devices
-		else
-		    filesystems_to_send=`cat line`
-		    state=roots
-		fi
-	    fi
-	    ;;
-	roots)
-	    if [ -n "$override_root_filesystems" ]; then
-		root_filesystems="$override_root_filesystems"
-		state=network
-	    else
-		partslist=""
-		for r in $filesystems_to_send; do
-		    if word_in_list $r $root_filesystems; then
+		for r in $parts; do
+		    if word_in_list $r $root_filesystem; then
 			stat=on
 		    else
 			stat=off
@@ -449,12 +447,12 @@ while [ "$state" != "exit" ]; do
 		dialog \
 		    --extra-button --extra-label "Back" --nocancel \
 		    --single-quoted \
-		    --checklist "Pick partition(s) containing a root (/) filesystem" 10 70 5 \
+		    --radiolist "Pick partition containing the root (/) filesystem" 10 70 5 \
 		    $partslist \
 		    2> line
-		if [ $? -eq 3 ]; then state=filesystems
+		if [ $? -eq 3 ]; then state=devices
 		else
-		    root_filesystems=`cat line`
+		    root_filesystem=`cat line`
 		    state=network
 		fi
 	    fi
@@ -466,24 +464,14 @@ while [ "$state" != "exit" ]; do
 		network="$override_network"
 		state=verify
 	    else
-		partslist=""
-		for r in $root_filesystems; do
-		    if [ "$r" = "$network" ]; then
-			stat=on
-		    else
-			stat=off
-		    fi
-		    partslist="$partslist $r Auto-configure $stat"
-		done
-
 		dialog \
 		    --extra-button --extra-label "Back" --nocancel \
 		    --radiolist "Network configuration" 10 70 5 \
-		    $partslist \
+		    "auto" "Auto-configure from root filesystem" on \
 		    "ask" "Manual configuration" off \
 		    "sh" "Configure from the shell" off \
 		    2> line
-		if [ $? -eq 3 ]; then state=roots
+		if [ $? -eq 3 ]; then state=root
 		else
 		    network=`cat line`
 		    state=verify
@@ -498,8 +486,8 @@ while [ "$state" != "exit" ]; do
 	    else
 		dialog \
 		    --title "Summary" \
-		    --yesno "Transport: $remote_transport\nRemote host: $remote_host\nRemote port: $remote_port\nRemote directory (ssh only): $remote_directory\nFilesystems to send: $filesystems_to_send\nRoot filesystem(s): $root_filesystems\nNetwork configuration: $network\n\nProceed with these settings?" \
-		    23 70
+		    --yesno "Transport: $remote_transport\nRemote host: $remote_host\nRemote port: $remote_port\nRemote directory (ssh only): $remote_directory\nDisks to send: $devices_to_send\nRoot filesystem: $root_filesystem\nNetwork configuration: $network\n\nProceed with these settings?" \
+		    18 70
 		if [ $? -eq 1 ]; then
 		    state=transport
 		else
@@ -516,6 +504,42 @@ done
 
 clear
 
+# De-activate all volume groups and switch to new dm-only LVM config.
+log deactivating volume groups
+
+vgchange -a n
+mv /etc/lvm/lvm.conf /etc/lvm/lvm.conf.old
+mv /etc/lvm/lvm.conf.new /etc/lvm/lvm.conf
+rm -f /etc/lvm/cache/.cache
+
+# Snapshot the block devices.
+for d in $devices_to_send; do
+    log snapshotting block device /dev/$d ...
+
+    snapshot $d snap_$d
+
+    # 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
+done
+
+# Rescan for LVs.
+log running vgscan
+vgscan
+vgchange -a y
+
+# Mount the root filesystem on /mnt/root.  If it's a physical
+# device then we want to mount (eg) /dev/mapper/snap_sda2.
+# If it's a LVM device then we can just mount the LVM partition.
+
+log mount $root_filesystem as /mnt/root
+
+if [ -f /dev/mapper/snap_$root_filesystem ]; then
+    mount /dev/mapper/snap_$root_filesystem /mnt/root
+else
+    mount /dev/$root_filesystem /mnt/root
+fi
+
 # Now see if we can get a network configuration.
 log network configuration $network
 
@@ -525,45 +549,38 @@ case "$network" in
 	echo
 	echo "Please configure the network from this shell."
 	echo
-	echo "You can modify any file under /etc (especially /etc/sysconfig)."
-	echo "No changes are made to the system disks unless you mount them"
-	echo "and explicitly modify them."
-	echo
 	echo "When finished, exit with ^D or exit"
 	echo
-	bash
+	shell
 	;;
 
     ask)
 	# XXX Not implemented
 	echo "Sorry, we didn't implement this one yet."
-	bash
+	shell
 	;;
 
-    *)
+    auto)
 	echo "Trying to auto-configure network from /dev/$network ..."
 	echo
 	if ! auto_network "$network"; then
 	    echo "Auto-configuration failed.  Starting a shell."
 	    echo
-	    bash
+	    shell
 	fi
 esac
 
-# Mount the root filesystem(s) using device-mapper snapshots.
-# The snapshots are called snap0, snap1, etc. with the number
-# corresponding to its index in $root_filesystems array.
-
-
-
-
 
 
 
 
 
 
+#----------------------------------------------------------------------
+# Clean up.
 
+umount /mnt/root
+drop_snapshot snap
 
 # This file must end with a newline