[SCM] debian-live/config-webc branch, master, updated. 440d882f624c870afc9276efc5f21d0ccbd6c336
Kai Hendry
hendry at iki.fi
Mon Apr 6 21:56:13 UTC 2009
The following commit has been merged in the master branch:
commit 440d882f624c870afc9276efc5f21d0ccbd6c336
Author: Kai Hendry <hendry at iki.fi>
Date: Mon Apr 6 23:59:46 2009 +0200
consolidate into just one version
disable wpasupplicant from joining any open wireless network
diff --git a/mini/config/binary_debian-installer b/mini/config/binary_debian-installer
deleted file mode 120000
index c0b3a29..0000000
--- a/mini/config/binary_debian-installer
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_debian-installer
\ No newline at end of file
diff --git a/mini/config/binary_grub/splash.xpm.gz b/mini/config/binary_grub/splash.xpm.gz
deleted file mode 100644
index 3e851fb..0000000
Binary files a/mini/config/binary_grub/splash.xpm.gz and /dev/null differ
diff --git a/mini/config/binary_local-hooks/01-remove-sbm.sh b/mini/config/binary_local-hooks/01-remove-sbm.sh
deleted file mode 100755
index ebf3282..0000000
--- a/mini/config/binary_local-hooks/01-remove-sbm.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-rm -f binary/install/README.sbm
-rm -f binary/install/sbm.bin
diff --git a/mini/config/binary_local-hooks/02-repack-initrd.sh b/mini/config/binary_local-hooks/02-repack-initrd.sh
deleted file mode 100755
index 6b01a96..0000000
--- a/mini/config/binary_local-hooks/02-repack-initrd.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/bin/sh
-
-set -e
-
-TARGET_INITRD="binary/install/gtk/initrd.gz"
-REPACK_TMPDIR="unpacked-initrd"
-
-# cpio does not have a "extract to directory", so we must change directory
-mkdir -p ${REPACK_TMPDIR}
-cd ${REPACK_TMPDIR}
-gzip -d < ../${TARGET_INITRD} | cpio -i --make-directories --no-absolute-filenames
-
-# Overwrite banner
-mv ../binary/install/banner.png ./usr/share/graphics/logo_debian.png
-
-# Import patch from #498143
-patch -p1 <<EOF
---- a/var/lib/dpkg/info/cdrom-detect.postinst
-+++ b/var/lib/dpkg/info/cdrom-detect.postinst
-@@ -44,6 +44,28 @@ do
- fi
- done
-
-+ # Try disk partitions masquerading as Debian CDs for Debian Live
-+ # "usb-hdd" images. Only vfat and ext are supported.
-+ modprobe vfat >/dev/null 2>&1 || true
-+ for device in \$(list-devices partition); do
-+ if mount -t vfat -o ro,exec \$device /cdrom ||
-+ mount -t ext2 -o ro,exec \$device /cdrom; then
-+ log "Pseudo CD-ROM mount succeeded: device=\$device"
-+
-+ # Test whether it's a Debian CD
-+ if [ -e /cdrom/.disk/info ]; then
-+ mounted=1
-+ db_set cdrom-detect/cdrom_device \$device
-+ break
-+ else
-+ log "Ignoring pseudo CD-ROM device \$device - it is not a Debian CD"
-+ umount /cdrom 2>/dev/null || true
-+ fi
-+ else
-+ log "Psuedo CD-ROM mount failed: device=\$device"
-+ fi
-+ done
-+
- if [ "\$mounted" = "1" ]; then
- break
- fi
---
-1.5.6.5
-EOF
-
-find | cpio -H newc -o | gzip -9 > ../${TARGET_INITRD}
-cd ..
-rm -rf ${REPACK_TMPDIR}
diff --git a/mini/config/binary_local-hooks/03-remove-newt-installer.sh b/mini/config/binary_local-hooks/03-remove-newt-installer.sh
deleted file mode 100755
index 541dc7c..0000000
--- a/mini/config/binary_local-hooks/03-remove-newt-installer.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -e
-
-# We prefer the GTK installer, so simply remove the 'newt' version
-# to save space. To boot the GTK installer in 'newt' mode, simply
-# append "DEBIAN_FRONTEND=newt" to the kernel command line.
-
-rm -f binary/install/initrd.gz
-rm -f binary/install/vmlinuz
diff --git a/mini/config/binary_local-includes b/mini/config/binary_local-includes
deleted file mode 120000
index dd2debb..0000000
--- a/mini/config/binary_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_local-includes
\ No newline at end of file
diff --git a/mini/config/binary_syslinux b/mini/config/binary_syslinux
deleted file mode 120000
index 96fc925..0000000
--- a/mini/config/binary_syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_syslinux
\ No newline at end of file
diff --git a/mini/config/chroot_apt/preferences b/mini/config/chroot_apt/preferences
deleted file mode 100644
index f6ecef6..0000000
--- a/mini/config/chroot_apt/preferences
+++ /dev/null
@@ -1,3 +0,0 @@
-Package: *
-Pin: release o=webconverger
-Pin-Priority: 1001
diff --git a/mini/config/chroot_local-hooks/theme b/mini/config/chroot_local-hooks/theme
deleted file mode 100755
index 1cfe1a0..0000000
--- a/mini/config/chroot_local-hooks/theme
+++ /dev/null
@@ -1,5 +0,0 @@
-rm /etc/splashy/themes/default/background.png
-ln -s /etc/webconverger/background.jpg /etc/splashy/themes/default/background.png
-
-# Theme is stored in initramfs; need to update it.
-update-initramfs -u -k all
diff --git a/mini/config/chroot_local-hooks/webconverger b/mini/config/chroot_local-hooks/webconverger
deleted file mode 100755
index 354f521..0000000
--- a/mini/config/chroot_local-hooks/webconverger
+++ /dev/null
@@ -1,3 +0,0 @@
-update-rc.d -f openbsd-inetd remove
-update-rc.d -f stop-bootlogd remove
-update-rc.d -f nostromo remove
diff --git a/mini/config/chroot_local-includes b/mini/config/chroot_local-includes
deleted file mode 120000
index db8ab4a..0000000
--- a/mini/config/chroot_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_local-includes
\ No newline at end of file
diff --git a/mini/config/chroot_local-packageslists/webconverger b/mini/config/chroot_local-packageslists/webconverger
deleted file mode 120000
index dc9ae27..0000000
--- a/mini/config/chroot_local-packageslists/webconverger
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_local-packageslists/webconverger
\ No newline at end of file
diff --git a/mini/config/chroot_sources b/mini/config/chroot_sources
deleted file mode 120000
index 9bf62c4..0000000
--- a/mini/config/chroot_sources
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_sources
\ No newline at end of file
diff --git a/mini/scripts/build b/mini/scripts/build
deleted file mode 100755
index 558cf91..0000000
--- a/mini/scripts/build
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-lh_build noautoconfig ${@} 2>&1 | tee binary.log
diff --git a/mini/scripts/clean b/mini/scripts/clean
deleted file mode 100755
index 90634ac..0000000
--- a/mini/scripts/clean
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/sh
-
-rm -f build.log
-
-# Remove generated files
-rm -f config/binary config/bootstrap config/chroot config/common config/source
-
-# Remove empty directories in config tree
-if ls config/*/ > /dev/null 2>&1
-then
- rmdir --ignore-fail-on-non-empty config/*/
-fi
-
-if [ -d config ]
-then
- rmdir --ignore-fail-on-non-empty config
-fi
diff --git a/mini/scripts/config b/mini/scripts/config
deleted file mode 100755
index e2c5931..0000000
--- a/mini/scripts/config
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/sh
-
-MIRROR_DEBIAN="http://mirror.webconverger.com/debian/"
-MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
-
-lh_config noautoconfig \
- --apt-recommends disabled \
- --bootappend-live "quiet homepage=http://portal.webconverger.com/ nonetworking nosudo splash vga=791" \
- --debian-installer live \
- --debian-installer-distribution lenny \
- --cache-stages "bootstrap rootfs" \
- -k 486 \
- -a i386 \
- -f minimal \
- -b usb-hdd \
- --apt apt \
- --username webc \
- --hostname webconverger \
- --bootloader syslinux \
- --categories "main contrib non-free" \
- --distribution lenny \
- --iso-publisher "Webconverger; http://webconverger.com/; support at webconverger.com" \
- --iso-volume "Webconverger $(date +%Y%m%d-%H:%M)" \
- --memtest none \
- --syslinux-splash config/binary_syslinux/splash.rle \
- --syslinux-timeout 5 \
- --mirror-bootstrap ${MIRROR_DEBIAN} \
- --mirror-chroot ${MIRROR_DEBIAN} \
- --mirror-chroot-security ${MIRROR_SECURITY} \
- --mirror-binary ${MIRROR_DEBIAN} \
- --mirror-binary-security ${MIRROR_SECURITY} \
- --binary-indices disabled \
- --packages-lists "webconverger" \
- ${@}
diff --git a/opera/config/binary b/opera/config/binary
deleted file mode 100644
index dfd61b3..0000000
--- a/opera/config/binary
+++ /dev/null
@@ -1,94 +0,0 @@
-# config/binary - options for live-helper(7), binary stage
-
-# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-#LH_BINARY_IMAGES="iso"
-
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: enabled)
-#LH_BINARY_INDICES="enabled"
-
-# $LH_BOOTAPPEND_LIVE: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet splash vga=773 upgrade homepage=http://portal.webconverger.com/"
-
-# $LH_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_INSTALL="preseed/file=/cdrom/install/preseed.cfg d-i:debian-installer/locale=en_US d-i:console-keymaps-at/keymap=us -- ${LH_BOOTAPPEND_LIVE}"
-
-# $LH_BOOTLOADER: set bootloader
-# (Default: syslinux)
-#LH_BOOTLOADER="syslinux"
-
-# ${LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: enabled)
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-#LH_CHROOT_BUILD="enabled"
-
-# $LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-#LH_DEBIAN_INSTALLER="disabled"
-
-# $LH_DEBIAN_INSTALLER_DAILY: set daily images
-# (Default: disabled)
-#LH_DEBIAN_INSTALLER_DAILY="disabled"
-
-# $LH_ENCRYPTION: set encrytion
-# (Default: empty)
-#LH_ENCRYPTION=""
-
-# $LH_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-#LH_GRUB_SPLASH=""
-
-# $LH_HOSTNAME: set hostname
-# (Default: debian)
-LH_HOSTNAME="webconverger"
-
-# $LH_ISO_APPLICATION: set iso author
-# (Default: Debian Live)
-LH_ISO_APPLICATION="Webconverger"
-
-# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 1.0~a29; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper 1.0~a29; http://packages.qa.debian.org/live-helper"
-
-# $LH_ISO_PUBLISHER: set iso preparer
-# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
-LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org"
-
-# $LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Debian Live `date +%Y%m%d-%H:%M`)
-LH_ISO_VOLUME="Webconverger `date +%Y%m%d-%H:%M`"
-
-# $LH_MEMTEST: set memtest
-# (Default: memtest86+)
-LH_MEMTEST="none"
-
-# $LH_NET_FILESYSTEM: set netboot filesystem
-# (Default: nfs)
-#LH_NET_FILESYSTEM="nfs"
-
-# $LH_NET_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-#LH_NET_MOUNTOPTIONS=""
-
-# $LH_NET_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-#LH_NET_PATH="/srv/debian-live"
-
-# $LH_NET_SERVER: set netboot server address
-# (Default: 192.168.1.1)
-#LH_NET_SERVER="192.168.1.1"
-
-# $LH_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-#LH_SYSLINUX_SPLASH=""
-
-# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout
-# (Default: 0)
-LH_SYSLINUX_TIMEOUT="10"
-
-# $LH_USERNAME: set username
-# (Default: user)
-#LH_USERNAME="user"
diff --git a/opera/config/binary_local-includes b/opera/config/binary_local-includes
deleted file mode 120000
index dd2debb..0000000
--- a/opera/config/binary_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_local-includes
\ No newline at end of file
diff --git a/opera/config/bootstrap b/opera/config/bootstrap
deleted file mode 120000
index 5e40e87..0000000
--- a/opera/config/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/bootstrap
\ No newline at end of file
diff --git a/opera/config/chroot b/opera/config/chroot
deleted file mode 120000
index 4cf3643..0000000
--- a/opera/config/chroot
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot
\ No newline at end of file
diff --git a/opera/config/chroot_local-hooks b/opera/config/chroot_local-hooks
deleted file mode 120000
index ce977ac..0000000
--- a/opera/config/chroot_local-hooks
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_local-hooks
\ No newline at end of file
diff --git a/opera/config/chroot_local-includes b/opera/config/chroot_local-includes
deleted file mode 120000
index db8ab4a..0000000
--- a/opera/config/chroot_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_local-includes
\ No newline at end of file
diff --git a/opera/config/chroot_local-packageslists/webconverger-opera b/opera/config/chroot_local-packageslists/webconverger-opera
deleted file mode 100644
index 5d4e264..0000000
--- a/opera/config/chroot_local-packageslists/webconverger-opera
+++ /dev/null
@@ -1,45 +0,0 @@
-# Webconverger
-webconverger-archive-keyring
-
-# Minimal
-eject file
-
-# Standard
-console-common locales kbd
-usplash usplash-theme-webconverger
-opera
-webconverger-base
-
-# for backports
-debian-unofficial-archive-keyring
-
-# X11
-# http://lists.debian.org/debian-devel/2006/04/msg00253.html
-xorg
-xresprobe
-discover
-
-# window manager
-dwm
-# For the background
-xloadimage
-
-# sound
-alsa-base alsa-oss alsa-utils
-
-# ssh (debug)
-openssh-client
-vim-tiny
-
-# printing (disable otherwise SLOWWWWWWWWWWWW)
-#cupsys
-
-# fonts
-ttf-dejavu
-ttf-gentium
-
-# pdf
-xpdf
-
-########## non-free software
-flashplugin-nonfree
diff --git a/opera/config/chroot_sources/backports.bootstrap b/opera/config/chroot_sources/backports.bootstrap
deleted file mode 120000
index 7a4bd84..0000000
--- a/opera/config/chroot_sources/backports.bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_sources/backports.bootstrap
\ No newline at end of file
diff --git a/opera/config/chroot_sources/backports.bootstrap.gpg b/opera/config/chroot_sources/backports.bootstrap.gpg
deleted file mode 120000
index ce1d344..0000000
--- a/opera/config/chroot_sources/backports.bootstrap.gpg
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_sources/backports.bootstrap.gpg
\ No newline at end of file
diff --git a/opera/config/chroot_sources/opera.binary b/opera/config/chroot_sources/opera.binary
deleted file mode 100644
index 7c225e1..0000000
--- a/opera/config/chroot_sources/opera.binary
+++ /dev/null
@@ -1 +0,0 @@
-deb http://deb.opera.com/opera lenny non-free
diff --git a/opera/config/chroot_sources/opera.binary.gpg b/opera/config/chroot_sources/opera.binary.gpg
deleted file mode 100644
index c5fa9aa..0000000
--- a/opera/config/chroot_sources/opera.binary.gpg
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-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
-=HaRH
------END PGP PUBLIC KEY BLOCK-----
diff --git a/opera/config/chroot_sources/opera.bootstrap b/opera/config/chroot_sources/opera.bootstrap
deleted file mode 100644
index 7c225e1..0000000
--- a/opera/config/chroot_sources/opera.bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-deb http://deb.opera.com/opera lenny non-free
diff --git a/opera/config/chroot_sources/opera.bootstrap.gpg b/opera/config/chroot_sources/opera.bootstrap.gpg
deleted file mode 100644
index c5fa9aa..0000000
--- a/opera/config/chroot_sources/opera.bootstrap.gpg
+++ /dev/null
@@ -1,38 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-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
-=HaRH
------END PGP PUBLIC KEY BLOCK-----
diff --git a/opera/config/chroot_sources/webc.binary b/opera/config/chroot_sources/webc.binary
deleted file mode 120000
index 5c95ed4..0000000
--- a/opera/config/chroot_sources/webc.binary
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_sources/webc.binary
\ No newline at end of file
diff --git a/opera/config/chroot_sources/webc.binary.gpg b/opera/config/chroot_sources/webc.binary.gpg
deleted file mode 120000
index 6e04801..0000000
--- a/opera/config/chroot_sources/webc.binary.gpg
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_sources/webc.binary.gpg
\ No newline at end of file
diff --git a/opera/config/chroot_sources/webc.bootstrap b/opera/config/chroot_sources/webc.bootstrap
deleted file mode 120000
index dfdad59..0000000
--- a/opera/config/chroot_sources/webc.bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_sources/webc.bootstrap
\ No newline at end of file
diff --git a/opera/config/chroot_sources/webc.bootstrap.gpg b/opera/config/chroot_sources/webc.bootstrap.gpg
deleted file mode 120000
index b04205a..0000000
--- a/opera/config/chroot_sources/webc.bootstrap.gpg
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_sources/webc.bootstrap.gpg
\ No newline at end of file
diff --git a/opera/config/common b/opera/config/common
deleted file mode 120000
index 88d1d97..0000000
--- a/opera/config/common
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/common
\ No newline at end of file
diff --git a/opera/config/source b/opera/config/source
deleted file mode 120000
index 42b3fee..0000000
--- a/opera/config/source
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/source
\ No newline at end of file
diff --git a/mini/config/binary_grub/menu.lst b/webconverger/config/binary_grub/menu.lst
similarity index 100%
rename from mini/config/binary_grub/menu.lst
rename to webconverger/config/binary_grub/menu.lst
diff --git a/mini/config/chroot_local-hooks/ipw2100.sh b/webconverger/config/chroot_local-hooks/ipw2100.sh
similarity index 100%
rename from mini/config/chroot_local-hooks/ipw2100.sh
rename to webconverger/config/chroot_local-hooks/ipw2100.sh
diff --git a/mini/config/chroot_local-hooks/ipw2200.sh b/webconverger/config/chroot_local-hooks/ipw2200.sh
similarity index 100%
rename from mini/config/chroot_local-hooks/ipw2200.sh
rename to webconverger/config/chroot_local-hooks/ipw2200.sh
diff --git a/mini/config/chroot_local-hooks/ipw3945.sh b/webconverger/config/chroot_local-hooks/ipw3945.sh
similarity index 100%
rename from mini/config/chroot_local-hooks/ipw3945.sh
rename to webconverger/config/chroot_local-hooks/ipw3945.sh
diff --git a/mini/config/chroot_local-hooks/madwifi.sh b/webconverger/config/chroot_local-hooks/madwifi.sh
similarity index 100%
rename from mini/config/chroot_local-hooks/madwifi.sh
rename to webconverger/config/chroot_local-hooks/madwifi.sh
diff --git a/mini/config/chroot_local-hooks/rt2570.sh b/webconverger/config/chroot_local-hooks/rt2570.sh
similarity index 100%
rename from mini/config/chroot_local-hooks/rt2570.sh
rename to webconverger/config/chroot_local-hooks/rt2570.sh
diff --git a/mini/config/chroot_local-hooks/rt2x00.sh b/webconverger/config/chroot_local-hooks/rt2x00.sh
similarity index 100%
rename from mini/config/chroot_local-hooks/rt2x00.sh
rename to webconverger/config/chroot_local-hooks/rt2x00.sh
diff --git a/webconverger/config/chroot_local-hooks/webconverger b/webconverger/config/chroot_local-hooks/webconverger
index a9d6c50..354f521 100755
--- a/webconverger/config/chroot_local-hooks/webconverger
+++ b/webconverger/config/chroot_local-hooks/webconverger
@@ -1,2 +1,3 @@
update-rc.d -f openbsd-inetd remove
update-rc.d -f stop-bootlogd remove
+update-rc.d -f nostromo remove
diff --git a/mini/config/chroot_local-hooks/zzzminimal b/webconverger/config/chroot_local-hooks/zzzminimal
similarity index 100%
rename from mini/config/chroot_local-hooks/zzzminimal
rename to webconverger/config/chroot_local-hooks/zzzminimal
diff --git a/webconverger/config/chroot_local-includes/etc/wpa_supplicant/wpa_supplicant.conf b/webconverger/config/chroot_local-includes/etc/wpa_supplicant/wpa_supplicant.conf
index 8550f8b..60a3f50 100644
--- a/webconverger/config/chroot_local-includes/etc/wpa_supplicant/wpa_supplicant.conf
+++ b/webconverger/config/chroot_local-includes/etc/wpa_supplicant/wpa_supplicant.conf
@@ -2,6 +2,6 @@
# Catch-all; associates with any open network:
# Use SSL people !!
-network={
- key_mgmt=NONE
-}
+#network={
+ #key_mgmt=NONE
+#}
diff --git a/webconverger/scripts/build b/webconverger/scripts/build
index 0a129bb..558cf91 100755
--- a/webconverger/scripts/build
+++ b/webconverger/scripts/build
@@ -1,3 +1,3 @@
#!/bin/sh
-lh_build noautoconfig ${@} 2>&1 | tee build.log
+lh_build noautoconfig ${@} 2>&1 | tee binary.log
diff --git a/webconverger/scripts/config b/webconverger/scripts/config
index b09314f..e2c5931 100755
--- a/webconverger/scripts/config
+++ b/webconverger/scripts/config
@@ -5,22 +5,30 @@ MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
lh_config noautoconfig \
--apt-recommends disabled \
- --debian-installer disabled \
--bootappend-live "quiet homepage=http://portal.webconverger.com/ nonetworking nosudo splash vga=791" \
+ --debian-installer live \
+ --debian-installer-distribution lenny \
+ --cache-stages "bootstrap rootfs" \
-k 486 \
-a i386 \
+ -f minimal \
+ -b usb-hdd \
+ --apt apt \
--username webc \
--hostname webconverger \
- -b usb-hdd \
+ --bootloader syslinux \
--categories "main contrib non-free" \
--distribution lenny \
--iso-publisher "Webconverger; http://webconverger.com/; support at webconverger.com" \
--iso-volume "Webconverger $(date +%Y%m%d-%H:%M)" \
--memtest none \
+ --syslinux-splash config/binary_syslinux/splash.rle \
+ --syslinux-timeout 5 \
--mirror-bootstrap ${MIRROR_DEBIAN} \
--mirror-chroot ${MIRROR_DEBIAN} \
--mirror-chroot-security ${MIRROR_SECURITY} \
--mirror-binary ${MIRROR_DEBIAN} \
--mirror-binary-security ${MIRROR_SECURITY} \
- --packages-lists "chinese iceweasel-l10n japanese korean myspell printing webconverger" \
+ --binary-indices disabled \
+ --packages-lists "webconverger" \
${@}
diff --git a/webkit/config/binary b/webkit/config/binary
deleted file mode 100644
index cd2df25..0000000
--- a/webkit/config/binary
+++ /dev/null
@@ -1,151 +0,0 @@
-# config/binary - options for live-helper(7), binary stage
-
-# $LH_BINARY_FILESYSTEM: set image filesystem
-# (Default: fat16)
-#LH_BINARY_FILESYSTEM="fat16"
-
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
-# (Default: enabled)
-#LH_BINARY_INDICES="enabled"
-
-# $LH_BOOTAPPEND_LIVE: set boot parameters
-# (Default: empty)
-LH_BOOTAPPEND_LIVE="quiet homepage=http://portal.webconverger.com nosudo splash vga=791 kioskresetstation=2"
-
-# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-#LH_BINARY_IMAGES="usb-hdd"
-
-# $LH_BOOTLOADER: set bootloader
-# (Default: syslinux) for LH_BINARY_IMAGES="usb-hdd"
-LH_BOOTLOADER="grub"
-
-# $LH_CHECKSUMS: set checksums
-# (Default: enabled)
-#LH_CHECKSUMS="enabled"
-
-# ${LH_CHROOT_BUILD: control if we build binary images chrooted
-# (Default: enabled)
-# DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to disabled.
-#LH_CHROOT_BUILD="enabled"
-
-
-
-# Experimental Installer stuff
-#
-# $LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-# LH_DEBIAN_INSTALLER="live"
-
-# $LH_BOOTAPPEND_INSTALL: set boot parameters
-# (Default: empty)
-# LH_BOOTAPPEND_INSTALL="auto locale=en_US languagechooser/language-name=English DEBCONF_PRIORITY=critical file=/cdrom/install/preseed.cfg interface=auto -- ${LH_BOOTAPPEND_LIVE}"
-
-# $LH_DEBIAN_INSTALLER_DAILY: set daily images
-# (Default: disabled)
-#LH_DEBIAN_INSTALLER_DAILY="enabled"
-
-
-
-
-
-# $LH_ENCRYPTION: set encrytion
-# (Default: empty)
-#LH_ENCRYPTION=""
-
-# $LH_GRUB_SPLASH: set custom grub splash
-# (Default: empty)
-#LH_GRUB_SPLASH=""
-
-# $LH_HOSTNAME: set hostname
-# (Default: debian)
-LH_HOSTNAME="webconverger"
-
-# $LH_ISO_APPLICATION: set iso author
-# (Default: Debian Live)
-LH_ISO_APPLICATION="Webconverger"
-
-# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 1.0~a38; http://packages.qa.debian.org/live-helper)
-#LH_ISO_PREPARER="live-helper 1.0~a38; http://packages.qa.debian.org/live-helper"
-
-# $LH_ISO_PUBLISHER: set iso publisher
-# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live-devel at lists.alioth.debian.org)
-LH_ISO_PUBLISHER="Webconverger; http://webconverger.com/; support at webconverger.com"
-
-# $LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Debian Live $(date +%Y%m%d-%H:%M))
-LH_ISO_VOLUME="Webconverger $(date +%Y%m%d-%H:%M)"
-
-# $LH_MEMTEST: set memtest
-# (Default: memtest86+)
-#LH_MEMTEST="memtest86+"
-LH_MEMTEST="disabled"
-
-# $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
-# (Default: nfs)
-#LH_NET_ROOT_FILESYSTEM="nfs"
-
-# $LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
-# (Default: empty)
-#LH_NET_ROOT_MOUNTOPTIONS=""
-
-# $LH_NET_ROOT_PATH: set netboot server directory
-# (Default: /srv/debian-live)
-#LH_NET_ROOT_PATH="/srv/debian-live"
-
-# $LH_NET_ROOT_SERVER: set netboot server address
-# (Default: 192.168.1.1)
-#LH_NET_ROOT_SERVER="192.168.1.1"
-
-# $LH_NET_COW_FILESYSTEM: set net client cow filesystem
-# (Default: nfs)
-#LH_NET_COW_FILESYSTEM="nfs"
-
-# $LH_NET_COW_MOUNTOPTIONS: set cow mount options
-# (Default: empty)
-#LH_NET_COW_MOUNTOPTIONS=""
-
-# $LH_NET_COW_PATH: set cow directory
-# (Default: )
-#LH_NET_COW_PATH=""
-
-# $LH_NET_COW_SERVER: set cow server
-# (Default: )
-#LH_NET_COW_SERVER=""
-
-# $LH_NET_TARBALL: set net tarball
-# (Default: gzip)
-#LH_NET_TARBALL="gzip"
-
-# $LH_SYSLINUX_SPLASH: set custom syslinux splash
-# (Default: empty)
-LH_SYSLINUX_SPLASH="config/binary_syslinux/splash.rle"
-
-# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
-# (Default: 0)
-LH_SYSLINUX_TIMEOUT="10"
-
-# $LH_SYSLINUX_CFG: set custom syslinux configuration file
-# (Default: empty)
-#LH_SYSLINUX_CFG=""
-
-# $LH_SYSLINUX_MENU: set syslinux menu
-# (Default: disabled)
-#LH_SYSLINUX_MENU="disabled"
-
-# $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
-# (Default: Start Debian Live)
-#LH_SYSLINUX_MENU_LIVE_ENTRY="Start Debian Live"
-
-# $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
-# (Default: )
-#LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY=""
-
-# $LH_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
-# (Default: Memory test)
-#LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
-
-# $LH_USERNAME: set username
-# (Default: user)
-LH_USERNAME="webc"
diff --git a/webkit/config/binary_debian-installer b/webkit/config/binary_debian-installer
deleted file mode 120000
index c0b3a29..0000000
--- a/webkit/config/binary_debian-installer
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_debian-installer
\ No newline at end of file
diff --git a/webkit/config/binary_grub b/webkit/config/binary_grub
deleted file mode 120000
index 8f9282a..0000000
--- a/webkit/config/binary_grub
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_grub
\ No newline at end of file
diff --git a/webkit/config/binary_local-includes b/webkit/config/binary_local-includes
deleted file mode 120000
index dd2debb..0000000
--- a/webkit/config/binary_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_local-includes
\ No newline at end of file
diff --git a/webkit/config/binary_syslinux b/webkit/config/binary_syslinux
deleted file mode 120000
index 96fc925..0000000
--- a/webkit/config/binary_syslinux
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_syslinux
\ No newline at end of file
diff --git a/webkit/config/bootstrap b/webkit/config/bootstrap
deleted file mode 120000
index 5e40e87..0000000
--- a/webkit/config/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/bootstrap
\ No newline at end of file
diff --git a/webkit/config/chroot b/webkit/config/chroot
deleted file mode 120000
index 4cf3643..0000000
--- a/webkit/config/chroot
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot
\ No newline at end of file
diff --git a/webkit/config/chroot_local-hooks/stripped b/webkit/config/chroot_local-hooks/stripped
deleted file mode 100755
index b38b301..0000000
--- a/webkit/config/chroot_local-hooks/stripped
+++ /dev/null
@@ -1,85 +0,0 @@
-#!/bin/sh
-
-# /usr/share/live-helper/hooks/stripped - hook list for live-helper(7)
-# Copyright (C) 2006-2008 Daniel Baumann <daniel at debian.org>
-#
-# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
-# This is free software, and you are welcome to redistribute it
-# under certain conditions; see COPYING for details.
-
-set -e
-
-# Removing unused packages
-# python-2.5
-# Rip out X extensions
-for PACKAGE in aptitude man-db manpages info dselect bsdmainutils manpages gcc-4.1 traceroute \
-vim-tiny vim-common \
-netcat-traditional \
-dbus \
-perl-doc \
-gcc-4.2-base \
-gcc-4.3-base \
-xserver-xorg-input-synaptics \
-xserver-xorg-video-apm \
-xserver-xorg-video-chips \
-xserver-xorg-video-imstt \
-xserver-xorg-video-mga \
-xserver-xorg-video-neomagic \
-xserver-xorg-video-newport \
-xserver-xorg-video-nsc \
-xserver-xorg-video-rendition \
-xserver-xorg-video-s3 \
-xserver-xorg-video-s3virge \
-xserver-xorg-video-savage \
-xserver-xorg-video-siliconmotion \
-xserver-xorg-video-sisusb \
-xserver-xorg-video-tdfx \
-xserver-xorg-video-tga \
-xserver-xorg-video-trident \
-xserver-xorg-video-tseng \
-xserver-xorg-video-v4l \
-xserver-xorg-video-vga \
-xserver-xorg-input-wacom \
-xserver-xorg-video-ark \
-xserver-xorg-video-cirrus \
-xserver-xorg-video-cyrix \
-xserver-xorg-video-dummy \
-xserver-xorg-video-fbdev \
-xserver-xorg-video-glint
-do
- if ! apt-get remove --purge --yes "${PACKAGE}"
- then
- echo "WARNING: ${PACKAGE} isn't installed"
- fi
-done
-
-apt-get autoremove --yes || true
-
-# Removing unused files
-find . -name *~ | xargs rm -f
-
-rm -rf /usr/include/*
-rm -rf /usr/share/groff/*
-rm -rf /usr/share/doc/*
-rm -rf /usr/share/locale/*
-rm -rf /usr/share/man/*
-rm -rf /usr/share/i18n/*
-rm -rf /usr/share/info/*
-rm -rf /usr/share/lintian/*
-rm -rf /usr/share/linda/*
-rm -rf /usr/share/zoneinfo/*
-rm -rf /var/cache/man/*
-
-# Cleaning apt lists
-rm -rf /var/lib/apt/lists
-mkdir -p /var/lib/apt/lists/partial
-
-# Cleaning apt cache
-rm -rf /var/cache/apt
-mkdir -p /var/cache/apt/archives/partial
-
-# Truncating logs
-for FILE in $(find /var/log/ -type f)
-do
- : > ${FILE}
-done
diff --git a/webkit/config/chroot_local-hooks/theme b/webkit/config/chroot_local-hooks/theme
deleted file mode 100755
index bf222db..0000000
--- a/webkit/config/chroot_local-hooks/theme
+++ /dev/null
@@ -1,2 +0,0 @@
-rm /etc/splashy/themes/default/background.png
-ln -s /etc/webconverger/background.jpg /etc/splashy/themes/default/background.png
diff --git a/webkit/config/chroot_local-hooks/webconverger b/webkit/config/chroot_local-hooks/webconverger
deleted file mode 100755
index a9d6c50..0000000
--- a/webkit/config/chroot_local-hooks/webconverger
+++ /dev/null
@@ -1,2 +0,0 @@
-update-rc.d -f openbsd-inetd remove
-update-rc.d -f stop-bootlogd remove
diff --git a/webkit/config/chroot_local-hooks/xorg b/webkit/config/chroot_local-hooks/xorg
deleted file mode 100755
index cb12fca..0000000
--- a/webkit/config/chroot_local-hooks/xorg
+++ /dev/null
@@ -1,3 +0,0 @@
-echo Setting up Webconverger Xorg config
-rm /etc/X11/xorg.conf
-ln -s /etc/X11/xorg.webc.conf /etc/X11/xorg.conf
diff --git a/webkit/config/chroot_local-includes b/webkit/config/chroot_local-includes
deleted file mode 120000
index db8ab4a..0000000
--- a/webkit/config/chroot_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_local-includes
\ No newline at end of file
diff --git a/webkit/config/chroot_local-packages/libwebkit-1.0-1_0~svn33561-1.1_i386.deb b/webkit/config/chroot_local-packages/libwebkit-1.0-1_0~svn33561-1.1_i386.deb
deleted file mode 100644
index 4fdd13b..0000000
Binary files a/webkit/config/chroot_local-packages/libwebkit-1.0-1_0~svn33561-1.1_i386.deb and /dev/null differ
diff --git a/webkit/config/chroot_local-packageslists/webconverger b/webkit/config/chroot_local-packageslists/webconverger
deleted file mode 120000
index dc9ae27..0000000
--- a/webkit/config/chroot_local-packageslists/webconverger
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_local-packageslists/webconverger
\ No newline at end of file
diff --git a/webkit/config/chroot_local-packageslists/webkit b/webkit/config/chroot_local-packageslists/webkit
deleted file mode 100644
index a6b63ee..0000000
--- a/webkit/config/chroot_local-packageslists/webkit
+++ /dev/null
@@ -1 +0,0 @@
-#epiphany-webkit
diff --git a/webkit/config/chroot_sources b/webkit/config/chroot_sources
deleted file mode 120000
index 9bf62c4..0000000
--- a/webkit/config/chroot_sources
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_sources
\ No newline at end of file
diff --git a/webkit/config/common b/webkit/config/common
deleted file mode 120000
index 88d1d97..0000000
--- a/webkit/config/common
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/common
\ No newline at end of file
diff --git a/webkit/config/source b/webkit/config/source
deleted file mode 120000
index 42b3fee..0000000
--- a/webkit/config/source
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/source
\ No newline at end of file
--
debian-live/config-webc
More information about the debian-live-changes
mailing list