* Improved variable naming.
git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@30976 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -70,8 +70,8 @@ export SAFEMODE=`/bin/safemode`
|
|||||||
launchscript $SCRIPTS/SetupEnvironment
|
launchscript $SCRIPTS/SetupEnvironment
|
||||||
|
|
||||||
# If the boot volume is a CD we use another script
|
# If the boot volume is a CD we use another script
|
||||||
iw=`/bin/isvolume -readonly-partition /boot`
|
isReadOnly=`/bin/isvolume -readonly-partition /boot`
|
||||||
if [ "$iw" = "yes" ]; then
|
if [ "$isReadOnly" = "yes" ]; then
|
||||||
# block the CD tray (avoid accidental ejection)
|
# block the CD tray (avoid accidental ejection)
|
||||||
# This option stays 'on' even if we continue booting to the desktop.
|
# This option stays 'on' even if we continue booting to the desktop.
|
||||||
/bin/eject -b /boot
|
/bin/eject -b /boot
|
||||||
@@ -105,7 +105,7 @@ 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.
|
||||||
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"
|
/bin/alert "Do you wish to run the Installer or continue booting to the Desktop?" "Installer" "Desktop"
|
||||||
if [ $? -eq 0 ]; then
|
if [ $? -eq 0 ]; then
|
||||||
launchscript $SCRIPTS/Bootscript.cd
|
launchscript $SCRIPTS/Bootscript.cd
|
||||||
|
|||||||
Reference in New Issue
Block a user