From 89e68d2b50031fd4f604c00c7058ccc49776ee60 Mon Sep 17 00:00:00 2001 From: Michael Hudson-Doyle Date: Tue, 4 Oct 2016 17:12:51 +1300 Subject: [PATCH 1/5] exit console-conf immediately on a managed device --- bin/console-conf-wrapper | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/bin/console-conf-wrapper b/bin/console-conf-wrapper index 644e97a4..916bdf3b 100755 --- a/bin/console-conf-wrapper +++ b/bin/console-conf-wrapper @@ -8,6 +8,11 @@ trap true HUP INT QUIT TSTP # happened and need to force it on. Yay UNIX! stty icrnl +if [ `snap is-managed` = "true" ]; then + touch /var/lib/console-conf/complete + exit 0 +fi + cat /usr/share/subiquity/console-conf-wait read REPLY exec console-conf "$@" From 8478f1ab47eebf75b696d8aacbc072b783768e60 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 5 Oct 2016 13:39:52 -0400 Subject: [PATCH 2/5] console-conf-wrapper: output of snap is-managed is "system is managed". Signed-off-by: Mathieu Trudel-Lapierre --- bin/console-conf-wrapper | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bin/console-conf-wrapper b/bin/console-conf-wrapper index 916bdf3b..e22af057 100755 --- a/bin/console-conf-wrapper +++ b/bin/console-conf-wrapper @@ -8,7 +8,7 @@ trap true HUP INT QUIT TSTP # happened and need to force it on. Yay UNIX! stty icrnl -if [ `snap is-managed` = "true" ]; then +if [ `snap is-managed` = "system is managed" ]; then touch /var/lib/console-conf/complete exit 0 fi From 9da7ce8e4eb6d1a6c73d15b6eb06fe5f8eae5cc5 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 5 Oct 2016 13:44:40 -0400 Subject: [PATCH 3/5] Code cleanups and refactoring. * Code cleanups and refactoring. * console-conf: do nothing if a snap system is managed. --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/debian/changelog b/debian/changelog index 904a931f..556d8321 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +subiquity (0.0.19) UNRELEASED; urgency=medium + + [ Michael Hudson-Doyle ] + * Code cleanups and refactoring. + * console-conf: do nothing if a snap system is managed. + + -- Mathieu Trudel-Lapierre Wed, 05 Oct 2016 13:41:05 -0400 + subiquity (0.0.18) yakkety; urgency=medium [ Michael Hudson-Doyle ] From 143e36ec690f291dcf3b9e262253d3cc94249a2f Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Wed, 5 Oct 2016 13:45:55 -0400 Subject: [PATCH 4/5] releasing package subiquity version 0.0.19 --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 556d8321..7bf755ae 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,10 @@ -subiquity (0.0.19) UNRELEASED; urgency=medium +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 Wed, 05 Oct 2016 13:41:05 -0400 + -- Mathieu Trudel-Lapierre Wed, 05 Oct 2016 13:45:37 -0400 subiquity (0.0.18) yakkety; urgency=medium From fc10303150f0ca6e313bfeb0e3bb762af4a4f1a0 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Fri, 7 Oct 2016 11:34:45 -0400 Subject: [PATCH 5/5] Update code to follow latest `snap managed` API. --- bin/console-conf-wrapper | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/bin/console-conf-wrapper b/bin/console-conf-wrapper index e22af057..e64e080e 100755 --- a/bin/console-conf-wrapper +++ b/bin/console-conf-wrapper @@ -8,7 +8,7 @@ trap true HUP INT QUIT TSTP # happened and need to force it on. Yay UNIX! stty icrnl -if [ `snap is-managed` = "system is managed" ]; then +if [ "$(snap managed)" = "true" ]; then touch /var/lib/console-conf/complete exit 0 fi diff --git a/debian/changelog b/debian/changelog index 7bf755ae..a39ba499 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +subiquity (0.0.20) UNRELEASED; urgency=medium + + [ Michael Vogt ] + * Update code to follow latest `snap managed` API. + + -- Mathieu Trudel-Lapierre Fri, 07 Oct 2016 11:33:12 -0400 + subiquity (0.0.19) yakkety; urgency=medium [ Michael Hudson-Doyle ]