# HG changeset patch
# User root@linux10
# Date 1223680192 0
# Node ID 8afb0999f5626fdc47b0ef168096e1f6a3195441
# Parent  f7d6a94aa307cab02a887f0c885df0f974f0eddd
minifixes: LANG=C apt-get, show_usage, rsync comment

diff -r f7d6a94aa307 -r 8afb0999f562 xen-drbd-install.py
--- a/xen-drbd-install.py	Fri Oct 10 22:30:16 2008 +0000
+++ b/xen-drbd-install.py	Fri Oct 10 23:09:52 2008 +0000
@@ -220,7 +220,7 @@
     print """
 apt-get install debootstrap lsof
 debootstrap %s /domU/%s %s
-chroot /domU/%s apt-get install -y --force-yes %s
+LANG=C chroot /domU/%s apt-get install -y --force-yes %s
 kill $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
 sleep 2
 kill -9 $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
@@ -229,15 +229,16 @@
 def make_rsync():
     for dom in linux_domains[1:]:
         print """
-rsync -a /domU/%s/ /domU/%s/
-        """ % (linux_domains[0], dom)
+echo -n Doing rsync for %s...
+rsync -a /domU/%s/ /domU/%s/ && echo Done
+        """ % (dom, linux_domains[0], dom)
 
 
 def make_install_packages():
     for dom in linux_domains:
         try:
             print """
-chroot /domU/%s apt-get install -y --force-yes %s
+LANG=C chroot /domU/%s apt-get install -y --force-yes %s
 kill $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
 sleep 2
 kill -9 $(lsof +D /domU/%s | grep -v PID | awk '{print $2}' | sort -u) 2> /dev/null
@@ -315,10 +316,9 @@
 def make_rootssh():
     for dom in linux_domains:
         print """
-mkdir -p /domU/%s/home/eb/.ssh/
-chown -R 1000:1000 /domU/%s/home/eb
+mkdir -p /domU/%s/root/.ssh/
 cp ~/.ssh/id_dsa.pub /domU/%s/root/.ssh/authorized_keys
-chmod 600 /domU/%s/home/eb/.ssh/authorized_keys
+chmod 600 /domU/%s/root/.ssh/authorized_keys
         """  % (dom,dom,dom,dom)
 
 def make_l3rc():
diff -r f7d6a94aa307 -r 8afb0999f562 xen-drbd.py
--- a/xen-drbd.py	Fri Oct 10 22:30:16 2008 +0000
+++ b/xen-drbd.py	Fri Oct 10 23:09:52 2008 +0000
@@ -190,8 +190,8 @@
 
     migrate-out domain
     migrate-in domain
-    migrate-all-out
-    migrate-all-in
+    migrate-out-all
+    migrate-in-all
     migrate-my-domains-home
     migrate-and-start-my-domains
     migrate-and-start-all
@@ -200,7 +200,7 @@
 
 Options:
     --help         (-h)   -- show usage information
-    --network=name (-n)   -- the network descriptions is in the file name.py (default: network.py)
+    --network=name (-n)   -- the network descriptions is in the file name (default: ''network'')
     
 
     """