From 023325fdde74f77631f277423b7048b650fadc8e Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Fri, 13 Sep 2013 00:00:17 +0200 Subject: [PATCH 1/2] Provide a way to get out of the first-boot screen, even if it isn't ready yet. --- modules/installed/first_boot.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot.py index ff3a27e63..d20b0a76c 100644 --- a/modules/installed/first_boot.py +++ b/modules/installed/first_boot.py @@ -109,6 +109,15 @@ TODO: explain all this cert stuff to the user.

TODO: add instrux for installing certificate.

After you have installed """ + # TODO complete first_boot handling + # Make sure the user is not stuck on a dead end for now. + with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db: + db['state']=5 + main = main + """ +

Welcome screen not done. Press continue to +see the rest of the web interface.

" +""" + if False: ## Update state to 2 and head there with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db: From 8cd1d23e1e0e1957139f627007b0a37e9ca145c5 Mon Sep 17 00:00:00 2001 From: Petter Reinholdtsen Date: Fri, 13 Sep 2013 10:04:50 +0200 Subject: [PATCH 2/2] Improve message shown to the users. --- modules/installed/first_boot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/installed/first_boot.py b/modules/installed/first_boot.py index d20b0a76c..36c32f114 100644 --- a/modules/installed/first_boot.py +++ b/modules/installed/first_boot.py @@ -114,7 +114,7 @@ TODO: explain all this cert stuff to the user.

with sqlite_db(cfg.store_file, table="firstboot", autocommit=True) as db: db['state']=5 main = main + """ -

Welcome screen not done. Press continue to +

Welcome screen not completely implemented yet. Press continue to see the rest of the web interface.

" """