[Haiku-commits] r30976 - haiku/trunk/data/system/boot

axeld at BerliOS axeld at mail.berlios.de
Fri Jun 5 17:59:21 CEST 2009


Author: axeld
Date: 2009-06-05 17:59:21 +0200 (Fri, 05 Jun 2009)
New Revision: 30976
ViewCVS: http://svn.berlios.de/viewcvs/haiku?rev=30976&view=rev

Modified:
   haiku/trunk/data/system/boot/Bootscript
Log:
* Improved variable naming.


Modified: haiku/trunk/data/system/boot/Bootscript
===================================================================
--- haiku/trunk/data/system/boot/Bootscript	2009-06-05 15:52:58 UTC (rev 30975)
+++ haiku/trunk/data/system/boot/Bootscript	2009-06-05 15:59:21 UTC (rev 30976)
@@ -70,8 +70,8 @@
 launchscript $SCRIPTS/SetupEnvironment
 
 # If the boot volume is a CD we use another script
-iw=`/bin/isvolume -readonly-partition /boot`
-if [ "$iw" = "yes" ]; then
+isReadOnly=`/bin/isvolume -readonly-partition /boot`
+if [ "$isReadOnly" = "yes" ]; then
 	# block the CD tray (avoid accidental ejection)
 	# This option stays 'on' even if we continue booting to the desktop.
 	/bin/eject -b /boot
@@ -105,7 +105,7 @@
 fi
 
 # Now ask the user if he wants to run the Installer or continue to the Desktop.
-if [ "$iw" = "yes" ]; then
+if [ "$isReadOnly" = "yes" ]; then
 	/bin/alert "Do you wish to run the Installer or continue booting to the Desktop?" "Installer" "Desktop"
 	if [ $? -eq 0 ]; then
 		launchscript $SCRIPTS/Bootscript.cd




More information about the Haiku-commits mailing list