[Debian-live-changes] r978 - in configs/webconverger: . config config/chroot_localincludes/etc/webconverger config/chroot_localincludes/usr/bin config/chroot_localpackageslists

[Kai Hendry]

Author: kai-guest
Date: 2007-04-07 22:29:51 +0000 (Sat, 07 Apr 2007)
New Revision: 978

Modified:
   configs/webconverger/config/bootstrap
   configs/webconverger/config/chroot_localincludes/etc/webconverger/VERSION
   configs/webconverger/config/chroot_localincludes/usr/bin/persistent-browser
   configs/webconverger/config/chroot_localpackageslists/webconverger
   configs/webconverger/config/image
   configs/webconverger/lh_server_net
Log:
homepage= tested

Modified: configs/webconverger/config/bootstrap
===================================================================
--- configs/webconverger/config/bootstrap	2007-04-07 22:26:01 UTC (rev 977)
+++ configs/webconverger/config/bootstrap	2007-04-07 22:29:51 UTC (rev 978)
@@ -6,7 +6,7 @@
 
 # $LIVE_DISTRIBUTION: select the distribution to use
 # (Default: sid)
-#LIVE_DISTRIBUTION="etch"
+LIVE_DISTRIBUTION="etch"
 
 # $LIVE_FLAVOUR: select the flavour to use
 # (Default: standard)

Modified: configs/webconverger/config/chroot_localincludes/etc/webconverger/VERSION
===================================================================
--- configs/webconverger/config/chroot_localincludes/etc/webconverger/VERSION	2007-04-07 22:26:01 UTC (rev 977)
+++ configs/webconverger/config/chroot_localincludes/etc/webconverger/VERSION	2007-04-07 22:29:51 UTC (rev 978)
@@ -1 +1 @@
-VERSION=2.0
+VERSION=2.1

Modified: configs/webconverger/config/chroot_localincludes/usr/bin/persistent-browser
===================================================================
--- configs/webconverger/config/chroot_localincludes/usr/bin/persistent-browser	2007-04-07 22:26:01 UTC (rev 977)
+++ configs/webconverger/config/chroot_localincludes/usr/bin/persistent-browser	2007-04-07 22:29:51 UTC (rev 978)
@@ -30,11 +30,13 @@
     count=$((count + 1)) # see how many times session is reset
 
     if [ "${HOMEPAGE}" = "http://portal.webconverger.com" ] ; then
-    HOMEPAGE="$HOMEPAGE/?mac=`cat /sys/class/net/eth0/address`&ver=$VERSION&count=$count"
+    /usr/bin/iceweasel $HOMEPAGE/?mac=`cat /sys/class/net/eth0/address`&ver=$VERSION&count=$count
+    else
+    /usr/bin/iceweasel $HOMEPAGE
     fi
 
-    /usr/bin/iceweasel $HOMEPAGE
-    rm -rf $HOME/.mozilla/ # aggressively get rid of session
+    rm -rf $HOME/.mozilla/ # aggressively nuke session
+
 fi
 
 done

Modified: configs/webconverger/config/chroot_localpackageslists/webconverger
===================================================================
--- configs/webconverger/config/chroot_localpackageslists/webconverger	2007-04-07 22:26:01 UTC (rev 977)
+++ configs/webconverger/config/chroot_localpackageslists/webconverger	2007-04-07 22:29:51 UTC (rev 978)
@@ -75,8 +75,8 @@
 # iceweasel-l10n-zh-tw
 #
 # For Korean locale support ko_KR.UTF-8
-scim-hangul scim-tables-ko scim-uim
-iceweasel-l10n-ko
+#scim-hangul scim-tables-ko scim-uim
+#iceweasel-l10n-ko
 
 # If we want Opera, uncomment line below
 #opera9-binary

Modified: configs/webconverger/config/image
===================================================================
--- configs/webconverger/config/image	2007-04-07 22:26:01 UTC (rev 977)
+++ configs/webconverger/config/image	2007-04-07 22:29:51 UTC (rev 978)
@@ -41,7 +41,7 @@
 
 # $LIVE_BINARY_IMAGE: set image type
 # (Default: iso)
-LIVE_BINARY_IMAGE="iso"
+LIVE_BINARY_IMAGE="net"
 
 # $LIVE_SOURCE_IMAGE: set image type
 # (Default: iso)

Modified: configs/webconverger/lh_server_net
===================================================================
--- configs/webconverger/lh_server_net	2007-04-07 22:26:01 UTC (rev 977)
+++ configs/webconverger/lh_server_net	2007-04-07 22:29:51 UTC (rev 978)
@@ -1,5 +1,5 @@
 sudo /sbin/ifup eth0
 sudo /etc/init.d/dhcp3-server start
-sudo /etc/init.d/tftpd-hpa restart
-sudo /etc/init.d/apache2 start
+sudo /etc/init.d/tftpd-hpa start
+#sudo /etc/init.d/apache2 start
 sudo iptables -t nat -A POSTROUTING -o eth1 -j MASQUERADE