[or-cvs] r16424: Fixed run.bat for QEMU 0.9.1 and cleaned up the boot menu. (in incognito/trunk: . arch/x86/overlay)

[anonym at seul.org]

Author: anonym
Date: 2008-08-05 12:53:26 -0400 (Tue, 05 Aug 2008)
New Revision: 16424

Modified:
   incognito/trunk/arch/x86/overlay/run.bat
   incognito/trunk/create-runbat.sh
Log:
Fixed run.bat for QEMU 0.9.1 and cleaned up the boot menu.


Modified: incognito/trunk/arch/x86/overlay/run.bat
===================================================================
--- incognito/trunk/arch/x86/overlay/run.bat	2008-08-05 16:29:20 UTC (rev 16423)
+++ incognito/trunk/arch/x86/overlay/run.bat	2008-08-05 16:53:26 UTC (rev 16424)
@@ -1,26 +1,19 @@
 @echo off
 echo.
-echo Running __INCOGNITO__ in a virtual PC.
+echo Running __INCOGNITO__ in the QEMU virtual machine.
 echo.
-echo This mode is only recommended when it is impossible to restart the computer and
-echo boot __INCOGNITO__ directly from the CD/USB. When running through a virtual PC,
-echo any software keyloggers and similar types of surveillance installed under
-echo Microsoft Windows will work and might compromise your anonymity. Booting 
-echo directly from the CD/USB medium will protect you from any such malicious
-echo software, although you are just as vulnerable against hardware surveillance.
+echo While running __INCOGNITO__ in this mode, think of the following:
 echo.
-echo Press CTRL-ALT-F to toggle fullscreen mode.
+echo 1) Beware that your Microsoft Windows installations might have keyloggers,
+echo viruses or other malware installed. __INCOGNITO__'s defenses can do nothing
+echo against them.
 echo.
-echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-echo !!                                                                           !!
-echo !! BEWARE! While running from within Microsoft Windows any changes made      !!
-echo !! to the user home (e.g. new settings, new files) will not be persistent    !!
-echo !! between boots, even if running from USB! In other words, any changes made !!
-echo !! during this session will be lost when shutting down. Note, however, that  !!
-echo !! when running from USB, changes made to the user home in the past will     !!
-echo !! still be available.                                                       !!
-echo !!                                                                           !!
-echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+echo 2) If you are using a persistent home volume your changes will not be saved
+echo during this session but you will be able to access previously saved data. 
+echo.
+echo 3) Press CTRL-ALT to escape from the QEMU window, and CTRL-ALT-F to toggle
+echo fullscreen mode.
+echo.
 
 set DRIVE=%CD:~0,1%
 
@@ -36,4 +29,4 @@
 if exist %DRIVE%:\isolinux set SYSLINUX=isolinux
 
 rem Start QEMU
-start /B %DRIVE%:\qemu\qemu.exe -m 256M -localtime -usb -L %DRIVE%://qemu -hda fat:%DRIVE%:\ -kernel %DRIVE%:\%SYSLINUX%\%KERNEL% -initrd %DRIVE%:\%SYSLINUX%\%INITRD% -append "%KERNEL_ARGS%"
+start /B %DRIVE%:\qemu\qemu.exe -m 256M -localtime -usb -L %DRIVE%://qemu -hda fat:%DRIVE%: -kernel %DRIVE%:\%SYSLINUX%\%KERNEL% -initrd %DRIVE%:\%SYSLINUX%\%INITRD% -append "%KERNEL_ARGS%"

Modified: incognito/trunk/create-runbat.sh
===================================================================
--- incognito/trunk/create-runbat.sh	2008-08-05 16:29:20 UTC (rev 16423)
+++ incognito/trunk/create-runbat.sh	2008-08-05 16:53:26 UTC (rev 16424)
@@ -55,9 +55,9 @@
 for BOOT_INDEX in ${BOOT_LIST}; do
 echo -en "echo $(( $BOOT_INDEX )). ${BOOT_TITLE[$BOOT_INDEX]}\r\n"
 done
+echo -en "echo.\r\n"
+echo -en "set /p BOOT_OPT=Boot Option: \r\n"
 
-echo -en "set /p BOOT_OPT= Boot Option:\r\n"
-
 for BOOT_INDEX in $BOOT_LIST; do
 echo -en "if \"%BOOT_OPT%\" == \"$(( $BOOT_INDEX ))\" goto bootopt$(( $BOOT_INDEX ))\r\n"
 done