diff options
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary_iso | 22 | ||||
| -rwxr-xr-x | helpers/lh_chroot_hooks | 2 | ||||
| -rwxr-xr-x | helpers/lh_chroot_packages | 2 | ||||
| -rwxr-xr-x | helpers/lh_chroot_packageslists | 2 | ||||
| -rwxr-xr-x | helpers/lh_chroot_tasks | 2 | ||||
| -rwxr-xr-x | helpers/lh_config | 262 | ||||
| -rwxr-xr-x | helpers/lh_source_iso | 28 | ||||
| -rwxr-xr-x | helpers/make-live | 16 |
8 files changed, 199 insertions, 137 deletions
diff --git a/helpers/lh_binary_iso b/helpers/lh_binary_iso index 2f9fc2e..0bea7e3 100755 --- a/helpers/lh_binary_iso +++ b/helpers/lh_binary_iso @@ -67,6 +67,26 @@ do GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" fi + if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\"" + fi + + if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\"" + fi + + if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\"" + fi + + if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\"" + fi + # Moving image mv binary chroot @@ -102,7 +122,7 @@ do fi cat >> chroot/binary.sh << EOF -${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o binary.iso -r -J -l -cache-inodes binary +${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o binary.iso -r -J -l -cache-inodes binary EOF Chroot "sh binary.sh" diff --git a/helpers/lh_chroot_hooks b/helpers/lh_chroot_hooks index 3f874e6..8f5c988 100755 --- a/helpers/lh_chroot_hooks +++ b/helpers/lh_chroot_hooks @@ -71,7 +71,7 @@ do fi done -if [ -n "${LIVE_HOOKS}" ] +if [ -n "${LIVE_HOOKS}" ] && [ "${LIVE_HOOKS}" != "none" ] then LIVE_DEBCONF_FRONTEND="readline" LIVE_DEBCONF_PRIORITY="low" LIVE_DEBCONF_NOWARNINGS="no" Chroot "${LIVE_HOOKS}" fi diff --git a/helpers/lh_chroot_packages b/helpers/lh_chroot_packages index 5721959..e94cdda 100755 --- a/helpers/lh_chroot_packages +++ b/helpers/lh_chroot_packages @@ -46,7 +46,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ -n "${LIVE_PACKAGES}" ] +if [ -n "${LIVE_PACKAGES}" ] && [ "${LIVE_PACKAGES}" != "none" ] then # Restoring cache Restore_cache cache/packages_packages diff --git a/helpers/lh_chroot_packageslists b/helpers/lh_chroot_packageslists index fc915f4..d1d9a13 100755 --- a/helpers/lh_chroot_packageslists +++ b/helpers/lh_chroot_packageslists @@ -46,7 +46,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ -n "${LIVE_PACKAGES_LISTS}" ] +if [ -n "${LIVE_PACKAGES_LISTS}" ] && [ "${LIVE_PACKAGES_LISTS}" != "none" ] then # Restoring cache Restore_cache cache/packages_packageslists diff --git a/helpers/lh_chroot_tasks b/helpers/lh_chroot_tasks index 0e096d4..9b6da5b 100755 --- a/helpers/lh_chroot_tasks +++ b/helpers/lh_chroot_tasks @@ -46,7 +46,7 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ -n "${LIVE_TASKS}" ] +if [ -n "${LIVE_TASKS}" ] && [ "${LIVE_TASKS}" != "none" ] then # Restoring cache Restore_cache cache/packages_tasks diff --git a/helpers/lh_config b/helpers/lh_config index 5477dd0..7020536 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -55,18 +55,14 @@ Set_defaults Breakpoint "config: Init" -# Creating configuration directory +# Creating bootstrap configuration mkdir -p "${LIVE_ROOT}"/config mkdir -p "${LIVE_ROOT}"/config/includes mkdir -p "${LIVE_ROOT}"/config/templates # Creating live-helper configuration cat > "${LIVE_ROOT}"/config/common << EOF -# config/common: configuration for live-helper(7) - -# \$LH_MODE: set distribution mode -# (Default: ${LH_MODE}) -LH_MODE="${LH_MODE}" +# config/common - common options for live-helper(7) # \$LH_APT: set package manager # (Default: ${LH_APT}) @@ -84,59 +80,67 @@ LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" # (Default: ${LH_APT_PDIFFS}) LH_APT_PDIFFS="${LH_APT_PDIFFS}" -# \$LH_APT_RECOMMENDS: enable recommends +# \$LH_APT_RECOMMENDS: set apt/aptitude recommends # (Default: ${LH_APT_RECOMMENDS}) LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" -# \$LH_APT_SECURE: enable secure +# \$LH_APT_SECURE: set apt/aptitude security # (Default: ${LH_APT_SECURE}) LH_APT_SECURE="${LH_APT_SECURE}" -# \$LH_BOOTSTRAP: select the bootstrap program +# \$LH_BOOTSTRAP: set bootstrap program # (Default: ${LH_BOOTSTRAP}) LH_BOOTSTRAP="${LH_BOOTSTRAP}" -# \$LH_CACHE_INDICES: control if downloaded packages should be cached +# \$LH_CACHE_INDICES: control if downloaded package indices should be cached # (Default: ${LH_CACHE_INDICES}) LH_CACHE_INDICES="${LH_CACHE_INDICES}" -# \$LH_CACHE_PACKAGES: control if downloaded packages should be cached +# \$LH_CACHE_PACKAGES: control if downloaded packages files should be cached # (Default: ${LH_CACHE_PACKAGES}) LH_CACHE_PACKAGES="${LH_CACHE_PACKAGES}" -# \$LH_CACHE_STAGES: control if downloaded packages should be cached +# \$LH_CACHE_STAGES: control if completed stages should be cached # (Default: ${LH_CACHE_STAGES}) LH_CACHE_STAGES="${LH_CACHE_STAGES}" -# \$LH_DEBCONF_FRONTEND: set the debconf(1) frontend to use +# \$LH_DEBCONF_FRONTEND: set debconf(1) frontend to use # (Default: ${LH_DEBCONF_FRONTEND}) LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" -# \$LH_DEBCONF_PRIORITY: set the debconf(1) priority to use -# (Default: ${LH_DEBCONF_PRIORITY}) -LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" - # \$LH_DEBCONF_NOWARNINGS: set debconf(1) warnings # (Default: ${LH_DEBCONF_NOWARNINGS}) LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" -# \$LH_GENISOIMAGE: set the genisoimage program +# \$LH_DEBCONF_PRIORITY: set debconf(1) priority to use +# (Default: ${LH_DEBCONF_PRIORITY}) +LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" + +# \$LH_GENISOIMAGE: set genisoimage program # (Default: ${LH_GENISOIMAGE}) LH_GENISOIMAGE="${LH_GENISOIMAGE}" -# \$LH_LOSETUP: set the losetup program +# \$LH_INITRAMFS: set initramfs hook +# (Default: ${LH_INITRAMFS}) +LH_INITRAMFS="${LH_INITRAMFS}" + +# \$LH_LOSETUP: set losetup program # (Default: autodetected) LH_LOSETUP="${LH_LOSETUP}" -# \$LH_TASKSEL: set the tasksel program +# \$LH_MODE: set distribution mode +# (Default: ${LH_MODE}) +LH_MODE="${LH_MODE}" + +# \$LH_ROOT_COMMAND: use sudo or equivalent +# (Default: empty) +#LH_ROOT_COMMAND="sudo" + +# \$LH_TASKSEL: set tasksel program # (Default: ${LH_TASKSEL}) LH_TASKSEL="${LH_TASKSEL}" -# \$LH_INITRAMFS: set the initramfs generator -# (Default: ${LH_INITRAMFS}) -LH_INITRAMFS="${LH_INITRAMFS}" - -# \$LIVE_ROOT: set the root directory +# \$LIVE_ROOT: set root directory # (Default: ${LIVE_ROOT}) LIVE_ROOT="${LIVE_ROOT}" @@ -150,10 +154,6 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}" # Live-helper options -# \$LH_ROOT_COMMAND: use sudo or equivalent -# (Default: empty) -#LH_ROOT_COMMAND="sudo" - # \$LH_BREAKPOINTS: enable breakpoints # (Default: ${LH_BREAKPOINTS}) #LH_BREAKPOINTS="${LH_BREAKPOINTS}" @@ -175,47 +175,94 @@ LIVE_TEMPLATES="${LIVE_TEMPLATES}" #LH_VERBOSE="${LH_VERBOSE}" EOF +# Creating lh_bootstrap_* configuration +cat > "${LIVE_ROOT}"/config/bootstrap << EOF +# config/bootstrap - options for live-helper(7), bootstrap stage + +# \$LIVE_ARCHITECTURE: select chroot architecture +# (Default: autodetected) +LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" + +# \$LIVE_DISTRIBUTION: select distribution to use +# (Default: ${LIVE_DISTRIBUTION}) +LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" + +# \$LIVE_DISTRIBUTION_CONFIG: set distribution config directory +# (Default: empty) +LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" + +# \$LIVE_BOOTSTRAP_FLAVOUR: select flavour to use +# (Default: ${LIVE_BOOTSTRAP_FLAVOUR}) +LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" + +# \$LIVE_MIRROR_BOOTSTRAP: set mirror to fetch packages from +# (Default: ${LIVE_MIRROR_BOOTSTRAP}) +LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" + +# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set security mirror to fetch packages from +# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY}) +LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" + +# \$LIVE_MIRROR_BINARY: set mirror which ends up in the image +# (Default: ${LIVE_MIRROR_BINARY}) +LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" + +# \$LIVE_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image +# (Default: ${LIVE_MIRROR_BINARY_SECURITY}) +LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" + +# \$LIVE_SECTIONS: select section(s) to use +# (Default: ${LIVE_SECTIONS}) +LIVE_SECTIONS="${LIVE_SECTIONS}" +EOF + # Creating lh_chroot_* configuration +mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks +mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes +mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages +mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists +mkdir -p "${LIVE_ROOT}"/config/chroot_sources + cat > "${LIVE_ROOT}"/config/chroot << EOF -# config/chroot: configuration for lh_chroot_* +# config/chroot - options for live-helper(7), chroot stage # \$LIVE_CHROOT_FILESYSTEM: set chroot filesystem # (Default: ${LIVE_CHROOT_FILESYSTEM}) LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" +# \$LIVE_HOOKS: set hook commands +# (Default: empty) +LIVE_HOOKS="${LIVE_HOOKS}" + # \$LIVE_INTERACTIVE: set interactive build # (Default: ${LIVE_INTERACTIVE}) LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" -# \$LIVE_LINUX_FLAVOURS: set the kernel flavour to use -# (Default: autodetected) -LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" - -# \$LIVE_LINUX_PACKAGES: set the kernel packages to use -# (Default: autodetected) -LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" - -# \$LIVE_KEYRING_PACKAGES: set the keyring packages +# \$LIVE_KEYRING_PACKAGES: set keyring packages # (Default: empty) LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" -# \$LIVE_HOOKS: set hook commands -# (Default: empty) -LIVE_HOOKS="${LIVE_HOOKS}" - -# \$LIVE_LANGUAGE: set the language to use +# \$LIVE_LANGUAGE: set language to use # (Default: empty) LIVE_LANGUAGE="${LIVE_LANGUAGE}" -# \$LIVE_PACKAGES: set the packages to install +# \$LIVE_LINUX_FLAVOURS: set kernel flavour to use +# (Default: autodetected) +LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" + +# \$LIVE_LINUX_PACKAGES: set kernel packages to use +# (Default: autodetected) +LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" + +# \$LIVE_PACKAGES: set packages to install # (Default: empty) LIVE_PACKAGES="${LIVE_PACKAGES}" -# \$LIVE_PACKAGES_LISTS: set the package list to install +# \$LIVE_PACKAGES_LISTS: set package list to install # (Default: ${LIVE_PACKAGES_LISTS}) LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" -# \$LIVE_TASKS: set the tasks to install +# \$LIVE_TASKS: set tasks to install # (Default: empty) LIVE_TASKS="${LIVE_TASKS}" @@ -232,57 +279,17 @@ LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" EOF -# Creating lh_chroot_* directories -mkdir -p "${LIVE_ROOT}"/config/chroot_local-hooks -mkdir -p "${LIVE_ROOT}"/config/chroot_local-includes -mkdir -p "${LIVE_ROOT}"/config/chroot_local-packages -mkdir -p "${LIVE_ROOT}"/config/chroot_local-packageslists -mkdir -p "${LIVE_ROOT}"/config/chroot_sources - -# Creating lh_bootstrap_* configuration -cat > "${LIVE_ROOT}"/config/bootstrap << EOF -# config/bootstrap: configuration for lh_bootstrap_* - -# \$LIVE_ARCHITECTURE: select the chroot architecture -# (Default: autodetected) -LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" - -# \$LIVE_DISTRIBUTION: select the distribution to use -# (Default: ${LIVE_DISTRIBUTION}) -LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" - -# \$LIVE_DISTRIBUTION_CONFIG: set distribution config directory -# (Default: empty) -LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" - -# \$LIVE_BOOTSTRAP_FLAVOUR: select the flavour to use -# (Default: ${LIVE_BOOTSTRAP_FLAVOUR}) -LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" - -# \$LIVE_MIRROR_BOOTSTRAP: set the mirror to fetch packages from -# (Default: ${LIVE_MIRROR_BOOTSTRAP}) -LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" - -# \$LIVE_MIRROR_BOOTSTRAP_SECURITY: set the security mirror to fetch packages from -# (Default: ${LIVE_MIRROR_BOOTSTRAP_SECURITY}) -LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" - -# \$LIVE_MIRROR_BINARY: set the mirror which ends up in the image -# (Default: ${LIVE_MIRROR_BINARY}) -LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" - -# \$LIVE_MIRROR_BINARY_SECURITY: set the security mirror which ends up in the image -# (Default: ${LIVE_MIRROR_BINARY_SECURITY}) -LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" - -# \$LIVE_SECTIONS: select the section(s) to use -# (Default: ${LIVE_SECTIONS}) -LIVE_SECTIONS="${LIVE_SECTIONS}" -EOF - # Creating lh_binary_* configuration +mkdir -p "${LIVE_ROOT}"/config/binary_grub +mkdir -p "${LIVE_ROOT}"/config/binary_local-includes +mkdir -p "${LIVE_ROOT}"/config/binary_syslinux + cat > "${LIVE_ROOT}"/config/binary << EOF -# config/chroot: configuration for lh_binary_* +# config/binary - options for live-helper(7), binary stage + +# \$LIVE_BINARY_IMAGES: set image type +# (Default: ${LIVE_BINARY_IMAGES}) +LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" # \$LIVE_BINARY_INDICES: set apt/aptitude generic indices # (Default: ${LIVE_BINARY_INDICES}) @@ -292,69 +299,72 @@ LIVE_BINARY_INDICES="${LIVE_BINARY_INDICES}" # (Default: empty) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" +# \$LIVE_BOOTLOADER: set bootloader +# (Default: ${LIVE_BOOTLOADER}) +LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" + +# \$LIVE_DEBIAN_INSTALLER: set debian-installer +# (Default: ${LIVE_DEBIAN_INSTALLER}) +LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}" + # \$LIVE_ENCRYPTION: set encrytion # (Default: empty) LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" -# \$LIVE_USERNAME: set username -# (Default: ${LIVE_USERNAME}) -LIVE_USERNAME="${LIVE_USERNAME}" +# \$LIVE_GRUB_SPLASH: set custom grub splash +# (Default: empty) +LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" # \$LIVE_HOSTNAME: set hostname # (Default: ${LIVE_HOSTNAME}) LIVE_HOSTNAME="${LIVE_HOSTNAME}" -# \$LIVE_MEMTEST: set memtest -# (Default: ${LIVE_MEMTEST}) -LIVE_MEMTEST="${LIVE_MEMTEST}" +# \$LIVE_ISO_APPLICATION: set iso author +# (Default: ${LIVE_ISO_APPLICATION}) +LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" -# \$LIVE_DEBIAN_INSTALLER: set debian-installer -# (Default: ${LIVE_DEBIAN_INSTALLER}) -LIVE_DEBIAN_INSTALLER="${LIVE_DEBIAN_INSTALLER}" +# \$LIVE_ISO_PREPARER: set iso preparer +# (Default: ${LIVE_ISO_PREPARER}) +LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" + +# \$LIVE_ISO_PUBLISHER: set iso preparer +# (Default: ${LIVE_ISO_PUBLISHER}) +LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" # \$LIVE_ISO_VOLUME: set iso volume # (Default: ${LIVE_ISO_VOLUME}) LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" -# \$LIVE_NET_SERVER: set the netboot server address -# (Default: ${LIVE_NET_SERVER}) -LIVE_NET_SERVER="${LIVE_NET_SERVER}" +# \$LIVE_MEMTEST: set memtest +# (Default: ${LIVE_MEMTEST}) +LIVE_MEMTEST="${LIVE_MEMTEST}" -# \$LIVE_NET_PATH: set the netboot server directory +# \$LIVE_NET_PATH: set netboot server directory # (Default: ${LIVE_NET_PATH}) LIVE_NET_PATH="${LIVE_NET_PATH}" -# \$LIVE_BOOTLOADER: set bootloader -# (Default: ${LIVE_BOOTLOADER}) -LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" - -# \$LIVE_GRUB_SPLASH: set custom grub splash -# (Default: empty) -LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" +# \$LIVE_NET_SERVER: set netboot server address +# (Default: ${LIVE_NET_SERVER}) +LIVE_NET_SERVER="${LIVE_NET_SERVER}" # \$LIVE_SYSLINUX_SPLASH: set custom syslinux splash # (Default: empty) LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" -# \$LIVE_BINARY_IMAGES: set image type -# (Default: ${LIVE_BINARY_IMAGES}) -LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" +# \$LIVE_USERNAME: set username +# (Default: ${LIVE_USERNAME}) +LIVE_USERNAME="${LIVE_USERNAME}" EOF # Creating lh_source_* configuration cat > "${LIVE_ROOT}"/config/source << EOF -# config/chroot: configuration for lh_source_* +# config/source - options for live-helper(7), source stage # \$LIVE_SOURCE: set source option -# (Default: ${LH_SOURCE}) +# (Default: ${LIVE_SOURCE}) LIVE_SOURCE="${LIVE_SOURCE}" # \$LIVE_SOURCE_IMAGES: set image type # (Default: ${LIVE_SOURCE_IMAGES}) LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" EOF - -# Creating lh_binary_* directories -mkdir -p "${LIVE_ROOT}"/config/binary_grub -mkdir -p "${LIVE_ROOT}"/config/binary_local-includes -mkdir -p "${LIVE_ROOT}"/config/binary_syslinux diff --git a/helpers/lh_source_iso b/helpers/lh_source_iso index 0784747..426fac7 100755 --- a/helpers/lh_source_iso +++ b/helpers/lh_source_iso @@ -1,6 +1,6 @@ #!/bin/sh -# lh_source_iso(1) - build source iso image +# lh_source_iso(1) - build iso source image # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -16,7 +16,7 @@ do done # Set static variables -DESCRIPTION="build source iso image" +DESCRIPTION="build iso source image" HELP="" USAGE="${PROGRAM} [--force]" @@ -61,7 +61,7 @@ do # Installing depends Install_package - # Remove old source + # Remove old iso image if [ -f source.iso ] then rm -f source.iso @@ -72,11 +72,31 @@ do GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -v" fi + if [ -n "${LIVE_ISO_APPLICATION}" ] && [ "${LIVE_ISO_APPLICATION}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -A \"${LIVE_ISO_APPLICATION}\"" + fi + + if [ -n "${LIVE_ISO_PREPARER}" ] && [ "${LIVE_ISO_PREPARER}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -p \"${LIVE_ISO_PREPARER}\"" + fi + + if [ -n "${LIVE_ISO_PUBLISHER}" ] && [ "${LIVE_ISO_PUBLISHER}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -publisher \"${LIVE_ISO_PUBLISHER}\"" + fi + + if [ -n "${LIVE_ISO_VOLUME}" ] && [ "${LIVE_ISO_VOLUME}" != "none" ] + then + GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -V \"${LIVE_ISO_VOLUME}\"" + fi + # Moving image mv source chroot cat >> chroot/source.sh << EOF -${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -A "Debian Live" -p "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -publisher "Debian Live; http://debian-live.alioth.debian.org/; debian-live-devel@lists.alioth.debian.org" -V "${LIVE_ISO_VOLUME}" -o source.iso -r -J -l -cache-inodes source +${LH_GENISOIMAGE} ${GENISOIMAGE_OPTIONS} -o source.iso -r -J -l -cache-inodes source EOF Chroot "sh source.sh" diff --git a/helpers/make-live b/helpers/make-live index 65fd20a..d4ad57a 100755 --- a/helpers/make-live +++ b/helpers/make-live @@ -37,7 +37,7 @@ HELP="Lists: gnome, gnome-core, gnome-desktop, gnome-full, gnome-junior, gnustep Local_arguments () { - ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" + ARGUMENTS="`getopt --longoptions mode:,config:,apt:,apt-ftpproxy:,apt-httpproxy:,binary-indices:,apt-pdiffs:,apt-recommends:,apt-secure:,bootstrap:,cache:,debconf-frontend:,debconf-priority:,debconf-nowarnings:,genisoimage:,losetup:,tasksel:,root:,architecture:,distribution:,distribution-config:,flavour:,mirror-bootstrap:,mirror-bootstrap-security:,mirror-binary:,mirror-binary-security:,sections:,interactive:,kernel:,kernel-packages:,keyring-packages:,hooks:,language:,packages:,packages-lists:,tasks:,security:,symlinks:,sysvinit:,bootappend:,encryption:,username:,hostname:,chroot-filesystem:,memtest:,iso-application:,iso-preparer:,iso-publisher:,iso-volume:,server-address:,server-path:,source:,bootloader:,grub-splash:,syslinux-splash:,binary-images:,binary-source:,includes:,templates:,help,usage,version,force,breakpoints,debug,quiet,verbose,root-command:,initramfs: --name=${PROGRAM} --options r:a:d:f:m:k:l:p:e:b:s:huv --shell sh -- "${@}"`" if [ "${?}" != "0" ] then @@ -248,6 +248,18 @@ Local_arguments () LIVE_MEMTEST="${2}"; shift 2 ;; + --iso-application) + LIVE_ISO_APPLICATION="${2}"; shift 2 + ;; + + --iso-preparer) + LIVE_ISO_PREPARER="${2}"; shift 2 + ;; + + --iso-publisher) + LIVE_ISO_PUBLISHER="${2}"; shift 2 + ;; + --iso-volume) LIVE_ISO_VOLUME="${2}"; shift 2 ;; @@ -357,7 +369,7 @@ Main () Local_arguments "${@}" # Configuring (this is really shit!) - LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig + LH_MODE="${LH_MODE}" LH_CONFIG="${LH_CONFIG}" LH_APT="${LH_APT}" LH_APT_FTPPROXY="${LH_APT_FTPPROXY}" LH_APT_HTTPPROXY="${LH_APT_HTTPPROXY}" LH_BINARY_INDICES="${LH_BINARY_INDICES}" LH_APT_PDIFFS="${LH_APT_PDIFFS}" LH_APT_RECOMMENDS="${LH_APT_RECOMMENDS}" LH_APT_SECURE="${LH_APT_SECURE}" LH_BOOTSTRAP="${LH_BOOTSTRAP}" LH_CACHE="${LH_CACHE}" LH_DEBCONF_FRONTEND="${LH_DEBCONF_FRONTEND}" LH_DEBCONF_PRIORITY="${LH_DEBCONF_PRIORITY}" LH_DEBCONF_NOWARNINGS="${LH_DEBCONF_NOWARNINGS}" LH_GENISOIMAGE="${LH_GENISOIMAGE}" LH_LOSETUP="${LH_LOSETUP}" LH_TASKSEL="${LH_TASKSEL}" LIVE_ROOT="${LIVE_ROOT}" LIVE_ARCHITECTURE="${LIVE_ARCHITECTURE}" LIVE_DISTRIBUTION="${LIVE_DISTRIBUTION}" LIVE_DISTRIBUTION_CONFIG="${LIVE_DISTRIBUTION_CONFIG}" LIVE_BOOTSTRAP_FLAVOUR="${LIVE_BOOTSTRAP_FLAVOUR}" LIVE_MIRROR_BOOTSTRAP="${LIVE_MIRROR_BOOTSTRAP}" LIVE_MIRROR_BOOTSTRAP_SECURITY="${LIVE_MIRROR_BOOTSTRAP_SECURITY}" LIVE_MIRROR_BINARY="${LIVE_MIRROR_BINARY}" LIVE_MIRROR_BINARY_SECURITY="${LIVE_MIRROR_BINARY_SECURITY}" LIVE_SECTIONS="${LIVE_SECTIONS}" LIVE_INTERACTIVE="${LIVE_INTERACTIVE}" LIVE_LINUX_FLAVOURS="${LIVE_LINUX_FLAVOURS}" LIVE_LINUX_PACKAGES="${LIVE_LINUX_PACKAGES}" LIVE_KEYRING_PACKAGES="${LIVE_KEYRING_PACKAGES}" LIVE_HOOKS="${LIVE_HOOKS}" LIVE_LANGUAGE="${LIVE_LANGUAGE}" LIVE_PACKAGES="${LIVE_PACKAGES}" LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" LIVE_TASKS="${LIVE_TASKS}" LIVE_SECURITY="${LIVE_SECURITY}" LIVE_SYMLINKS="${LIVE_SYMLINKS}" LIVE_SYSVINIT="${LIVE_SYSVINIT}" LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND}" LIVE_ENCRYPTION="${LIVE_ENCRYPTION}" LIVE_USERNAME="${LIVE_USERNAME}" LIVE_HOSTNAME="${LIVE_HOSTNAME}" LIVE_CHROOT_FILESYSTEM="${LIVE_CHROOT_FILESYSTEM}" LIVE_MEMTEST="${LIVE_MEMTEST}" LIVE_ISO_APPLICATION="${LIVE_ISO_APPLICATION}" LIVE_ISO_PREPARER="${LIVE_ISO_PREPARER}" LIVE_ISO_PUBLISHER="${LIVE_ISO_PUBLISHER}" LIVE_ISO_VOLUME="${LIVE_ISO_VOLUME}" LIVE_NET_SERVER="${LIVE_NET_SERVER}" LIVE_NET_PATH="${LIVE_NET_PATH}" LIVE_SOURCE="${LIVE_SOURCE}" LIVE_BOOTLOADER="${LIVE_BOOTLOADER}" LIVE_GRUB_SPLASH="${LIVE_GRUB_SPLASH}" LIVE_SYSLINUX_SPLASH="${LIVE_SYSLINUX_SPLASH}" LIVE_BINARY_IMAGES="${LIVE_BINARY_IMAGES}" LIVE_SOURCE_IMAGES="${LIVE_SOURCE_IMAGES}" LIVE_INCLUDES="${LIVE_INCLUDES}" LIVE_TEMPLATES="${LIVE_TEMPLATES}" LH_ROOT_COMMAND="${LH_ROOT_COMMAND}" LH_INITRAMFS="${LH_INITRAMFS}" lh_config newconfig if [ "${LH_BREAKPOINTS}" = "enabled" ] then |