[or-cvs] r11690: Merge some changes from trunk. QEMU support on USB, fix brok (in incognito/tags/20070824.2: . arch/x86/overlay root_overlay/etc/squid root_overlay/usr/sbin)

[double at seul.org]

Author: double
Date: 2007-09-28 11:41:12 -0400 (Fri, 28 Sep 2007)
New Revision: 11690

Added:
   incognito/tags/20070824.2/arch/x86/overlay/run-usb.bat
Modified:
   incognito/tags/20070824.2/arch/x86/overlay/run.bat
   incognito/tags/20070824.2/livecd-stage2.sh
   incognito/tags/20070824.2/root_overlay/etc/squid/squid.conf
   incognito/tags/20070824.2/root_overlay/usr/sbin/create-usb
Log:
Merge some changes from trunk. QEMU support on USB, fix broken squid.conf, build script fix.


Copied: incognito/tags/20070824.2/arch/x86/overlay/run-usb.bat (from rev 11687, incognito/trunk/arch/x86/overlay/run-usb.bat)
===================================================================
--- incognito/tags/20070824.2/arch/x86/overlay/run-usb.bat	                        (rev 0)
+++ incognito/tags/20070824.2/arch/x86/overlay/run-usb.bat	2007-09-28 15:41:12 UTC (rev 11690)
@@ -0,0 +1,22 @@
+ at echo off
+echo.
+echo Running Incognito CD/USB in a virtual PC.
+echo.
+echo Defaulting to English locale and keyboard.
+echo.
+echo Type CTRL-ALT-F to toggle fullscreen mode.
+echo.
+echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+echo !!                                                                           !!
+echo !! BEWARE! While running Incognito USB from within Microsoft Windows any     !!
+echo !! changes made to the user home (e.g. new settings, new files) will not be  !!
+echo !! persistent between boots! In other words, any changes made during this    !!
+echo !! session will be lost when shutting down, just like when running from the  !!
+echo !! liveCD. Note, however, that changes made to the user home in the past     !!
+echo !! will be present now.                                                      !!
+echo !!                                                                           !!
+echo !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+echo.
+
+set DRIVE=%CD:~0,1%
+start /B %DRIVE%:\qemu\qemu.exe -m 256M -localtime -usb -L %DRIVE%://qemu -hda fat:%DRIVE%:\ -kernel %DRIVE%:\syslinux\gentoo -initrd %DRIVE%:\syslinux\gentoo.igz -append "root=/dev/ram0 init=/linuxrc  looptype=squashfs loop=/image.squashfs cdroot vga=791 splash=silent,theme:livecd-2006.1 CONSOLE=/dev/tty1 acpi=on quiet dokeymap"

Modified: incognito/tags/20070824.2/arch/x86/overlay/run.bat
===================================================================
--- incognito/tags/20070824.2/arch/x86/overlay/run.bat	2007-09-28 15:32:30 UTC (rev 11689)
+++ incognito/tags/20070824.2/arch/x86/overlay/run.bat	2007-09-28 15:41:12 UTC (rev 11690)
@@ -1,9 +1,9 @@
 @echo off
-echo .
+echo.
 echo Running Incognito CD/USB in a virtual PC.
-echo .
+echo.
 echo Type CTRL-ALT-F to toggle fullscreen mode.
-echo .
+echo.
 
 set DRIVE=%CD:~0,1%
 start /B %DRIVE%:\qemu\qemu.exe -m 256M -localtime -usb -L %DRIVE%://qemu -cdrom //./%DRIVE%: -boot d

Modified: incognito/tags/20070824.2/livecd-stage2.sh
===================================================================
--- incognito/tags/20070824.2/livecd-stage2.sh	2007-09-28 15:32:30 UTC (rev 11689)
+++ incognito/tags/20070824.2/livecd-stage2.sh	2007-09-28 15:41:12 UTC (rev 11690)
@@ -52,6 +52,9 @@
 # Remove SVN directories
 find "${DIR}" -xdev -type d -a -name ".svn" -print0 | xargs -0 rm -rf
 
+# Fix checkout root
+sed -i "s:/usr/src/incognito:$(pwd):g" "${DIR}/livecd-stage2.spec"
+
 # Do branding replacement
 # TODO: Get these two from somewhere else
 INCOGNITO="Incognito"

Modified: incognito/tags/20070824.2/root_overlay/etc/squid/squid.conf
===================================================================
--- incognito/tags/20070824.2/root_overlay/etc/squid/squid.conf	2007-09-28 15:32:30 UTC (rev 11689)
+++ incognito/tags/20070824.2/root_overlay/etc/squid/squid.conf	2007-09-28 15:41:12 UTC (rev 11690)
@@ -38,12 +38,8 @@
 
 header_access From deny all
 header_access Referer deny all
-header_access Server deny all
-header_access User-Agent deny all
-header_access WWW-Authenticate deny all
 header_access Link deny all
 header_access Via deny all
 header_access Warning deny all
-header_access ETag deny all
 header_access Allow allow all 
 

Modified: incognito/tags/20070824.2/root_overlay/usr/sbin/create-usb
===================================================================
--- incognito/tags/20070824.2/root_overlay/usr/sbin/create-usb	2007-09-28 15:32:30 UTC (rev 11689)
+++ incognito/tags/20070824.2/root_overlay/usr/sbin/create-usb	2007-09-28 15:41:12 UTC (rev 11690)
@@ -123,7 +123,7 @@
 # Required files
 IMAGE="image.squashfs"
 REQUIRED_FILES="isolinux/isolinux.cfg isolinux/vesamenu.c32 isolinux/splash.png isolinux/gentoo isolinux/gentoo.igz ${IMAGE}"
-EXCLUDE="System.map-gentoo|isolinux.bin|boot.cat|kernels.msg|qemu"
+EXCLUDE="System.map-gentoo|isolinux.bin|boot.cat|kernels.msg|run.bat"
 COPY_FILES=$( find ${MEDIAROOT} ! -type d | egrep -v "$EXCLUDE" | sed "s|${MEDIAROOT}/||g" )
 DIRS=$( find ${MEDIAROOT} -type d | egrep -v "$EXCLUDE" | sed "s|${MEDIAROOT}||g" | sed "s|isolinux|syslinux|g" )
 
@@ -224,6 +224,9 @@
     exit 1
 fi
 
+# Switch to USB adapted batch file for booting with qemu
+mv -f ${MTPT}/run-usb.bat ${MTPT}/run.bat
+
 # Unmount the drive
 ( echo 90 ; echo 90 ; umount -v "${MTPT}" ) | ${DIALOG} --progress "Completing USB file copy" 0 ${DEFAULT_WIDTH}
 rmdir "${MTPT}"