i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Changed the logic for launching FirstBootPrompt.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
data/system/boot/Bootscript
+3 -2
View File
@@ -117,8 +117,8 @@ if [ "$SAFEMODE" != "yes" ]; then
fi fi
# Now ask the user if he wants to run the Installer or continue to the Desktop. # Now ask the user if he wants to run the Installer or continue to the Desktop.
freshInstallIndicator=/boot/common/settings/fresh_install localeSettings=/boot/home/config/settings/Locale\ settings
if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then if [ "$isReadOnly" = "yes" -o ! -e "$localeSettings" ]; then
/bin/FirstBootPrompt /bin/FirstBootPrompt
if [ $? -eq 0 ]; then if [ $? -eq 0 ]; then
launchscript $SCRIPTS/Bootscript.cd launchscript $SCRIPTS/Bootscript.cd
@@ -190,6 +190,7 @@ if [ "$SAFEMODE" != "yes" ]; then
fi fi
# Check for fresh install and run post install scripts. # Check for fresh install and run post install scripts.
freshInstallIndicator=/boot/common/settings/fresh_install
postInstallDir=/boot/common/boot/post_install postInstallDir=/boot/common/boot/post_install
if [ -e $freshInstallIndicator ]; then if [ -e $freshInstallIndicator ]; then
# wait a moment for things to calm down a bit # wait a moment for things to calm down a bit