[haiku-commits] haiku: hrev45185 - data/system/boot
- From: mattmadia@xxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Mon, 21 Jan 2013 00:05:28 +0100 (CET)
hrev45185 adds 1 changeset to branch 'master'
old head: 06437987e0813e4405d56462ebca86fdb9d84d9f
new head: afc33db942eed3f9219781eb467500278610fe3a
overview: http://cgit.haiku-os.org/haiku/log/?qt=range&q=afc33db+%5E0643798
----------------------------------------------------------------------------
afc33db: Launch ReadOnlyBootPrompt if $freshInstallIndicator exists.
That file will exist on every read-only media, first boot of writable images
(usb,vmdk), and (if installing directly to partition via the build system or a
mounted image file) hard disk.
The last scenario (of installing directly to hard disk through the build
system
or mounted image file) may not be ideal, but it generally tends to be an
advanced installation method. Additionally, it will occur only on first boot.
Fixes #8945.
[ Matt Madia <mattmadia@xxxxxxxxx> ]
----------------------------------------------------------------------------
Revision: hrev45185
Commit: afc33db942eed3f9219781eb467500278610fe3a
URL: http://cgit.haiku-os.org/haiku/commit/?id=afc33db
Author: Matt Madia <mattmadia@xxxxxxxxx>
Date: Sun Jan 20 23:03:31 2013 UTC
Ticket: https://dev.haiku-os.org/ticket/8945
----------------------------------------------------------------------------
1 file changed, 2 insertions(+), 2 deletions(-)
data/system/boot/Bootscript | 4 ++--
----------------------------------------------------------------------------
diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript
index 3a52cb2..d0f130e 100644
--- a/data/system/boot/Bootscript
+++ b/data/system/boot/Bootscript
@@ -117,7 +117,8 @@ if [ "$SAFEMODE" != "yes" ]; then
fi
# Now ask the user if he wants to run the Installer or continue to the Desktop.
-if [ "$isReadOnly" = "yes" ]; then
+freshInstallIndicator=/boot/common/settings/fresh_install
+if [ "$isReadOnly" = "yes" -o -e $freshInstallIndicator ]; then
# Create Installer link (using the write overlay)
ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer
@@ -190,7 +191,6 @@ fi
# Check for fresh install and run post install scripts.
postInstallDir=/boot/common/boot/post_install
-freshInstallIndicator=/boot/common/settings/fresh_install
if [ -e $freshInstallIndicator ]; then
# wait a moment for things to calm down a bit
sleep 3
Other related posts:
- » [haiku-commits] haiku: hrev45185 - data/system/boot - mattmadia
