[SCM] debian-live/config-webc branch, master, updated. ba71ef2bb88b3a389c7b25db8a95f880dd294481
Kai Hendry
hendry at iki.fi
Sun Feb 1 18:08:05 UTC 2009
The following commit has been merged in the master branch:
commit ba71ef2bb88b3a389c7b25db8a95f880dd294481
Author: Kai Hendry <hendry at iki.fi>
Date: Sun Feb 1 19:07:55 2009 +0100
autoconfig for mini/
diff --git a/mini/config/binary b/mini/config/binary
deleted file mode 100644
index 6895f00..0000000
--- a/mini/config/binary
+++ /dev/null
@@ -1,138 +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_IMAGES: set image type
-# (Default: iso)
-#LH_BINARY_IMAGES="usb-hdd"
-
-# $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/ nonetworking nosudo splash vga=791"
-
-# $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 -- quiet"
-
-# $LH_BOOTLOADER: set bootloader
-# (Default: syslinux)
-LH_BOOTLOADER="grub"
-
-# $LH_CHECKSUMS: set checksums
-# (Default: enabled)
-#LH_CHECKSUMS="enabled"
-
-# $LH_DEBIAN_INSTALLER: set debian-installer
-# (Default: disabled)
-LH_DEBIAN_INSTALLER="live"
-LH_DEBIAN_INSTALLER_PRESEEDFILE="preseed.cfg"
-
-# $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="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/mini/config/bootstrap b/mini/config/bootstrap
deleted file mode 120000
index 5e40e87..0000000
--- a/mini/config/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/bootstrap
\ No newline at end of file
diff --git a/mini/config/chroot b/mini/config/chroot
deleted file mode 100644
index e1326b6..0000000
--- a/mini/config/chroot
+++ /dev/null
@@ -1,4 +0,0 @@
-LH_UNION_FILESYSTEM="aufs"
-LH_LINUX_FLAVOURS="486"
-LH_PACKAGES_LISTS="webconverger"
-LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6 squashfs-modules-2.6"
diff --git a/mini/config/chroot_local-packages/live-initramfs_1.154.7-1.1_all.deb b/mini/config/chroot_local-packages/live-initramfs_1.154.7-1.1_all.deb
deleted file mode 100644
index 1390f33..0000000
Binary files a/mini/config/chroot_local-packages/live-initramfs_1.154.7-1.1_all.deb and /dev/null differ
diff --git a/mini/config/chroot_local-packages/live-initscripts_0+20081107.180748_all.deb b/mini/config/chroot_local-packages/live-initscripts_0+20081107.180748_all.deb
deleted file mode 100644
index 91a5206..0000000
Binary files a/mini/config/chroot_local-packages/live-initscripts_0+20081107.180748_all.deb and /dev/null differ
diff --git a/mini/config/common b/mini/config/common
deleted file mode 120000
index 88d1d97..0000000
--- a/mini/config/common
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/common
\ No newline at end of file
diff --git a/mini/config/source b/mini/config/source
deleted file mode 100644
index b24fffc..0000000
--- a/mini/config/source
+++ /dev/null
@@ -1,9 +0,0 @@
-# config/source - options for live-helper(7), source stage
-
-# $LH_SOURCE: set source option
-# (Default: disabled)
-#LH_SOURCE="enabled"
-
-# $LH_SOURCE_IMAGES: set image type
-# (Default: tar)
-#LH_SOURCE_IMAGES="tar"
diff --git a/mini/scripts/build b/mini/scripts/build
new file mode 100755
index 0000000..449f0fd
--- /dev/null
+++ b/mini/scripts/build
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+lh_build noautoconfig 2>&1 | tee build.log
diff --git a/mini/scripts/build.sh b/mini/scripts/build.sh
new file mode 100755
index 0000000..74d31e6
--- /dev/null
+++ b/mini/scripts/build.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+lh_build 2>&1 | tee build.log
diff --git a/mini/scripts/clean b/mini/scripts/clean
new file mode 100755
index 0000000..6db5ceb
--- /dev/null
+++ b/mini/scripts/clean
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+lh_clean noautoconfig --all ${@}
+
+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
new file mode 100755
index 0000000..64a0413
--- /dev/null
+++ b/mini/scripts/config
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+MIRROR_DEBIAN="http://mirror.webconverger.com/debian/"
+MIRROR_SECURITY="http://ftp.de.debian.org/debian-security/"
+
+lh_config noautoconfig \
+ --apt-recommends disabled \
+ --debian-installer live \
+ --debian-installer-distribution lenny \
+ --bootappend-live "quiet homepage=http://portal.webconverger.com/ nonetworking nosudo splash vga=791" \
+ -k 486 \
+ -a i386 \
+ --username webc \
+ --hostname webconverger \
+ --bootloader grub \
+ --categories "main contrib non-free" \
+ --distribution lenny \
+ --mirror-bootstrap ${MIRROR_DEBIAN} \
+ --mirror-chroot ${MIRROR_DEBIAN} \
+ --mirror-chroot-security ${MIRROR_SECURITY} \
+ --mirror-binary ${MIRROR_DEBIAN} \
+ --mirror-binary-security ${MIRROR_SECURITY} \
+ --packages-lists "webconverger" \
+ ${@}
diff --git a/webconverger/config/chroot_local-packageslists/webconverger b/webconverger/config/chroot_local-packageslists/webconverger
index b6cb115..5d12bcd 100644
--- a/webconverger/config/chroot_local-packageslists/webconverger
+++ b/webconverger/config/chroot_local-packageslists/webconverger
@@ -11,12 +11,10 @@ xorg xresprobe discover menu
# Sound
alsa-base alsa-oss alsa-utils
-# For upgrade, firewall et al. features
-live-initscripts
-
webconverger-base
webconverger-archive-keyring
+# firefox
iceweasel
# Window manager
@@ -27,7 +25,7 @@ xloadimage
# fonts
ttf-dejavu
-ttf-gentium
+# ttf-gentium
# pdf
xpdf mozplugger
@@ -40,8 +38,8 @@ openssl
ca-certificates
libcurl3
-#myspell-en-us
-myspell-en-gb
+myspell-en-us
+#myspell-en-gb
# For locking down the browser
#iceweasel-webcnoaddressbar
@@ -51,7 +49,7 @@ iceweasel-webconverger
#libwebkit-1.0-1
# httpd - http://localhost services
-nostromo
+# nostromo
# wireless
wpasupplicant
diff --git a/webconverger/config/chroot_sources/live-snapshots.binary b/webconverger/config/chroot_sources/live-snapshots.binary
new file mode 120000
index 0000000..40be6d9
--- /dev/null
+++ b/webconverger/config/chroot_sources/live-snapshots.binary
@@ -0,0 +1 @@
+live-snapshots.chroot
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/live-snapshots.binary.gpg b/webconverger/config/chroot_sources/live-snapshots.binary.gpg
new file mode 120000
index 0000000..24646fd
--- /dev/null
+++ b/webconverger/config/chroot_sources/live-snapshots.binary.gpg
@@ -0,0 +1 @@
+live-snapshots.chroot.gpg
\ No newline at end of file
diff --git a/webconverger/config/chroot_sources/live-snapshots.chroot b/webconverger/config/chroot_sources/live-snapshots.chroot
new file mode 100644
index 0000000..43c0434
--- /dev/null
+++ b/webconverger/config/chroot_sources/live-snapshots.chroot
@@ -0,0 +1,2 @@
+deb http://live.debian.net/debian/ ./
+deb-src http://live.debian.net/debian/ ./
diff --git a/webconverger/config/chroot_sources/restricted.chroot.gpg b/webconverger/config/chroot_sources/live-snapshots.chroot.gpg
similarity index 100%
copy from webconverger/config/chroot_sources/restricted.chroot.gpg
copy to webconverger/config/chroot_sources/live-snapshots.chroot.gpg
--
debian-live/config-webc
More information about the debian-live-changes
mailing list