Merge branch 'master' into mwhudson/lp-1618239

Conflicts:
	debian/console-conf.serial-console-conf@.service

debian/changelog

@@ -1,3 +1,16 @@
+subiquity (0.0.12) UNRELEASED; urgency=medium
+
+  * debian/console-conf.serial-console-conf@.service: start with --serial so
+    we don't spew as many control chars on the serial interface.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Mon, 29 Aug 2016 19:09:11 -0400
+
+subiquity (0.0.11) yakkety; urgency=medium
+
+  * debian/console-conf.dirs: add /var/lib/console-conf.
+
+ -- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com>  Fri, 26 Aug 2016 16:35:57 -0400
+
 subiquity (0.0.10) yakkety; urgency=medium
 
   * Release 0.0.10: we want subiquity on all architectures.

debian/console-conf.dirs

@@ -0,0 +1 @@
+/var/lib/console-conf

debian/console-conf.serial-console-conf@.service

@@ -8,7 +8,7 @@ ConditionPathExists=!/var/lib/console-conf/complete
 [Service]
 Environment=PYTHONPATH=/usr/share/subiquity
 ExecStartPre=/bin/systemctl stop serial-getty@%I
-ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/console-conf-wrapper %I $TERM
+ExecStart=-/sbin/agetty -n --noclear -l /usr/bin/console-conf-wrapper --serial %I $TERM
 ExecStop=/bin/systemctl start serial-getty@%I
 Type=idle
 Restart=always

subiquitycore/log.py

@@ -25,8 +25,7 @@ LOGFILE = os.path.join(LOGDIR, "subiquity-debug.log")
 def setup_logger(name=__name__, dir=LOGDIR):
     LOGFILE = os.path.join(dir, "subiquity-debug.log")
     try:
-        if not os.path.isdir(dir):
-            os.makedirs(dir)
+        os.makedirs(dir, exist_ok=True)
         log = TimedRotatingFileHandler(LOGFILE,
                                        when='D',
                                        interval=1,