lxc-start-ephemeral: startup time improvement

src/lxc/lxc-start-ephemeral.in

@@ -233,12 +233,17 @@ if not dest.start() or not dest.wait("RUNNING", timeout=5):
         dest.destroy()
     sys.exit(1)
 
+# Deal with the case where we just attach to the container's console
+if not args.command and not args.daemon:
+    dest.console(tty=1)
+    dest.shutdown(timeout=5)
+    sys.exit(0)
+
 # Try to get the IP addresses
-ips = dest.get_ips(timeout=5)
+ips = dest.get_ips(timeout=10)
 
-# Deal with the case where we don't start a command in the container
-if not args.command:
-    if args.daemon:
+# Deal with the case where we just print info about the container
+if args.daemon:
     print(_("""The ephemeral container is now started.
 
 You can enter it from the command line with: lxc-console -n %s
@@ -249,10 +254,6 @@ The following IP addresses have be found in the container:
                         or [" - %s" % _("No address could be found")])
         ))
     sys.exit(0)
-    else:
-        dest.console(tty=1)
-        dest.shutdown(timeout=5)
-        sys.exit(0)
 
 # Now deal with the case where we want to run a command in the container
 if not ips: