An attempt at fixing some encoding issues

[ganeti-local] / scripts / gnt-cluster

diff --git a/scripts/gnt-cluster b/scripts/gnt-cluster
index 09c1eb2..9cd1f52 100755 (executable)
--- a/scripts/gnt-cluster
+++ b/scripts/gnt-cluster
@@ -381,7 +381,7 @@ def VerifyDisks(opts, args):
   if nlvm:
     for node, text in nlvm.iteritems():
       ToStdout("Error on node %s: LVM error: %s",
-               node, text[-400:].encode('string_escape'))
+               node, utils.SafeEncode(text[-400:]))
       retcode |= 1
       ToStdout("You need to fix these nodes first before fixing instances")
 
@@ -541,7 +541,7 @@ commands = {
                         help="Specify the mac prefix for the instance IP"
                         " addresses, in the format XX:XX:XX",
                         metavar="PREFIX",
-                        default="aa:00:00",),
+                        default=constants.DEFAULT_MAC_PREFIX,),
             make_option("-g", "--vg-name", dest="vg_name",
                         help="Specify the volume group name "
                         " (cluster-wide) for disk allocation [xenvg]",