From b14896ee8d376a5bdb551e993b711e4482843526 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Thu, 21 Jan 2010 15:14:20 +0000 Subject: [PATCH] It Just Works(TM). Replaced the CD boot alert with ReadOnlyBootPrompt. One just has to love the write overlay. That one really saved a lot of work. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@35224 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- build/jam/HaikuImage | 4 ++-- data/system/boot/Bootscript | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/jam/HaikuImage b/build/jam/HaikuImage index 0ba6634bb3..f858fc15d4 100644 --- a/build/jam/HaikuImage +++ b/build/jam/HaikuImage @@ -54,8 +54,8 @@ SYSTEM_BIN = "[" addattr alert arp base64 basename bash bc beep bootman bzip2 passwd paste patch pathchk pc ping play playfile playsound playwav pr prio printenv printf profile ps ptx pwd query quit - rc readlink reindex release renice rlog rm rmattr rmindex rmdir roster - route + rc readlink ReadOnlyBootPrompt reindex release renice rlog rm rmattr + rmindex rmdir roster route safemode screen_blanker screenmode sdiff sed setdecor settype setversion setvolume seq sha1sum shar shred shuf shutdown sleep sort spamdbm split stat strace stty su sum sync sysinfo diff --git a/data/system/boot/Bootscript b/data/system/boot/Bootscript index 53552fe002..8d1a46b090 100644 --- a/data/system/boot/Bootscript +++ b/data/system/boot/Bootscript @@ -105,7 +105,7 @@ if [ "$isReadOnly" = "yes" ]; then # Create Installer link (using the write overlay) ln -sf /boot/system/apps/Installer /boot/home/Desktop/Installer - /bin/alert "Do you wish to run the Installer or continue booting to the Desktop?" "Installer" "Desktop" + /bin/ReadOnlyBootPrompt if [ $? -eq 0 ]; then launchscript $SCRIPTS/Bootscript.cd exit 0 # and return