Merge lp:~mwhudson/livecd-rootfs/subiquity-loadkeys

debian/changelog

@@ -1,5 +1,6 @@
 livecd-rootfs (2.463) UNRELEASED; urgency=medium
 
+  [ Balint Reczey ]
   * Bump needed live-build version which can build images without initrd
   * Mention unminimize script in motd
   * Warn users that unminimize may fail reinstalling packages
@@ -8,6 +9,9 @@ livecd-rootfs (2.463) UNRELEASED; urgency=medium
   * Run autopkgtest for SUBPROJECT=minimized
   * When SUBPROJECT environment variable is not set assume it to be ""
 
+  [ Michael Hudson-Doyle ]
+  * Fix path to subiquity-loadkeys 
+
  -- Balint Reczey <rbalint@ubuntu.com>  Fri, 29 Sep 2017 15:38:33 -0400
 
 livecd-rootfs (2.462) artful; urgency=medium

live-build/ubuntu-server/includes.binary/overlay/lib/systemd/system/subiquity.service

@@ -11,7 +11,7 @@ ConditionPathExists=!/run/subiquity/complete
 Environment=PYTHONPATH=/usr/share/subiquity
 ExecStartPre=/bin/systemctl stop getty@tty1
 ExecStartPre=/bin/dmesg -n 1
-ExecStartPre=/usr/bin/subiquity-loadkeys
+ExecStartPre=/snap/bin/subiquity.subiquity-loadkeys
 ExecStart=/sbin/agetty -n --noclear -l /snap/bin/subiquity tty1 $TERM
 ExecStopPost=/bin/systemctl start getty@tty1
 Type=idle