[Debian-live-changes] r1967 - dists/trunk/live-helper/helpers
daniel at alioth.debian.org
daniel at alioth.debian.org
Mon Jun 4 14:24:41 UTC 2007
Author: daniel
Date: 2007-06-04 14:24:41 +0000 (Mon, 04 Jun 2007)
New Revision: 1967
Modified:
dists/trunk/live-helper/helpers/lh_binary_debian-installer
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/helpers/lh_binary_linux-image
dists/trunk/live-helper/helpers/lh_binary_memtest
dists/trunk/live-helper/helpers/lh_binary_syslinux
dists/trunk/live-helper/helpers/lh_binary_tar
dists/trunk/live-helper/helpers/lh_binary_yaboot
dists/trunk/live-helper/helpers/lh_source_tar
dists/trunk/live-helper/helpers/make-live
Log:
Modified: dists/trunk/live-helper/helpers/lh_binary_debian-installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-06-04 14:24:41 UTC (rev 1967)
@@ -66,7 +66,7 @@
exit 1
;;
- usb-hdd|hdd)
+ tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
@@ -112,7 +112,7 @@
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
@@ -137,7 +137,7 @@
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-06-04 14:24:41 UTC (rev 1967)
@@ -93,7 +93,7 @@
# Setting destination directory
case "${LIVE_BINARY_IMAGES}" in
- iso|usb-hdd|hdd)
+ iso|tar|usb-hdd)
DESTDIR_LIVE="binary/live"
DESTDIR_INSTALL="binary/install"
;;
@@ -245,7 +245,7 @@
cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
;;
- usb-hdd|hdd)
+ tar|usb-hdd)
cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_binary_linux-image
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_binary_linux-image 2007-06-04 14:24:41 UTC (rev 1967)
@@ -59,7 +59,7 @@
DESTDIR="tftpboot"
;;
- usb-hdd|hdd)
+ tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest 2007-06-04 14:24:41 UTC (rev 1967)
@@ -81,7 +81,7 @@
DESTDIR="tftpboot"
;;
- usb-hdd|hdd)
+ tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-06-04 14:24:41 UTC (rev 1967)
@@ -103,7 +103,7 @@
DESTDIR_INSTALL="tftpboot"
;;
- usb-hdd|hdd)
+ tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
@@ -238,7 +238,7 @@
# Workaround for syslinux (<< 3.36) which doesn't support long file/path names
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
- if [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ] || [ "${LIVE_BINARY_IMAGES}" = "hdd" ]
+ if [ "${LIVE_BINARY_IMAGES}" = "tar" ] || [ "${LIVE_BINARY_IMAGES}" = "usb-hdd" ]
then
VMLINUZ_DI="vmlinuz.di"
INITRD_DI="initrddi.gz"
@@ -449,7 +449,7 @@
fi
;;
- usb-hdd|hdd)
+ tar|usb-hdd)
# Workaround for syslinux (<< 3.36) which doesn't support dedicated directory
if [ "${LIVE_DISTRIBUTION}" = "etch" ] || [ "${LIVE_DISTRIBUTION}" = "lenny" ]
then
Modified: dists/trunk/live-helper/helpers/lh_binary_tar
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_tar 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_binary_tar 2007-06-04 14:24:41 UTC (rev 1967)
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_binary_hdd(1) - build harddisk binary image
+# lh_binary_tar(1) - build harddisk binary image
# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -32,7 +32,7 @@
Read_conffile config/source
Set_defaults
-if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs hdd
+if ! echo "${LIVE_BINARY_IMAGES}" | grep -qs tar
then
exit 0
fi
@@ -43,7 +43,7 @@
Require_stagefile .stage/bootstrap
# Checking stage file
-Check_stagefile .stage/binary_hdd
+Check_stagefile .stage/binary_tar
# Checking lock file
Check_lockfile .lock
@@ -52,9 +52,9 @@
Create_lockfile .lock
# Remove old binary
-rm -f binary-hdd.tar.gz
+rm -f binary.tar.gz
-tar cfz binary-hdd.tar.gz binary
+tar cfz binary-tar.tar.gz binary
# Creating stage file
-Create_stagefile .stage/binary_hdd
+Create_stagefile .stage/binary_tar
Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-06-04 14:24:41 UTC (rev 1967)
@@ -97,7 +97,7 @@
DESTDIR="binary/live"
;;
- net|usb-hdd|hdd)
+ net|tar|usb-hdd)
Echo_error "not supported, FIXME"
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_source_tar
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_tar 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/lh_source_tar 2007-06-04 14:24:41 UTC (rev 1967)
@@ -1,6 +1,6 @@
#!/bin/sh
-# lh_source_hdd(1) - build source harddisk image
+# lh_source_tar(1) - build source harddisk image
# Copyright (C) 2006-2007 Daniel Baumann <daniel at debian.org>
#
# live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
@@ -37,7 +37,7 @@
exit 0
fi
-if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd
+if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs tar
then
exit 0
fi
@@ -49,7 +49,7 @@
Require_stagefile .stage/source_debian
# Checking stage file
-Check_stagefile .stage/source_hdd
+Check_stagefile .stage/source_tar
# Checking lock file
Check_lockfile .lock
@@ -58,13 +58,13 @@
Create_lockfile .lock
# Remove old source
-if [ -f source-hdd.tar.gz ]
+if [ -f source.tar.gz ]
then
- rm -f source-hdd.tar.gz
+ rm -f source.tar.gz
fi
# Create tarball
-tar cfz source-hdd.tar.gz source
+tar cfz source.tar.gz source
# Creating stage file
-Create_stagefile .stage/source_hdd
+Create_stagefile .stage/source_tar
Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live 2007-06-04 14:16:46 UTC (rev 1966)
+++ dists/trunk/live-helper/helpers/make-live 2007-06-04 14:24:41 UTC (rev 1967)
@@ -33,7 +33,7 @@
# Setting static variables
PROGRAM="`basename ${0}`"
DESCRIPTION="utility to build Debian Live systems"
-USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images hdd|iso|usb-hdd|net] [-s|--source-images generic|hdd|iso|usb-hdd|net] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
+USAGE="${PROGRAM} [config] [--mode MODE] [--config CONFIG] [--apt apt|aptitude] [--apt-ftpproxy URL] [--apt-httpproxy URL] [--binary-indices enabled|disabled] [--apt-pdiffs enabled|disabled] [--apt-recommends enabled|disabled] [--apt-secure enabled|disabled] [--bootstrap cdebootstrap|deboostrap] [--cache enabled|disabled] [--debconf-frontend dialog|readline|noninteractive] [--debconf-priority low|medium|high|critical] [--debconf-nowarnings yes|no] [--genisoimage genisoimage|mkisofs] [--losetup losetup|losetup.org] [--tasksel aptitude|tasksel] [-r|--root DIRECTORY] [-a|--architecture ARCHITECTURE] [-d|--distribution stable|testing|unstable|etch|lenny|sid] [--distribution-config DIRECTORY] [-f|--bootstrap-flavour minimal|standard] [-m|--mirror-bootstrap URL] [--mirror-bootstrap-security URL] [--mirror-binary URL] [--mirror-binary-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--linux-flavour FLAVOUR] [--linux-packages PACKAGE|\"PACKAGES\"] [--keyring-packages PACKAGE|\"PACKAGES\"] [--hooks \"COMMAND\"|\"COMMANDS\"] [-l|--language LANGUAGE] [--packages PACKAGE|\"PACKAGES\"] [-p|--packages-lists LIST|\"LISTS\"] [--tasks TASK|\"TASKS\"] [--security enabled|disabled] [--symlinks enabled|disabled] [--sysvinit enabled|disabled] [--bootappend BOOT_PARAMETER|\"BOOT_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--chroot-filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--net-server HOSTNAME|IP] [--net-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-images iso|net|tar|usb-hdd] [-s|--source-images iso|net|tar|usb-hdd] [--includes PATH] [--templates PATH] [--breakpoints] [--debug] [--force] [--quiet] [--verbose] [--root-command sudo]"
HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep, kde, kde-core, kde-desktop, kde-extra, kde-full, kde-junior, mini, minimal, minimal-net, rescue, standard, standard-x11, xfce, xfce-desktop, xfce-junior"
More information about the Debian-live-changes
mailing list