r2703 - in dists/trunk/live-helper: docs functions helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Sun Aug 5 14:23:44 UTC 2007
Author: daniel
Date: 2007-08-05 14:23:44 +0000 (Sun, 05 Aug 2007)
New Revision: 2703
Modified:
dists/trunk/live-helper/docs/ChangeLog
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/helpers/lh_config
Log:
Modified: dists/trunk/live-helper/docs/ChangeLog
===================================================================
--- dists/trunk/live-helper/docs/ChangeLog 2007-08-05 14:11:56 UTC (rev 2702)
+++ dists/trunk/live-helper/docs/ChangeLog 2007-08-05 14:23:44 UTC (rev 2703)
@@ -1,5 +1,7 @@
2007-08-05 Daniel Baumann <daniel at debian.org>
+ * functions/defaults:
+ - Added debian-edu mode.
* lists/knoppix, knoppix-dvd:
- Added.
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-08-05 14:11:56 UTC (rev 2702)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-08-05 14:23:44 UTC (rev 2703)
@@ -42,7 +42,7 @@
if [ -z "${LH_DISTRIBUTION}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_DISTRIBUTION="etch"
;;
@@ -93,7 +93,7 @@
if [ -z "${LH_BOOTSTRAP}" ] || [ ! -x "`which ${LH_BOOTSTRAP}`" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
if [ -x "/usr/bin/cdebootstrap" ]
then
LH_BOOTSTRAP="cdebootstrap"
@@ -146,7 +146,7 @@
if [ -z "${LH_GENISOIMAGE}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_GENISOIMAGE="genisoimage"
;;
@@ -206,6 +206,10 @@
LH_ROOT="debian-live"
;;
+ debian-edu)
+ LH_ROOT="edu-live"
+ ;;
+
ubuntu)
LH_ROOT="ubuntu-live"
;;
@@ -270,6 +274,10 @@
esac
;;
+ debian-edu)
+ LH_MIRROR_BOOTSTRAP="http://ftp.skolelinux.no/debian/"
+ ;;
+
ubuntu)
case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
@@ -293,7 +301,7 @@
if [ -z "${LH_MIRROR_BOOTSTRAP_SECURITY}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_MIRROR_BOOTSTRAP_SECURITY="http://security.debian.org/"
;;
@@ -331,6 +339,10 @@
esac
;;
+ debian-edu)
+ LH_MIRROR_BINARY="http://ftp.skolelinux.no/debian/"
+ ;;
+
ubuntu)
case "${LH_ARCHITECTURE}" in
amd64|i386|powerpc|sparc)
@@ -354,7 +366,7 @@
if [ -z "${LH_MIRROR_BINARY_SECURITY}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
;;
@@ -376,7 +388,7 @@
if [ -z "${LH_SECTIONS}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_SECTIONS="main"
;;
@@ -415,7 +427,7 @@
amd64)
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_LINUX_FLAVOURS="amd64"
;;
@@ -436,7 +448,7 @@
i386)
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_LINUX_FLAVOURS="486"
;;
@@ -465,9 +477,13 @@
sparc)
case "${LH_MODE}" in
- debian)
- LH_LINUX_FLAVOURS="sparc32"
- # FIXME: needs update after etch
+ debian|debian-edu)
+ if [ "${LH_DISTRIBUTION}" = "etch" ]
+ then
+ LH_LINUX_FLAVOURS="sparc32"
+ else
+ LH_LINUX_FLAVOURS="sparc64"
+ fi
;;
ubuntu)
@@ -486,7 +502,7 @@
if [ -z "${LH_LINUX_PACKAGES}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_LINUX_PACKAGES="linux-image-2.6 ${LH_UNION_FILESYSTEM}-modules-2.6"
if [ "${LH_CHROOT_FILESYSTEM}" = "squashfs" ]
@@ -598,7 +614,7 @@
if [ -z "${LH_HOSTNAME}" ]
then
case "${LH_MODE}" in
- debian)
+ debian|debian-edu)
LH_HOSTNAME="debian"
;;
@@ -616,6 +632,10 @@
LH_ISO_APPLICATION="Debian Live"
;;
+ debian-edu)
+ LH_ISO_APPLICATION="Debian Edu Live"
+ ;;
+
ubuntu)
LH_ISO_APPLICATION="Ubuntu Live"
;;
@@ -636,6 +656,10 @@
LH_ISO_VOLUME="Debian Live \`date +%Y%m%d-%H:%M\`"
;;
+ debian-edu)
+ LH_ISO_VOLUME="Debian Edu Live \`date +%Y%m%d-%H:%M\`"
+ ;;
+
ubuntu)
LH_ISO_VOLUME="Ubuntu Live \`date +%Y%m%d-%H:%M\`"
;;
@@ -656,6 +680,10 @@
LH_NET_PATH="/srv/debian-live"
;;
+ debian-edu)
+ LH_NET_PATH="/srv/debian-edu-live"
+ ;;
+
ubuntu)
LH_NET_PATH="/srv/ubuntu-live"
;;
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-08-05 14:11:56 UTC (rev 2702)
+++ dists/trunk/live-helper/helpers/lh_config 2007-08-05 14:23:44 UTC (rev 2703)
@@ -20,7 +20,7 @@
# Setting static variables
DESCRIPTION="create configuration for live-helper(7)"
HELP="FIXME"
-USAGE="${PROGRAM} [--apt apt|aptitude] [--apt-ftp-proxy URL] [--apt-http-proxy URL] [--apt-pdiffs enabled|disabled] [--apt-pipeline FIXME] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|debootstrap] [--cache enabled|disabled] [--cache-indices enabled|disabled] [--cache-packages enabled|disabled] [--cache-stages STAGE|\"STAGES\"] [--debconf-frontend FIXME] [--debconf-nowarnings enabled|disabled] [--debconf-priority FIXME] [--genisoimage genisomage|mkisofs] [--initramfs live-initramfs|casper] [--losetup losetup|losetup.orig] [--mode debian|ubuntu] [--root-command sudo] [--tasksel aptitude|tasksel] [--includes PATH] [--templates PATH] [-a|--architecture ARCHITECTURE] [--bootstrap-config FILE] [-f|--bootstrap-flavour standard|minimal] [--bootstrap-keyring PACKAGE] [-d|--distribution CODENAME] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--chroot-filesystem ext2|ext3|squashfs|plain] [--union-filesystem unionfs|aufs] [--hooks FILE] [--interactive shell] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"] [--linux-packages \"PACKAGES\"] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists FILE] [--tasks TASK] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [-b|--binary-images iso|usb-hdd|net|tar] [--binary-indices enabled|disabled] [--bootappend PARAMETER|\"PARAMETERS\"] [--bootloader syslinux|grub|yaboot] [--chroot-build enabled|disabled] [--debian-installer enabled|disabled] [-e|--encryption aes128|aes192|aes256] [--grub-splash FILE] [--hostname NAME] [--iso-application NAME] [--iso-preparer NAME] [--iso-publisher NAME] [--iso-volume NAME] [---memtest memtest86+|memtest86] [--net-filesystem nfs|cfs] [--net-mountoptions OPTIONS] [--net-path PATH] [--net-server IP|HOSTNAME] [--syslinux-splash FILE] [--username NAME] [--source enabled|disabled] [-s|--source-images iso|usb-hdd|net|tar]"
+USAGE="${PROGRAM} [--apt apt|aptitude] [--apt-ftp-proxy URL] [--apt-http-proxy URL] [--apt-pdiffs enabled|disabled] [--apt-pipeline FIXME] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|debootstrap] [--cache enabled|disabled] [--cache-indices enabled|disabled] [--cache-packages enabled|disabled] [--cache-stages STAGE|\"STAGES\"] [--debconf-frontend FIXME] [--debconf-nowarnings enabled|disabled] [--debconf-priority FIXME] [--genisoimage genisomage|mkisofs] [--initramfs live-initramfs|casper] [--losetup losetup|losetup.orig] [--mode debian|debian-edu|ubuntu] [--root-command sudo] [--tasksel aptitude|tasksel] [--includes PATH] [--templates PATH] [-a|--architecture ARCHITECTURE] [--bootstrap-config FILE] [-f|--bootstrap-flavour standard|minimal] [--bootstrap-keyring PACKAGE] [-d|--distribution CODENAME] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--chroot-filesystem ext2|ext3|squashfs|plain] [--union-filesystem unionfs|aufs] [--hooks FILE] [--interactive shell] [--keyring-packages PACKAGE|\"PACKAGES\"] [-l|--language LANGUAGE] [-k|--linux-flavours FLAVOUR|\"FLAVOURS\"] [--linux-packages \"PACKAGES\"] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists FILE] [--tasks TASK] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [-b|--binary-images iso|usb-hdd|net|tar] [--binary-indices enabled|disabled] [--bootappend PARAMETER|\"PARAMETERS\"] [--bootloader syslinux|grub|yaboot] [--chroot-build enabled|disabled] [--debian-installer enabled|disabled] [-e|--encryption aes128|aes192|aes256] [--grub-splash FILE] [--hostname NAME] [--iso-application NAME] [--iso-preparer NAME] [--iso-publisher NAME] [--iso-volume NAME] [---memtest memtest86+|memtest86] [--net-filesystem nfs|cfs] [--net-mountoptions OPTIONS] [--net-path PATH] [--net-server IP|HOSTNAME] [--syslinux-splash FILE] [--username NAME] [--source enabled|disabled] [-s|--source-images iso|usb-hdd|net|tar]"
Local_arguments ()
{
More information about the debian-live-changes
mailing list