[Debian-live-changes] r1178 - in dists/trunk/live-helper: doc
examples functions helpers manpages
Daniel Baumann
daniel at alioth.debian.org
Thu Apr 26 09:26:58 UTC 2007
Author: daniel
Date: 2007-04-26 09:26:57 +0000 (Thu, 26 Apr 2007)
New Revision: 1178
Added:
dists/trunk/live-helper/helpers/lh_binary_debian-installer
dists/trunk/live-helper/helpers/lh_binary_usb-hdd
dists/trunk/live-helper/helpers/lh_source_usb-hdd
Removed:
dists/trunk/live-helper/helpers/lh_binary_installer
dists/trunk/live-helper/helpers/lh_binary_usb
dists/trunk/live-helper/helpers/lh_source_usb
Modified:
dists/trunk/live-helper/doc/ChangeLog
dists/trunk/live-helper/doc/README
dists/trunk/live-helper/examples/daily-cron.sh
dists/trunk/live-helper/examples/etch+beryl-cron.sh
dists/trunk/live-helper/examples/etch-cron.sh
dists/trunk/live-helper/examples/weekly-cron.sh
dists/trunk/live-helper/functions/defaults.sh
dists/trunk/live-helper/helpers/lh_binary
dists/trunk/live-helper/helpers/lh_binary_grub
dists/trunk/live-helper/helpers/lh_binary_includes
dists/trunk/live-helper/helpers/lh_binary_linuximage
dists/trunk/live-helper/helpers/lh_binary_memtest
dists/trunk/live-helper/helpers/lh_binary_syslinux
dists/trunk/live-helper/helpers/lh_binary_yaboot
dists/trunk/live-helper/helpers/lh_config
dists/trunk/live-helper/helpers/lh_source
dists/trunk/live-helper/helpers/make-live
dists/trunk/live-helper/manpages/lh_binary.1.de
dists/trunk/live-helper/manpages/lh_binary.1.en
dists/trunk/live-helper/manpages/lh_source.1.de
dists/trunk/live-helper/manpages/lh_source.1.en
dists/trunk/live-helper/manpages/live-helper.7.de
dists/trunk/live-helper/manpages/live-helper.7.en
dists/trunk/live-helper/manpages/make-live.1.de
dists/trunk/live-helper/manpages/make-live.1.en
Log:
Modified: dists/trunk/live-helper/doc/ChangeLog
===================================================================
--- dists/trunk/live-helper/doc/ChangeLog 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/doc/ChangeLog 2007-04-26 09:26:57 UTC (rev 1178)
@@ -1,3 +1,9 @@
+2007-04-25 Daniel Baumann <daniel at debian.org>
+
+ * helpers/lh_binary_usb, lh_source_usb:
+ - In preparation of adding support for usb-zip images, the usb binary
+ type is renamed to usb-hdd.
+
2007-04-24 Daniel Baumann <daniel at debian.org>
* functions/stagefile.sh:
@@ -2,3 +8,3 @@
- Requite_stagefile can require more than one stage.
- * helpers/lh_binary_installer:
+ * helpers/lh_binary_debian-installer:
- Added.
Modified: dists/trunk/live-helper/doc/README
===================================================================
--- dists/trunk/live-helper/doc/README 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/doc/README 2007-04-26 09:26:57 UTC (rev 1178)
@@ -63,7 +63,7 @@
|_ lh_binary_hdd
|_ lh_binary_iso
|_ lh_binary_net
- |_ lh_binary_usb
+ |_ lh_binary_usb-hdd
|
|_ rm -f .stage/chroot_sources
|_ lh_chroot_resolv remove
@@ -84,7 +84,7 @@
|_ lh_source_hdd
|_ lh_source_iso
|_ lh_source_net
- |_ lh_source_usb
+ |_ lh_source_usb-hdd
|
|_ rm -f .stage/chroot_sources
|_ lh_chroot_resolv remove
Modified: dists/trunk/live-helper/examples/daily-cron.sh
===================================================================
--- dists/trunk/live-helper/examples/daily-cron.sh 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/examples/daily-cron.sh 2007-04-26 09:26:57 UTC (rev 1178)
@@ -76,7 +76,7 @@
mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
fi
- if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+ if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ]
then
# Workaround of missing multi-binary support in live-helper
mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
@@ -89,15 +89,15 @@
# Generating images
mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
cd "${AUTOBUILD_TEMPDIR}"
- make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+ make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
fi
if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
then
# Moving logs
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
- cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+ mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt
+ cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt
# Moving images
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
Modified: dists/trunk/live-helper/examples/etch+beryl-cron.sh
===================================================================
--- dists/trunk/live-helper/examples/etch+beryl-cron.sh 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/examples/etch+beryl-cron.sh 2007-04-26 09:26:57 UTC (rev 1178)
@@ -86,7 +86,7 @@
mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-etch+beryl-source-${PACKAGES_LIST}.tar
fi
- if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+ if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ]
then
# Workaround of missing multi-binary support in live-helper
mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
@@ -99,15 +99,15 @@
# Generating images
mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
cd "${AUTOBUILD_TEMPDIR}"
- make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+ make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
fi
if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
then
# Moving logs
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
- cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+ mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt
+ cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-etch+beryl-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt
# Moving images
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
Modified: dists/trunk/live-helper/examples/etch-cron.sh
===================================================================
--- dists/trunk/live-helper/examples/etch-cron.sh 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/examples/etch-cron.sh 2007-04-26 09:26:57 UTC (rev 1178)
@@ -76,7 +76,7 @@
mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
fi
- if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+ if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ]
then
# Workaround of missing multi-binary support in live-helper
mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
@@ -89,15 +89,15 @@
# Generating images
mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
cd "${AUTOBUILD_TEMPDIR}"
- make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+ make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
fi
if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
then
# Moving logs
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
- cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+ mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt
+ cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt
# Moving images
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
Modified: dists/trunk/live-helper/examples/weekly-cron.sh
===================================================================
--- dists/trunk/live-helper/examples/weekly-cron.sh 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/examples/weekly-cron.sh 2007-04-26 09:26:57 UTC (rev 1178)
@@ -76,7 +76,7 @@
mv "${AUTOBUILD_TEMPDIR}"/debian-live/source.tar "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/source/debian-live-${DISTRIBUTION}-source-${PACKAGES_LIST}.tar
fi
- if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt ]
+ if [ ! -f "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt ]
then
# Workaround of missing multi-binary support in live-helper
mv "${AUTOBUILD_TEMPDIR}"/debian-live/binary/casper "${AUTOBUILD_TEMPDIR}"/debian-live/casper.tmp
@@ -89,15 +89,15 @@
# Generating images
mkdir -p "${AUTOBUILD_TEMPDIR}"/debian-live
cd "${AUTOBUILD_TEMPDIR}"
- make-live -b usb -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
+ make-live -b usb-hdd -s generic --distribution ${DISTRIBUTION} --packages-lists ${PACKAGES_LIST} --mirror-build ${AUTOBUILD_MIRROR} --mirror-build-security ${AUTOBUILD_MIRROR_SECURITY} --source disabled ${AUTOBUILD_OPTIONS} > "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt 2>&1
fi
if [ -f "${AUTOBUILD_TEMPDIR}"/debian-live/binary.img ]
then
# Moving logs
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log
- mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-log.txt
- cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-packages.txt
+ mv "${AUTOBUILD_TEMPDIR}"/debian-live/log.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-log.txt
+ cp "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-iso-packages.txt "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/log/debian-live-${DISTRIBUTION}-${ARCHITECTURE}-${PACKAGES_LIST}_${AUTOBUILD_DATE}-usb-hdd-packages.txt
# Moving images
mkdir -p "${AUTOBUILD_DESTDIR}"/"${BUILD}"-builds/${AUTOBUILD_DATE}/${ARCHITECTURE}
Modified: dists/trunk/live-helper/functions/defaults.sh
===================================================================
--- dists/trunk/live-helper/functions/defaults.sh 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/functions/defaults.sh 2007-04-26 09:26:57 UTC (rev 1178)
@@ -550,9 +550,9 @@
fi
# Setting debian-installer option
- if [ -z "${LIVE_INSTALLER}" ]
+ if [ -z "${LIVE_DEBIAN_INSTALLER}" ]
then
- LIVE_INSTALLER="enabled"
+ LIVE_DEBIAN_INSTALLER="enabled"
fi
# Setting iso volume
Modified: dists/trunk/live-helper/helpers/lh_binary
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary 2007-04-26 09:26:57 UTC (rev 1178)
@@ -42,7 +42,7 @@
# Prepare images
lh_binary_linuximage "${@}"
-lh_binary_installer "${@}"
+lh_binary_debian-installer "${@}"
lh_binary_memtest "${@}"
lh_binary_grub "${@}"
lh_binary_syslinux "${@}"
@@ -55,7 +55,7 @@
lh_binary_hdd "${@}"
lh_binary_iso "${@}"
lh_binary_net "${@}"
-lh_binary_usb "${@}"
+lh_binary_usb-hdd "${@}"
# Deconfiguring chroot
rm -f .stage/chroot_sources
Copied: dists/trunk/live-helper/helpers/lh_binary_debian-installer (from rev 1175, dists/trunk/live-helper/helpers/lh_binary_installer)
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_installer 2007-04-25 19:32:58 UTC (rev 1175)
+++ dists/trunk/live-helper/helpers/lh_binary_debian-installer 2007-04-26 09:26:57 UTC (rev 1178)
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# lh_binary_debian-installer(1) - install debian-installer into binary
+# Copyright (C) 2006-2007 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="install debian-installer into binary"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
+Set_defaults
+
+if [ "${LIVE_DEBIAN_INSTALLER}" != "enabled" ]
+then
+ exit 0
+fi
+
+Breakpoint "binary_debian-installer: Init"
+
+# Requiring stage file
+Require_stagefile .stage/bootstrap
+
+# Checking stage file
+Check_stagefile .stage/binary_debian-installer
+
+# Checking lock file
+Check_lockfile .lock
+
+# Creating lock file
+Create_lockfile .lock
+
+# Setting destination directory
+case "${LIVE_BINARY_IMAGE}" in
+ iso)
+ DESTDIR="binary/install"
+ DESTDIR_INSTALLER="cdrom"
+ ;;
+
+ net)
+ DESTDIR="tftpboot"
+ DESTDIR_INSTALLER="netboot"
+
+ Echo_error "Not supported yet (FIXME)"
+ exit 1
+ ;;
+
+ usb-hdd|hdd)
+ DESTDIR="binary"
+ DESTDIR_INSTALLER="hd-media"
+ ;;
+esac
+
+# Temporary check for broken syslinux
+if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
+then
+ # Assemble multi-arch
+ if [ -n "${MULTIARCH}" ]
+ then
+ case "${LIVE_ARCHITECTURE}" in
+ amd64)
+ DESTDIR="${DESTDIR}.amd"
+ ;;
+
+ i386)
+ DESTDIR="${DESTDIR}.386"
+ ;;
+
+ powerpc)
+ DESTDIR="${DESTDIR}.ppc"
+ ;;
+ esac
+ fi
+fi
+
+# Downloading debian-installer
+mkdir -p "${DESTDIR}"
+
+wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
+wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
+
+# Downloading graphical-installer
+if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
+then
+ mkdir -p "${DESTDIR}"/gtk
+
+ wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
+ wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
+fi
+
+# Creating stage file
+Create_stagefile .stage/binary_debian-installer
Modified: dists/trunk/live-helper/helpers/lh_binary_grub
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_grub 2007-04-26 09:26:57 UTC (rev 1178)
@@ -76,7 +76,7 @@
# Setting destination directory
case "${LIVE_BINARY_IMAGE}" in
- iso|usb|hdd)
+ iso|usb-hdd|hdd)
DESTDIR_LIVE="binary/live"
DESTDIR_INSTALL="binary/install"
;;
@@ -157,8 +157,8 @@
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-# Assembling debian installer configuration
-if [ "${LIVE_INSTALLER}" = "enabled" ]
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
LINUX="title\t\tLive:\nroot\n\n${LINUX}"
@@ -190,7 +190,7 @@
cp chroot/usr/lib/grub/*/stage2_eltorito binary/boot/grub
;;
- usb|hdd)
+ usb-hdd|hdd)
cp chroot/usr/lib/grub/*/stage1 chroot/usr/lib/grub/*/stage2 binary/boot/grub
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_binary_includes
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_includes 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_includes 2007-04-26 09:26:57 UTC (rev 1178)
@@ -77,10 +77,10 @@
;;
esac
-if [ "${LIVE_INSTALLER}" = "enabled" ]
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
# Working arround vfat limitations
- if [ "${LIVE_BINARY_IMAGE}" = "usb" ]
+ if [ "${LIVE_BINARY_IMAGE}" = "usb-hdd" ]
then
CP_OPTIONS="--preserve=link,mode,timestamps"
fi
Deleted: dists/trunk/live-helper/helpers/lh_binary_installer
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_installer 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_installer 2007-04-26 09:26:57 UTC (rev 1178)
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# lh_binary_installer(1) - install debian-installer into binary
-# Copyright (C) 2006-2007 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="install debian-installer into binary"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-if [ "${LIVE_INSTALLER}" != "enabled" ]
-then
- exit 0
-fi
-
-Breakpoint "binary_installer: Init"
-
-# Requiring stage file
-Require_stagefile .stage/bootstrap
-
-# Checking stage file
-Check_stagefile .stage/binary_installer
-
-# Checking lock file
-Check_lockfile .lock
-
-# Creating lock file
-Create_lockfile .lock
-
-# Setting destination directory
-case "${LIVE_BINARY_IMAGE}" in
- iso)
- DESTDIR="binary/install"
- DESTDIR_INSTALLER="cdrom"
- ;;
-
- net)
- DESTDIR="tftpboot"
- DESTDIR_INSTALLER="netboot"
-
- Echo_error "Not supported yet (FIXME)"
- exit 1
- ;;
-
- usb|hdd)
- DESTDIR="binary"
- DESTDIR_INSTALLER="hd-media"
- ;;
-esac
-
-# Temporary check for broken syslinux
-if [ "${LIVE_BINARY_IMAGE}" = "iso" ]
-then
- # Assemble multi-arch
- if [ -n "${MULTIARCH}" ]
- then
- case "${LIVE_ARCHITECTURE}" in
- amd64)
- DESTDIR="${DESTDIR}.amd"
- ;;
-
- i386)
- DESTDIR="${DESTDIR}.386"
- ;;
-
- powerpc)
- DESTDIR="${DESTDIR}.ppc"
- ;;
- esac
- fi
-fi
-
-# Downloading debian-installer
-mkdir -p "${DESTDIR}"
-
-wget --no-clobber -O "${DESTDIR}"/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/vmlinuz
-wget --no-clobber -O "${DESTDIR}"/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/initrd.gz
-
-# Downloading graphical-installer
-if [ "${LIVE_ARCHITECTURE}" = "amd64" ] || [ "${LIVE_ARCHITECTURE}" = "i386" ] || [ "${LIVE_ARCHITECTURE}" = "powerpc" ]
-then
- mkdir -p "${DESTDIR}"/gtk
-
- wget --no-clobber -O "${DESTDIR}"/gtk/vmlinuz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/vmlinuz
- wget --no-clobber -O "${DESTDIR}"/gtk/initrd.gz "${LIVE_MIRROR_BUILD}"/dists/"${LIVE_DISTRIBUTION}"/main/installer-"${LIVE_ARCHITECTURE}"/current/images/"${DESTDIR_INSTALLER}"/gtk/initrd.gz
-fi
-
-# Creating stage file
-Create_stagefile .stage/binary_installer
Modified: dists/trunk/live-helper/helpers/lh_binary_linuximage
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_linuximage 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_linuximage 2007-04-26 09:26:57 UTC (rev 1178)
@@ -58,7 +58,7 @@
DESTDIR="tftpboot"
;;
- usb|hdd)
+ usb-hdd|hdd)
DESTDIR="binary"
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_binary_memtest
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_memtest 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_memtest 2007-04-26 09:26:57 UTC (rev 1178)
@@ -80,7 +80,7 @@
DESTDIR="tftpboot"
;;
- usb|hdd)
+ usb-hdd|hdd)
DESTDIR="binary"
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_binary_syslinux
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_syslinux 2007-04-26 09:26:57 UTC (rev 1178)
@@ -86,7 +86,7 @@
DESTDIR_INSTALL="tftpboot"
;;
- usb|hdd)
+ usb-hdd|hdd)
DESTDIR_LIVE="binary"
DESTDIR_INSTALL="binary"
;;
@@ -181,8 +181,8 @@
# Removing '//'
LINUX="`echo ${LINUX} | sed -e 's#//#/#g'`"
-# Assembling debian installer configuration
-if [ "${LIVE_INSTALLER}" = "enabled" ]
+# Assembling debian-installer configuration
+if [ "${LIVE_DEBIAN_INSTALLER}" = "enabled" ]
then
LIVE_KERNEL_INSTALL="LABEL install\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- "
LIVE_KERNEL_INSTALL="${LIVE_KERNEL_INSTALL}\n\nLABEL linux\n\tkernel /`basename ${DESTDIR_INSTALL}`/vmlinuz\n\tappend vga=normal initrd=/`basename ${DESTDIR_INSTALL}`/initrd.gz -- \n\n"
@@ -312,7 +312,7 @@
fi
;;
- usb|hdd)
+ usb-hdd|hdd)
# Copying syslinux
mkdir -p binary
cp chroot/usr/lib/syslinux/isolinux.bin binary/syslinux.bin
Deleted: dists/trunk/live-helper/helpers/lh_binary_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-26 09:26:57 UTC (rev 1178)
@@ -1,157 +0,0 @@
-#!/bin/sh
-
-# lh_binary_usb(1) - build binary image
-# Copyright (C) 2006-2007 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="build binary image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "binary_usb: Init"
-
-for IMAGE in ${LIVE_BINARY_IMAGE}
-do
- if [ "${IMAGE}" = "usb" ]
- then
- # Requiring stage file
- Require_stagefile .stage/bootstrap
- Require_stagefile .stage/chroot_proc
-
- # Checking stage file
- Check_stagefile .stage/binary_usb
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Checking depends
- Check_package chroot/sbin/mkdosfs dosfstools
- Check_package chroot/usr/sbin/mtools mtools
- Check_package chroot/sbin/parted parted
-
- case "${LIVE_BOOTLOADER}" in
- grub)
- Check_package chroot/usr/sbin/grub grub
- ;;
-
- syslinux)
- Check_package chroot/usr/bin/syslinux syslinux
- ;;
- esac
-
- # Installing depends
- Install_package
-
- # Remove old binary
- if [ -f binary.img ]
- then
- rm -f binary.img
- fi
-
- # Everything which comes here needs to be cleaned up,
- DU_DIM="`du -ms binary | cut -f1`"
- REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
- dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
- FREELO="`${LH_LOSETUP} -f`"
- if [ ! -b chroot/${FREELO} ]
- then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
- fi
-
- echo "!!! The following error/warning messages can be ignored !!!"
- lh_losetup $FREELO binary.img 0
- Chroot "parted -s ${FREELO} mklabel msdos" || true
- Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
- Chroot "parted -s ${FREELO} set 1 boot on" || true
- Chroot "parted -s ${FREELO} set 1 lba off" || true
-
- case "${LIVE_BOOTLOADER}" in
- grub)
- #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
-#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
-#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
-#
-#quit
-#EOF
- #rm -f binary/boot/grub/device.map
-
- #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
- ;;
-
- syslinux)
- cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
- ;;
- esac
-
- ${LH_LOSETUP} -d ${FREELO}
-
- FREELO="`${LH_LOSETUP} -f`"
- lh_losetup $FREELO binary.img 1
- Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
- mkdir -p binary.tmp
- ${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
- cp -r binary/* binary.tmp
- ${LH_ROOT_COMMAND} umount binary.tmp
- rmdir binary.tmp
-
- if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
- then
- Chroot "syslinux ${FREELO}"
- fi
-
- ${LH_LOSETUP} -d ${FREELO}
-
- #if [ "${LIVE_BOOTLOADER}" = "grub" ]
- #then
- # FREELO="`${LH_LOSETUP} -f`"
- # lh_losetup $FREELO binary.img 0
-
- # dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
- # dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
-
- # ${LH_LOSETUP} -d ${FREELO}
- #fi
- echo "!!! The above error/warning messages can be ignored !!!"
-
- if [ -n "${MAKEDEV}" ]
- then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
- fi
-
- # Removing depends
- Remove_package
-
- # Creating stage file
- Create_stagefile .stage/binary_usb
- fi
-done
Copied: dists/trunk/live-helper/helpers/lh_binary_usb-hdd (from rev 1175, dists/trunk/live-helper/helpers/lh_binary_usb)
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_usb 2007-04-25 19:32:58 UTC (rev 1175)
+++ dists/trunk/live-helper/helpers/lh_binary_usb-hdd 2007-04-26 09:26:57 UTC (rev 1178)
@@ -0,0 +1,157 @@
+#!/bin/sh
+
+# lh_binary_usb-hdd(1) - build binary image
+# Copyright (C) 2006-2007 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="build binary image"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
+Set_defaults
+
+Breakpoint "binary_usb-hdd: Init"
+
+for IMAGE in ${LIVE_BINARY_IMAGE}
+do
+ if [ "${IMAGE}" = "usb-hdd" ]
+ then
+ # Requiring stage file
+ Require_stagefile .stage/bootstrap
+ Require_stagefile .stage/chroot_proc
+
+ # Checking stage file
+ Check_stagefile .stage/binary_usb-hdd
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Checking depends
+ Check_package chroot/sbin/mkdosfs dosfstools
+ Check_package chroot/usr/sbin/mtools mtools
+ Check_package chroot/sbin/parted parted
+
+ case "${LIVE_BOOTLOADER}" in
+ grub)
+ Check_package chroot/usr/sbin/grub grub
+ ;;
+
+ syslinux)
+ Check_package chroot/usr/bin/syslinux syslinux
+ ;;
+ esac
+
+ # Installing depends
+ Install_package
+
+ # Remove old binary
+ if [ -f binary.img ]
+ then
+ rm -f binary.img
+ fi
+
+ # Everything which comes here needs to be cleaned up,
+ DU_DIM="`du -ms binary | cut -f1`"
+ REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+ dd if=/dev/zero of=binary.img bs=1024k count=${REAL_DIM}
+ FREELO="`${LH_LOSETUP} -f`"
+ if [ ! -b chroot/${FREELO} ]
+ then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+ fi
+
+ echo "!!! The following error/warning messages can be ignored !!!"
+ lh_losetup $FREELO binary.img 0
+ Chroot "parted -s ${FREELO} mklabel msdos" || true
+ Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+ Chroot "parted -s ${FREELO} set 1 boot on" || true
+ Chroot "parted -s ${FREELO} set 1 lba off" || true
+
+ case "${LIVE_BOOTLOADER}" in
+ grub)
+ #echo "(hd0) ${FREELO}" > binary/boot/grub/device.map
+#grub --batch --no-floppy --device-map=binary/boot/grub/device.map << EOF
+#setup --stage1=binary/boot/grub/stage1 --stage2=binary/boot/grub/stage2 --prefix=/boot/grub (hd0)
+#
+#quit
+#EOF
+ #rm -f binary/boot/grub/device.map
+
+ #Chroot "grub-install --no-floppy --root-directory=/ (hd0)"
+ ;;
+
+ syslinux)
+ cat chroot/usr/lib/syslinux/mbr.bin > ${FREELO}
+ ;;
+ esac
+
+ ${LH_LOSETUP} -d ${FREELO}
+
+ FREELO="`${LH_LOSETUP} -f`"
+ lh_losetup $FREELO binary.img 1
+ Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+ mkdir -p binary.tmp
+ ${LH_ROOT_COMMAND} mount ${FREELO} binary.tmp
+ cp -r binary/* binary.tmp
+ ${LH_ROOT_COMMAND} umount binary.tmp
+ rmdir binary.tmp
+
+ if [ "${LIVE_BOOTLOADER}" = "syslinux" ]
+ then
+ Chroot "syslinux ${FREELO}"
+ fi
+
+ ${LH_LOSETUP} -d ${FREELO}
+
+ #if [ "${LIVE_BOOTLOADER}" = "grub" ]
+ #then
+ # FREELO="`${LH_LOSETUP} -f`"
+ # lh_losetup $FREELO binary.img 0
+
+ # dd if=binary/boot/grub/stage1 of=${FREELO} bs=512 count=1
+ # dd if=binary/boot/grub/stage2 of=${FREELO} bs=512 seek=1
+
+ # ${LH_LOSETUP} -d ${FREELO}
+ #fi
+ echo "!!! The above error/warning messages can be ignored !!!"
+
+ if [ -n "${MAKEDEV}" ]
+ then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+ fi
+
+ # Removing depends
+ Remove_package
+
+ # Creating stage file
+ Create_stagefile .stage/binary_usb-hdd
+ fi
+done
Modified: dists/trunk/live-helper/helpers/lh_binary_yaboot
===================================================================
--- dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_binary_yaboot 2007-04-26 09:26:57 UTC (rev 1178)
@@ -80,7 +80,7 @@
DESTDIR="binary/live"
;;
- net|usb|hdd)
+ net|usb-hdd|hdd)
Echo_error "not supported, FIXME"
;;
esac
Modified: dists/trunk/live-helper/helpers/lh_config
===================================================================
--- dists/trunk/live-helper/helpers/lh_config 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_config 2007-04-26 09:26:57 UTC (rev 1178)
@@ -285,9 +285,9 @@
# (Default: ${LIVE_MEMTEST})
LIVE_MEMTEST="${LIVE_MEMTEST}"
-# \$LIVE_INSTALLER: set debian-installer
-# (Default: ${LIVE_INSTALLER})
-LIVE_INSTALLER="${LIVE_INSTALLER}"
+# \$LIVE_DEBIAN_INSTALLER: set debian-installer
+# (Default: ${LIVE_DEBIAN_INSTALLER})
+LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}"
# \$LIVE_ISO_VOLUME: set iso volume
# (Default: ${LIVE_ISO_VOLUME})
Modified: dists/trunk/live-helper/helpers/lh_source
===================================================================
--- dists/trunk/live-helper/helpers/lh_source 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_source 2007-04-26 09:26:57 UTC (rev 1178)
@@ -48,7 +48,7 @@
lh_source_hdd "${@}"
lh_source_iso "${@}"
lh_source_net "${@}"
-lh_source_usb "${@}"
+lh_source_usb-hdd "${@}"
# Deconfiguring chroot
rm -f .stage/chroot_sources
Deleted: dists/trunk/live-helper/helpers/lh_source_usb
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/lh_source_usb 2007-04-26 09:26:57 UTC (rev 1178)
@@ -1,112 +0,0 @@
-#!/bin/sh
-
-# lh_source_usb(1) - build source image
-# Copyright (C) 2006-2007 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
-
-# Source common functions
-for FUNCTION in /usr/share/live-helper/functions/*.sh
-do
- . ${FUNCTION}
-done
-
-# Set static variables
-DESCRIPTION="build source image"
-HELP=""
-USAGE="${PROGRAM} [--force]"
-
-Arguments "${@}"
-
-Echo_debug "Init ${PROGRAM}"
-
-# Reading configuration files
-Read_conffile config/bootstrap
-Read_conffile config/chroot
-Read_conffile config/common
-Read_conffile config/image
-Set_defaults
-
-Breakpoint "source_usb: Init"
-
-if [ "${LIVE_SOURCE}" != "enabled" ]
-then
- exit 0
-fi
-
-for IMAGE in ${LIVE_SOURCE_IMAGE}
-do
- if [ "${IMAGE}" = "usb" ]
- then
- # Requiring stage file
- Require_stagefile .stage/source_download
-
- # Checking stage file
- Check_stagefile .stage/source_usb
-
- # Checking lock file
- Check_lockfile .lock
-
- # Creating lock file
- Create_lockfile .lock
-
- # Checking depends
- Check_package chroot/sbin/mkdosfs dosfstools
- Check_package chroot/sbin/parted parted
-
- # Installing depends
- Install_package
-
- # Remove old source
- if [ -f source.img ]
- then
- rm -f source.img
- fi
-
- # Everything which comes here needs to be cleaned up,
- DU_DIM="`du -ms source | cut -f1`"
- REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
- dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
- FREELO="`${LH_LOSETUP} -f`"
- if [ ! -b chroot/${FREELO} ]
- then
- MAKEDEV="true"
-
- mv chroot/dev chroot/dev.tmp
- find /dev | cpio -dmpu chroot
- fi
-
- echo "!!! The following error/warning messages can be ignored !!!"
- lh_losetup $FREELO source.img 0
- Chroot "parted -s ${FREELO} mklabel msdos" || true
- Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
- Chroot "parted -s ${FREELO} set 1 lba off" || true
- ${LH_LOSETUP} -d ${FREELO}
-
- lh_losetup $FREELO source.img 1
- Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
- mkdir -p source.tmp
- ${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
- cp -r source/* source.tmp
- ${LH_ROOT_COMMAND} umount source.tmp
- rmdir source.tmp
- ${LH_LOSETUP} -d ${FREELO}
- echo "!!! The above error/warning messages can be ignored !!!"
-
- if [ -n "${MAKEDEV}" ]
- then
- rm -f chroot/dev
- mv chroot/dev.tmp chroot/dev
- fi
-
- # Removing depends
- Remove_package
-
- # Creating stage file
- Create_stagefile .stage/source_usb
- fi
-done
Copied: dists/trunk/live-helper/helpers/lh_source_usb-hdd (from rev 1175, dists/trunk/live-helper/helpers/lh_source_usb)
===================================================================
--- dists/trunk/live-helper/helpers/lh_source_usb 2007-04-25 19:32:58 UTC (rev 1175)
+++ dists/trunk/live-helper/helpers/lh_source_usb-hdd 2007-04-26 09:26:57 UTC (rev 1178)
@@ -0,0 +1,112 @@
+#!/bin/sh
+
+# lh_source_usb-hdd(1) - build source image
+# Copyright (C) 2006-2007 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
+
+# Source common functions
+for FUNCTION in /usr/share/live-helper/functions/*.sh
+do
+ . ${FUNCTION}
+done
+
+# Set static variables
+DESCRIPTION="build source image"
+HELP=""
+USAGE="${PROGRAM} [--force]"
+
+Arguments "${@}"
+
+Echo_debug "Init ${PROGRAM}"
+
+# Reading configuration files
+Read_conffile config/bootstrap
+Read_conffile config/chroot
+Read_conffile config/common
+Read_conffile config/image
+Set_defaults
+
+Breakpoint "source_usb-hdd: Init"
+
+if [ "${LIVE_SOURCE}" != "enabled" ]
+then
+ exit 0
+fi
+
+for IMAGE in ${LIVE_SOURCE_IMAGE}
+do
+ if [ "${IMAGE}" = "usb-hdd" ]
+ then
+ # Requiring stage file
+ Require_stagefile .stage/source_download
+
+ # Checking stage file
+ Check_stagefile .stage/source_usb-hdd
+
+ # Checking lock file
+ Check_lockfile .lock
+
+ # Creating lock file
+ Create_lockfile .lock
+
+ # Checking depends
+ Check_package chroot/sbin/mkdosfs dosfstools
+ Check_package chroot/sbin/parted parted
+
+ # Installing depends
+ Install_package
+
+ # Remove old source
+ if [ -f source.img ]
+ then
+ rm -f source.img
+ fi
+
+ # Everything which comes here needs to be cleaned up,
+ DU_DIM="`du -ms source | cut -f1`"
+ REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here...
+ dd if=/dev/zero of=source.img bs=1024k count=${REAL_DIM}
+ FREELO="`${LH_LOSETUP} -f`"
+ if [ ! -b chroot/${FREELO} ]
+ then
+ MAKEDEV="true"
+
+ mv chroot/dev chroot/dev.tmp
+ find /dev | cpio -dmpu chroot
+ fi
+
+ echo "!!! The following error/warning messages can be ignored !!!"
+ lh_losetup $FREELO source.img 0
+ Chroot "parted -s ${FREELO} mklabel msdos" || true
+ Chroot "parted -s ${FREELO} mkpartfs primary fat16 0.0 100%" || true
+ Chroot "parted -s ${FREELO} set 1 lba off" || true
+ ${LH_LOSETUP} -d ${FREELO}
+
+ lh_losetup $FREELO source.img 1
+ Chroot " mkfs.vfat -F 16 -n DEBIAN_LIVE ${FREELO}"
+ mkdir -p source.tmp
+ ${LH_ROOT_COMMAND} mount ${FREELO} source.tmp
+ cp -r source/* source.tmp
+ ${LH_ROOT_COMMAND} umount source.tmp
+ rmdir source.tmp
+ ${LH_LOSETUP} -d ${FREELO}
+ echo "!!! The above error/warning messages can be ignored !!!"
+
+ if [ -n "${MAKEDEV}" ]
+ then
+ rm -f chroot/dev
+ mv chroot/dev.tmp chroot/dev
+ fi
+
+ # Removing depends
+ Remove_package
+
+ # Creating stage file
+ Create_stagefile .stage/source_usb-hdd
+ fi
+done
Modified: dists/trunk/live-helper/helpers/make-live
===================================================================
--- dists/trunk/live-helper/helpers/make-live 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/helpers/make-live 2007-04-26 09:26:57 UTC (rev 1178)
@@ -31,7 +31,7 @@
# Set 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] [--apt-generic 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-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-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 KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb|net] [-s|--source-image generic|hdd|iso|usb|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] [--apt-generic 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-build URL] [--mirror-build-security URL] [--mirror-image URL] [--mirror-image-security URL] [--sections SECTION|\"SECTIONS\"] [--interactive shell|x11|xnest] [-k|--kernel-flavour FLAVOUR] [--kernel-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 KERNEL_PARAMETER|\"KERNEL_PARAMETERS\"] [-e|--encryption ALGORITHM] [--username NAME] [--hostname NAME] [--filesystem ext2|plain|squashfs] [--memtest memtest86|memtest86+] [--iso-volume STRING] [--server-address HOSTNAME|IP] [--server-path DIRECTORY] [--source enabled|disabled] [--bootloader grub|syslinux] [--grub-splash FILE] [--syslinux-splash FILE] [-b|--binary-image hdd|iso|usb-hdd|net] [-s|--source-image generic|hdd|iso|usb-hdd|net] [--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"
Modified: dists/trunk/live-helper/manpages/lh_binary.1.de
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.1.de 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/lh_binary.1.de 2007-04-26 09:26:57 UTC (rev 1178)
@@ -13,6 +13,8 @@
Hier ist eine vollst\[:a]ndige Liste aller verf\[:u]gbaren binary\-Helper Kommandos. Siehe deren Hilfeseiten f\[:u]r zus\[:a]tzliche Dokumentation.
.IP "\fIlh_binary_chroot\fR(1)" 4
kopiert chroot in chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+kopiert debian\-installer in das Binary\-Image.
.IP "\fIlh_binary_encryption\fR(1)" 4
verschl\[:u]sselt das Root\-Dateisystem.
.IP "\fIlh_binary_grub\fR(1)" 4
@@ -21,8 +23,6 @@
erstellt den Festplatten Binary\-Tarball.
.IP "\fIlh_binary_includes\fR(1)" 4
kopiert Dateien in das Binary\-Image.
-.IP "\fIlh_binary_installer\fR(1)" 4
-kopiert debian\-installer in das Binary\-Image.
.IP "\fIlh_binary_iso\fR(1)" 4
erstell das CD/DVD Binary\-Image.
.IP "\fIlh_binary_linuximage\fR(1)" 4
@@ -41,8 +41,8 @@
erstell das Root\-Dateisystem.
.IP "\fIlh_binary_syslinux\fR(1)" 4
kopiert syslinux in das Binary\-Image.
-.IP "\fIlh_binary_usb\fR(1)" 4
-erstellt das USB Binary\-Image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+erstellt das USB-hdd Binary\-Image.
.IP "\fIlh_binary_yaboot\fR(1)" 4
kopiert yaboot in das Binary\-Image.
Modified: dists/trunk/live-helper/manpages/lh_binary.1.en
===================================================================
--- dists/trunk/live-helper/manpages/lh_binary.1.en 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/lh_binary.1.en 2007-04-26 09:26:57 UTC (rev 1178)
@@ -13,6 +13,8 @@
Here is the complete list of available binary helper commands. See their man pages for additional documentation.
.IP "\fIlh_binary_chroot\fR(1)" 4
copies chroot into chroot.
+.IP "\fIlh_binary_debian-installer\fR(1)" 4
+copies debian-installer into the binary image.
.IP "\fIlh_binary_encryption\fR(1)" 4
encrypts the root filesystem.
.IP "\fIlh_binary_grub\fR(1)" 4
@@ -21,8 +23,6 @@
creates the harddisk binary tarball.
.IP "\fIlh_binary_includes\fR(1)" 4
copies files into the binary image.
-.IP "\fIlh_binary_installer\fR(1)" 4
-copies debian-installer into the binary image.
.IP "\fIlh_binary_iso\fR(1)" 4
creates the CD/DVD binary image.
.IP "\fIlh_binary_linuximage\fR(1)" 4
@@ -41,8 +41,8 @@
creates the root filesystem.
.IP "\fIlh_binary_syslinux\fR(1)" 4
copies syslinux into the binary image.
-.IP "\fIlh_binary_usb\fR(1)" 4
-creates the USB binary image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+creates the USB-hdd binary image.
.IP "\fIlh_binary_yaboot\fR(1)" 4
copies yaboot into the binary image.
Modified: dists/trunk/live-helper/manpages/lh_source.1.de
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.1.de 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/lh_source.1.de 2007-04-26 09:26:57 UTC (rev 1178)
@@ -25,8 +25,8 @@
erstellt md5sum.txt im Source-Image.
.IP "\fIlh_source_net\fR(1)" 4
erstellt Netboot Source-Tarball.
-.IP "\fIlh_source_usb\fR(1)" 4
-erstellt USB Source-Tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+erstellt USB-hdd Source-Tarball.
.SH SIEHE AUCH
\fIlive\-helper\fR(7)
Modified: dists/trunk/live-helper/manpages/lh_source.1.en
===================================================================
--- dists/trunk/live-helper/manpages/lh_source.1.en 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/lh_source.1.en 2007-04-26 09:26:57 UTC (rev 1178)
@@ -25,8 +25,8 @@
creates md5sum.txt in the source image.
.IP "\fIlh_source_net\fR(1)" 4
creates the netboot source tarball.
-.IP "\fIlh_source_usb\fR(1)" 4
-creates the USB source image.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+creates the USB-hdd source image.
.SH SEE ALSO
\fIlive\-helper\fR(7)
Modified: dists/trunk/live-helper/manpages/live-helper.7.de
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.7.de 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/live-helper.7.de 2007-04-26 09:26:57 UTC (rev 1178)
@@ -29,6 +29,8 @@
Meta\-Helper f\[:u]r lh_binary_*
.IP "\fIlh_binary_chroot\fR(1)" 4
kopiert chroot in chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+kopiert debian-\installer in das Binary\-Image.
.IP "\fIlh_binary_encryption\fR(1)" 4
verschl\[:u]sselt das Root\-Dateisystem.
.IP "\fIlh_binary_grub\fR(1)" 4
@@ -37,8 +39,6 @@
erstellt den Festplatten Binary\-Tarball.
.IP "\fIlh_binary_includes\fR(1)" 4
kopiert Dateien in das Binary\-Image.
-.IP "\fIlh_binary_installer\fR(1)" 4
-kopiert debian-\installer in das Binary\-Image.
.IP "\fIlh_binary_iso\fR(1)" 4
erstell das CD/DVD Binary\-Image.
.IP "\fIlh_binary_linuximage\fR(1)" 4
@@ -57,8 +57,8 @@
erstell das Root\-Dateisystem.
.IP "\fIlh_binary_syslinux\fR(1)" 4
kopiert syslinux in das Binary\-Image.
-.IP "\fIlh_binary_usb\fR(1)" 4
-erstellt das USB Binary\-Image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+erstellt das USB-hdd Binary\-Image.
.IP "\fIlh_binary_yaboot\fR(1)" 4
kopiert yaboot in das Binary\-Image.
.IP "\fIlh_bootstrap\fR(1)" 4
@@ -137,8 +137,8 @@
erstellt md5sum.txt im Source-Image.
.IP "\fIlh_source_net\fR(1)" 4
erstellt Netboot Source-Tarball.
-.IP "\fIlh_source_usb\fR(1)" 4
-erstellt USB Source-Tarball.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+erstellt USB-hdd Source-Tarball.
.IP "\fIlh_testroot\fR(1)" 4
stellt sicher dass das System als root gebaut wird.
Modified: dists/trunk/live-helper/manpages/live-helper.7.en
===================================================================
--- dists/trunk/live-helper/manpages/live-helper.7.en 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/live-helper.7.en 2007-04-26 09:26:57 UTC (rev 1178)
@@ -29,6 +29,8 @@
meta\-helper for lh_binary_*.
.IP "\fIlh_binary_chroot\fR(1)" 4
copies chroot into chroot.
+.IP "\fIlh_binary_debian\-installer\fR(1)" 4
+copies debian-installer into the binary image.
.IP "\fIlh_binary_encryption\fR(1)" 4
encrypts the root filesystem.
.IP "\fIlh_binary_grub\fR(1)" 4
@@ -37,8 +39,6 @@
creates the harddisk binary tarball.
.IP "\fIlh_binary_includes\fR(1)" 4
copies files into the binary image.
-.IP "\fIlh_binary_installer\fR(1)" 4
-copies debian-installer into the binary image.
.IP "\fIlh_binary_iso\fR(1)" 4
creates the CD/DVD binary image.
.IP "\fIlh_binary_linuximage\fR(1)" 4
@@ -57,8 +57,8 @@
creates the root filesystem.
.IP "\fIlh_binary_syslinux\fR(1)" 4
copies syslinux into the binary image.
-.IP "\fIlh_binary_usb\fR(1)" 4
-creates the USB binary image.
+.IP "\fIlh_binary_usb-hdd\fR(1)" 4
+creates the USB-hdd binary image.
.IP "\fIlh_binary_yaboot\fR(1)" 4
copies yaboot into the binary image.
.IP "\fIlh_bootstrap\fR(1)" 4
@@ -135,8 +135,8 @@
creates CD/DVD source image.
.IP "\fIlh_source_net\fR(1)" 4
creates netboot source tarball.
-.IP "\fIlh_source_usb\fR(1)" 4
-creates USB source image.
+.IP "\fIlh_source_usb-hdd\fR(1)" 4
+creates USB-hdd source image.
.IP "\fIlh_testroot\fR(1)" 4
checks for root privileges.
Modified: dists/trunk/live-helper/manpages/make-live.1.de
===================================================================
--- dists/trunk/live-helper/manpages/make-live.1.de 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/make-live.1.de 2007-04-26 09:26:57 UTC (rev 1178)
@@ -58,8 +58,8 @@
[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
[\-\-grub\-splash \fIFILE\fR]
[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
[\-\-includes \fIPATH\fR]
[\-\-templates \fIPATH\fR]
[\-\-breakpoints]
Modified: dists/trunk/live-helper/manpages/make-live.1.en
===================================================================
--- dists/trunk/live-helper/manpages/make-live.1.en 2007-04-25 20:52:44 UTC (rev 1177)
+++ dists/trunk/live-helper/manpages/make-live.1.en 2007-04-26 09:26:57 UTC (rev 1178)
@@ -58,8 +58,8 @@
[\-\-bootloader \fIgrub\fR|\fIsyslinux\fR]
[\-\-grub\-splash \fIFILE\fR]
[\-\-syslinux\-splash \fIFILE\fR]
-[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
-[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb\fR|\fInet\fR]
+[\-b|\-\-binary\-image \fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
+[\-s|\-\-source\-image \fIgeneric\fR|\fIhdd\fR|\fIiso\fR|\fIusb-hdd\fR|\fInet\fR]
[\-\-includes \fIPATH\fR]
[\-\-templates \fIPATH\fR]
[\-\-breakpoints]
More information about the Debian-live-changes
mailing list