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

Kai Hendry hendry at iki.fi
Thu May 1 16:23:20 UTC 2008


The following commit has been merged in the master branch:
commit daafcce8b34cc4baeff86cfde972c7d8e553cadd
Author: Kai Hendry <hendry at iki.fi>
Date:   Thu May 1 17:23:15 2008 +0100

    I don't think mini-hd is needed. Just confuses some people.
    
    Instead HD work could happen in a branch instead.

diff --git a/mini-hd/config/binary b/mini-hd/config/binary
deleted file mode 100644
index 2a68df3..0000000
--- a/mini-hd/config/binary
+++ /dev/null
@@ -1,142 +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="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 upgrade homepage=http://portal.webconverger.com/ nosudo"
-
-# $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_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="live"
-
-# $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~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_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=""
-
-# $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="user"
diff --git a/mini-hd/config/binary_debian-installer b/mini-hd/config/binary_debian-installer
deleted file mode 120000
index c0b3a29..0000000
--- a/mini-hd/config/binary_debian-installer
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_debian-installer
\ No newline at end of file
diff --git a/mini-hd/config/binary_local-includes b/mini-hd/config/binary_local-includes
deleted file mode 120000
index dd2debb..0000000
--- a/mini-hd/config/binary_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/binary_local-includes
\ No newline at end of file
diff --git a/mini-hd/config/bootstrap b/mini-hd/config/bootstrap
deleted file mode 120000
index 5e40e87..0000000
--- a/mini-hd/config/bootstrap
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/bootstrap
\ No newline at end of file
diff --git a/mini-hd/config/chroot b/mini-hd/config/chroot
deleted file mode 120000
index 4cf3643..0000000
--- a/mini-hd/config/chroot
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot
\ No newline at end of file
diff --git a/mini-hd/config/chroot_local-hooks b/mini-hd/config/chroot_local-hooks
deleted file mode 120000
index ce977ac..0000000
--- a/mini-hd/config/chroot_local-hooks
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_local-hooks
\ No newline at end of file
diff --git a/mini-hd/config/chroot_local-includes b/mini-hd/config/chroot_local-includes
deleted file mode 120000
index db8ab4a..0000000
--- a/mini-hd/config/chroot_local-includes
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_local-includes
\ No newline at end of file
diff --git a/mini-hd/config/chroot_local-packageslists/en_US.dict b/mini-hd/config/chroot_local-packageslists/en_US.dict
deleted file mode 100644
index a15c004..0000000
--- a/mini-hd/config/chroot_local-packageslists/en_US.dict
+++ /dev/null
@@ -1,2 +0,0 @@
-#myspell-en-us
-myspell-en-gb
diff --git a/mini-hd/config/chroot_local-packageslists/hd b/mini-hd/config/chroot_local-packageslists/hd
deleted file mode 120000
index 8b4ce9b..0000000
--- a/mini-hd/config/chroot_local-packageslists/hd
+++ /dev/null
@@ -1 +0,0 @@
-../../../webconverger/config/chroot_local-packageslists/hd
\ No newline at end of file
diff --git a/mini-hd/config/chroot_local-packageslists/webconverger b/mini-hd/config/chroot_local-packageslists/webconverger
deleted file mode 120000
index dc9ae27..0000000
--- a/mini-hd/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-hd/config/chroot_sources b/mini-hd/config/chroot_sources
deleted file mode 120000
index 9bf62c4..0000000
--- a/mini-hd/config/chroot_sources
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/chroot_sources
\ No newline at end of file
diff --git a/mini-hd/config/common b/mini-hd/config/common
deleted file mode 120000
index 88d1d97..0000000
--- a/mini-hd/config/common
+++ /dev/null
@@ -1 +0,0 @@
-../../webconverger/config/common
\ No newline at end of file
diff --git a/mini-hd/config/source b/mini-hd/config/source
deleted file mode 120000
index 42b3fee..0000000
--- a/mini-hd/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