[haiku-commits] haiku: hrev45286 - data/system/boot src/apps/firstbootprompt

From: mattmadia@xxxxxxxxx
To: haiku-commits@xxxxxxxxxxxxx
Date: Sat, 16 Feb 2013 17:25:38 +0100 (CET)
hrev45286 adds 2 changesets to branch 'master'
old head: e0566cc88e73d34d5fe58f66ec7d04bc7017b273
new head: e4ba645c453ce75cca53c0deeaa4989d33c48958
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=e4ba645+%5Ee0566cc

----------------------------------------------------------------------------

eede25d: Make FirstBootPrompt write the settings immediately upon launch.
  
  If a user does not select anything, the default settings will be written.
  Part of #9427

e4ba645: Changed the logic for launching FirstBootPrompt.
  
  Always launch on read only medium.
  Launch when the Locale settings file does not exist.
  
  Fixes #9427.

                                        [ Matt Madia <mattmadia@xxxxxxxxx> ]

----------------------------------------------------------------------------

2 files changed, 4 insertions(+), 3 deletions(-)
data/system/boot/Bootscript                   | 5 +++--
src/apps/firstbootprompt/BootPromptWindow.cpp | 2 +-

############################################################################

Commit:      eede25d31f3f4ddf64433e4b5f2335bd948aad4b
URL:         http://cgit.haiku-os.org/haiku/commit/?id=eede25d
Author:      Matt Madia <mattmadia@xxxxxxxxx>
Date:        Sat Feb 16 16:19:10 2013 UTC

Ticket:      https://dev.haiku-os.org/ticket/9427

Make FirstBootPrompt write the settings immediately upon launch.

If a user does not select anything, the default settings will be written.
Part of #9427

----------------------------------------------------------------------------

diff --git a/src/apps/firstbootprompt/BootPromptWindow.cpp 
b/src/apps/firstbootprompt/BootPromptWindow.cpp
index 113a7d7..b819133 100644
--- a/src/apps/firstbootprompt/BootPromptWindow.cpp
+++ b/src/apps/firstbootprompt/BootPromptWindow.cpp
@@ -171,7 +171,7 @@ BootPromptWindow::BootPromptWindow()
        fKeymapsMenuField = new BMenuField("", "", new BMenu(""));
        fKeymapsMenuField->Menu()->SetLabelFromMarked(true);
 
-       _InitCatalog(false);
+       _InitCatalog(true);
        _PopulateLanguages();
        _PopulateKeymaps();
 

############################################################################

Revision:    hrev45286
Commit:      e4ba645c453ce75cca53c0deeaa4989d33c48958
URL:         http://cgit.haiku-os.org/haiku/commit/?id=e4ba645
Author:      Matt Madia <mattmadia@xxxxxxxxx>
Date:        Sat Feb 16 16:23:37 2013 UTC

Ticket:      https://dev.haiku-os.org/ticket/9427

Changed the logic for launching FirstBootPrompt.

Always launch on read only medium.
Launch when the Locale settings file does not exist.

Fixes #9427.

----------------------------------------------------------------------------

diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index a49439d..4841b2d 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -117,8 +117,8 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi
 
 # Now ask the user if he wants to run the Installer or continue to the Desktop.
-freshInstallIndicator=/boot/common/settings/fresh_install
-if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then
+localeSettings=/boot/home/config/settings/Locale\ settings
+if [ "$isReadOnly" = "yes" -o ! -e "$localeSettings" ]; then
        /bin/FirstBootPrompt
        if [ $? -eq 0 ]; then
                launchscript $SCRIPTS/Bootscript.cd
@@ -190,6 +190,7 @@ if [ "$SAFEMODE" != "yes" ]; then
 fi
 
 # Check for fresh install and run post install scripts.
+freshInstallIndicator=/boot/common/settings/fresh_install
 postInstallDir=/boot/common/boot/post_install
 if [ -e $freshInstallIndicator ]; then
        # wait a moment for things to calm down a bit
[haiku-commits] haiku: hrev45286 - data/system/boot src/apps/firstbootprompt

Other related posts:
