Merge branch 'master' into mwhudson/kill-some-signals

This commit is contained in:
Michael Hudson-Doyle 2016-10-11 12:55:07 +13:00
commit 7f42bf3970
2 changed files with 20 additions and 0 deletions

View File

@ -8,6 +8,11 @@ trap true HUP INT QUIT TSTP
# happened and need to force it on. Yay UNIX! # happened and need to force it on. Yay UNIX!
stty icrnl stty icrnl
if [ "$(snap managed)" = "true" ]; then
touch /var/lib/console-conf/complete
exit 0
fi
cat /usr/share/subiquity/console-conf-wait cat /usr/share/subiquity/console-conf-wait
read REPLY read REPLY
exec console-conf "$@" exec console-conf "$@"

15
debian/changelog vendored
View File

@ -1,3 +1,18 @@
subiquity (0.0.20) UNRELEASED; urgency=medium
[ Michael Vogt ]
* Update code to follow latest `snap managed` API.
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Fri, 07 Oct 2016 11:33:12 -0400
subiquity (0.0.19) yakkety; urgency=medium
[ Michael Hudson-Doyle ]
* Code cleanups and refactoring.
* console-conf: do nothing if a snap system is managed.
-- Mathieu Trudel-Lapierre <cyphermox@ubuntu.com> Wed, 05 Oct 2016 13:45:37 -0400
subiquity (0.0.18) yakkety; urgency=medium subiquity (0.0.18) yakkety; urgency=medium
[ Michael Hudson-Doyle ] [ Michael Hudson-Doyle ]