[SCM] debian-live/config-webc branch, master, updated. f68f31f62827f04b4e36cb3cc04a57a8e793ab84

[Kai Hendry]

The branch, master has been updated
       via  f68f31f62827f04b4e36cb3cc04a57a8e793ab84 (commit)
      from  aad94794a3fc4f81416e94274077138375591c36 (commit)


- Shortlog ------------------------------------------------------------
f68f31f Flash for etch has been (at last) updated, so there is no need for a local file

Summary of changes:
 mini/config/binary                                 |    4 ++--
 webconverger/config/binary                         |    6 +++---
 .../flashplugin-nonfree_9.0.48.0.2~bpo.1_i386.deb  |  Bin 15514 -> 0 bytes
 3 files changed, 5 insertions(+), 5 deletions(-)
-----------------------------------------------------------------------
Details of changes:

commit f68f31f62827f04b4e36cb3cc04a57a8e793ab84
Author: Kai Hendry <hendry at iki.fi>
Date:   Sun Jan 6 20:09:22 2008 +0000

    Flash for etch has been (at last) updated, so there is no need for a local file

diff --git a/mini/config/binary b/mini/config/binary
index f8ba4ba..ed8f681 100644
--- a/mini/config/binary
+++ b/mini/config/binary
@@ -2,7 +2,7 @@
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-LH_BINARY_IMAGES="usb-hdd"
+#LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
@@ -18,7 +18,7 @@ LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconve
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-#LH_BOOTLOADER="grub"
+LH_BOOTLOADER="grub"
 
 # ${LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
diff --git a/webconverger/config/binary b/webconverger/config/binary
index ac524ff..963d1d7 100644
--- a/webconverger/config/binary
+++ b/webconverger/config/binary
@@ -2,7 +2,7 @@
 
 # $LH_BINARY_IMAGES: set image type
 # (Default: iso)
-#LH_BINARY_IMAGES="iso"
+LH_BINARY_IMAGES="usb-hdd"
 
 # $LH_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: enabled)
@@ -10,7 +10,7 @@
 
 # $LH_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconverger.com/"
+LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconverger.com/ nosudo"
 
 # $LH_BOOTAPPEND_INSTALL: set boot parameters
 # (Default: empty)
@@ -18,7 +18,7 @@ LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconve
 
 # $LH_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LH_BOOTLOADER="grub"
+#LH_BOOTLOADER="grub"
 
 # ${LH_CHROOT_BUILD: control if we build binary images chrooted
 # (Default: enabled)
diff --git a/webconverger/config/chroot_local-packages/flashplugin-nonfree_9.0.48.0.2~bpo.1_i386.deb b/webconverger/config/chroot_local-packages/flashplugin-nonfree_9.0.48.0.2~bpo.1_i386.deb
deleted file mode 100644
index 32651ed..0000000
Binary files a/webconverger/config/chroot_local-packages/flashplugin-nonfree_9.0.48.0.2~bpo.1_i386.deb and /dev/null differ

-- 
debian-live/config-webc