From e4ba645c453ce75cca53c0deeaa4989d33c48958 Mon Sep 17 00:00:00 2001 From: Matt Madia Date: Sat, 16 Feb 2013 11:23:37 -0500 Subject: [PATCH] Changed the logic for launching FirstBootPrompt. Always launch on read only medium. Launch when the Locale settings file does not exist. Fixes #9427. --- data/system/boot/Bootscript | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index a49439d831..4841b2d091 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