4 files changed, 8 insertions, 6 deletions
diff --git a/src/lib/Bcfg2/Server/Admin/Compare.py b/src/lib/Bcfg2/Server/Admin/Compare.py
index e3648a6d0..d7285284a 100644
--- a/src/lib/Bcfg2/Server/Admin/Compare.py
+++ b/src/lib/Bcfg2/Server/Admin/Compare.py
@@ -115,7 +115,6 @@ class Compare(Bcfg2.Server.Admin.Mode):
         return identical
 
     def __call__(self, args):
-        Bcfg2.Server.Admin.Mode.__call__(self, args)
         if len(args) == 0:
             self.errExit("No argument specified.\n"
                          "Please see bcfg2-admin compare help for usage.")
diff --git a/src/lib/Bcfg2/Server/Admin/Init.py b/src/lib/Bcfg2/Server/Admin/Init.py
index 6175d8ed0..153d7bea6 100644
--- a/src/lib/Bcfg2/Server/Admin/Init.py
+++ b/src/lib/Bcfg2/Server/Admin/Init.py
@@ -20,6 +20,8 @@ from Bcfg2.Compat import input  # pylint: disable=W0622
 CONFIG = '''[server]
 repository = %s
 plugins = %s
+# Uncomment the following to listen on all interfaces
+#listen_all = true
 
 [statistics]
 sendmailpath = %s
@@ -31,7 +33,7 @@ sendmailpath = %s
 # 'postgresql', 'mysql', 'mysql_old', 'sqlite3' or 'ado_mssql'.
 #name =
 # Or path to database file if using sqlite3.
-#<repository>/bcfg2.sqlite is default path if left empty
+#<repository>/etc/bcfg2.sqlite is default path if left empty
 #user =
 # Not used with sqlite3.
 #password =
@@ -78,7 +80,7 @@ CLIENTS = '''<Clients version="3.0">
 '''
 
 # Mapping of operating system names to groups
-OS_LIST = [('Red Hat/Fedora/RHEL/RHAS/Centos', 'redhat'),
+OS_LIST = [('Red Hat/Fedora/RHEL/RHAS/CentOS', 'redhat'),
            ('SUSE/SLES', 'suse'),
            ('Mandrake', 'mandrake'),
            ('Debian', 'debian'),
@@ -234,8 +236,9 @@ class Init(Bcfg2.Server.Admin.Mode):
 
     def _prompt_server(self):
         """Ask for the server name."""
-        newserver = safe_input("Input the server location [%s]: " %
-                               self.data['server_uri'])
+        newserver = safe_input(
+            "Input the server location (the server listens on a single "
+            "interface by default) [%s]: " % self.data['server_uri'])
         if newserver != '':
             self.data['server_uri'] = newserver
 
diff --git a/src/lib/Bcfg2/Server/Admin/Snapshots.py b/src/lib/Bcfg2/Server/Admin/Snapshots.py
index c2d279391..fcb240352 100644
--- a/src/lib/Bcfg2/Server/Admin/Snapshots.py
+++ b/src/lib/Bcfg2/Server/Admin/Snapshots.py
@@ -27,7 +27,6 @@ class Snapshots(Bcfg2.Server.Admin.Mode):
         self.cfile = self.configfile
 
     def __call__(self, args):
-        Bcfg2.Server.Admin.Mode.__call__(self, args)
         if len(args) == 0 or args[0] == '-h':
             print(self.__usage__)
             raise SystemExit(0)
diff --git a/src/lib/Bcfg2/Server/Admin/Viz.py b/src/lib/Bcfg2/Server/Admin/Viz.py
index 1d9d25f16..2cbd7eaf6 100644
--- a/src/lib/Bcfg2/Server/Admin/Viz.py
+++ b/src/lib/Bcfg2/Server/Admin/Viz.py
@@ -102,6 +102,7 @@ class Viz(Bcfg2.Server.Admin.MetadataCore):
             dotpipe.stdin.write('\tcolor="lightblue";\n')
             dotpipe.stdin.write('\tBundle [ shape="septagon" ];\n')
             dotpipe.stdin.write('\tGroup [shape="ellipse"];\n')
+            dotpipe.stdin.write('\tGroup Category [shape="trapezium"];\n')
             dotpipe.stdin.write('\tProfile [style="bold", shape="ellipse"];\n')
             dotpipe.stdin.write('\tHblock [label="Host1|Host2|Host3", '
                                 'shape="record"];\n')