git.annexia.org
/
virt-p2v.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Version 0.5 -- fixed tty problems, added virt-p2v-unpack script.
[virt-p2v.git]
/
virt-p2v.sh
diff --git
a/virt-p2v.sh
b/virt-p2v.sh
index
ae0d021
..
0007e54
100755
(executable)
--- a/
virt-p2v.sh
+++ b/
virt-p2v.sh
@@
-22,7
+22,11
@@
#
# $Id$
#
# $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 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
# 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
@@
-96,12
+100,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 {
# 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 {
}
# 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
}
#----------------------------------------------------------------------
}
#----------------------------------------------------------------------
@@
-286,7
+290,7
@@
function auto_network {
echo "(Hint: if not sure, there is a shell on console [ALT] [F2])"
echo -n " (y/n) "
local line
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
if [ "$line" = "y" -o "$line" = "yes" ]; then return 0; fi
return 1
fi
@@
-299,15
+303,22
@@
function auto_network {
#----------------------------------------------------------------------
# General script setup.
#----------------------------------------------------------------------
# General script setup.
+log
+log virt-p2v starting up at `date`
+
+# The first and only parameter must be the tty. Connect
+# stdin/stdout/stderr 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
#----------------------------------------------------------------------
# Dialog with the user.
# 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" \
if [ "$greeting" != "no" ]; then
dialog \
--title "virt-p2v" \
@@
-647,7
+658,8
@@
for dev in $devices_to_send; do
;;
tcp)
echo "p2v $name $sectors" > header
;;
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
;;
esac
done