1.1 --- a/xen-drbd-install.py	Fri Oct 10 22:30:16 2008 +0000
     1.2 +++ b/xen-drbd-install.py	Fri Oct 10 23:09:52 2008 +0000
     1.3 @@ -220,7 +220,7 @@
     1.4      print """
     1.5  apt-get install debootstrap lsof
     1.6  debootstrap %s /domU/%s %s
     1.7 -chroot /domU/%s apt-get install -y --force-yes %s
     1.8 +LANG=C chroot /domU/%s apt-get install -y --force-yes %s
     1.9  kill $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
    1.10  sleep 2
    1.11  kill -9 $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
    1.12 @@ -229,15 +229,16 @@
    1.13  def make_rsync():
    1.14      for dom in linux_domains[1:]:
    1.15          print """
    1.16 -rsync -a /domU/%s/ /domU/%s/
    1.17 -        """ % (linux_domains[0], dom)
    1.18 +echo -n Doing rsync for %s...
    1.19 +rsync -a /domU/%s/ /domU/%s/ && echo Done
    1.20 +        """ % (dom, linux_domains[0], dom)
    1.21  
    1.22  
    1.23  def make_install_packages():
    1.24      for dom in linux_domains:
    1.25          try:
    1.26              print """
    1.27 -chroot /domU/%s apt-get install -y --force-yes %s
    1.28 +LANG=C chroot /domU/%s apt-get install -y --force-yes %s
    1.29  kill $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
    1.30  sleep 2
    1.31  kill -9 $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
    1.32 @@ -315,10 +316,9 @@
    1.33  def make_rootssh():
    1.34      for dom in linux_domains:
    1.35          print """
    1.36 -mkdir -p /domU/%s/home/eb/.ssh/
    1.37 -chown -R 1000:1000 /domU/%s/home/eb
    1.38 +mkdir -p /domU/%s/root/.ssh/
    1.39  cp ~/.ssh/id_dsa.pub /domU/%s/root/.ssh/authorized_keys
    1.40 -chmod 600 /domU/%s/home/eb/.ssh/authorized_keys
    1.41 +chmod 600 /domU/%s/root/.ssh/authorized_keys
    1.42          """  % (dom,dom,dom,dom)
    1.43  
    1.44  def make_l3rc():

     2.1 --- a/xen-drbd.py	Fri Oct 10 22:30:16 2008 +0000
     2.2 +++ b/xen-drbd.py	Fri Oct 10 23:09:52 2008 +0000
     2.3 @@ -190,8 +190,8 @@
     2.4  
     2.5      migrate-out domain
     2.6      migrate-in domain
     2.7 -    migrate-all-out
     2.8 -    migrate-all-in
     2.9 +    migrate-out-all
    2.10 +    migrate-in-all
    2.11      migrate-my-domains-home
    2.12      migrate-and-start-my-domains
    2.13      migrate-and-start-all
    2.14 @@ -200,7 +200,7 @@
    2.15  
    2.16  Options:
    2.17      --help         (-h)   -- show usage information
    2.18 -    --network=name (-n)   -- the network descriptions is in the file name.py (default: network.py)
    2.19 +    --network=name (-n)   -- the network descriptions is in the file name (default: ''network'')
    2.20      
    2.21  
    2.22      """