Aren
/
haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Changed the logic for launching FirstBootPrompt. 

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

Fixes #9427.
This commit is contained in:
Matt Madia 2013-02-16 11:23:37 -05:00
parent eede25d31f
commit e4ba645c45
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
data/system/boot/Bootscript
View File

@ -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