diff options
Diffstat (limited to 'helpers')
| -rwxr-xr-x | helpers/lh_binary | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_debian-installer | 6 | ||||
| -rwxr-xr-x | helpers/lh_binary_grub | 6 | ||||
| -rwxr-xr-x | helpers/lh_binary_linux-image | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_memtest | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_rootfs | 2 | ||||
| -rwxr-xr-x | helpers/lh_binary_syslinux | 8 | ||||
| -rwxr-xr-x | helpers/lh_binary_tar (renamed from helpers/lh_binary_hdd) | 12 | ||||
| -rwxr-xr-x | helpers/lh_binary_yaboot | 4 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap | 2 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cache | 92 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_cdebootstrap | 41 | ||||
| -rwxr-xr-x | helpers/lh_bootstrap_debootstrap | 41 | ||||
| -rwxr-xr-x | helpers/lh_chroot | 2 | ||||
| -rwxr-xr-x | helpers/lh_chroot_cache | 92 | ||||
| -rwxr-xr-x | helpers/lh_chroot_preseed | 36 | ||||
| -rwxr-xr-x | helpers/lh_config | 4 | ||||
| -rwxr-xr-x | helpers/lh_source | 3 | ||||
| -rwxr-xr-x | helpers/lh_source_hdd | 70 | ||||
| -rwxr-xr-x | helpers/lh_source_tar (renamed from helpers/lh_source_generic) | 18 | ||||
| -rwxr-xr-x | helpers/make-live | 5 |
21 files changed, 248 insertions, 202 deletions
diff --git a/helpers/lh_binary b/helpers/lh_binary index 0ebb1d7f6..e710b339f 100755 --- a/helpers/lh_binary +++ b/helpers/lh_binary @@ -51,9 +51,9 @@ lh_binary_local-includes ${*} lh_binary_md5sum ${*} # Building images -lh_binary_hdd ${*} lh_binary_iso ${*} lh_binary_net ${*} +lh_binary_tar ${*} lh_binary_usb-hdd ${*} # Deconfiguring chroot diff --git a/helpers/lh_binary_debian-installer b/helpers/lh_binary_debian-installer index 99227c06f..d04ec3125 100755 --- a/helpers/lh_binary_debian-installer +++ b/helpers/lh_binary_debian-installer @@ -66,7 +66,7 @@ case "${LIVE_BINARY_IMAGES}" in 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 @@ mkdir -p "${DESTDIR}" # 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 @@ then # 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 diff --git a/helpers/lh_binary_grub b/helpers/lh_binary_grub index 9300642d7..db26ae988 100755 --- a/helpers/lh_binary_grub +++ b/helpers/lh_binary_grub @@ -93,7 +93,7 @@ esac # Setting destination directory case "${LIVE_BINARY_IMAGES}" in - iso|usb-hdd|hdd) + iso|tar|usb-hdd) DESTDIR_LIVE="binary/live" DESTDIR_INSTALL="binary/install" ;; @@ -151,7 +151,7 @@ fi if [ -n "${LIVE_HOSTNAME}" ] then - case "${LIVE_INITRAMFS}" in + case "${LH_INITRAMFS}" in casper) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" ;; @@ -245,7 +245,7 @@ case ${LIVE_BINARY_IMAGES} in 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 diff --git a/helpers/lh_binary_linux-image b/helpers/lh_binary_linux-image index 474cf785f..306590d51 100755 --- a/helpers/lh_binary_linux-image +++ b/helpers/lh_binary_linux-image @@ -59,7 +59,7 @@ case "${LIVE_BINARY_IMAGES}" in 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 diff --git a/helpers/lh_binary_memtest b/helpers/lh_binary_memtest index 85f93e22e..0ab2c4ee4 100755 --- a/helpers/lh_binary_memtest +++ b/helpers/lh_binary_memtest @@ -81,7 +81,7 @@ case "${LIVE_BINARY_IMAGES}" in 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 diff --git a/helpers/lh_binary_rootfs b/helpers/lh_binary_rootfs index 359151f7d..455b1ab91 100755 --- a/helpers/lh_binary_rootfs +++ b/helpers/lh_binary_rootfs @@ -74,7 +74,7 @@ case "${LIVE_CHROOT_FILESYSTEM}" in rm -f binary/${INITFS}/filesystem.ext2 fi - DU_DIM="`du -ks chroot | cut -f1`" + DU_DIM="`du -ks chroot/chroot | cut -f1`" REAL_DIM="`expr ${DU_DIM} + ${DU_DIM} / 20`" # Just 5% more to be sure, need something more sophistcated here... Chroot "genext2fs --size-in-blocks=${REAL_DIM} --reserved-blocks=0 --root=chroot filesystem.ext2" diff --git a/helpers/lh_binary_syslinux b/helpers/lh_binary_syslinux index 869bcc1f4..977796d2e 100755 --- a/helpers/lh_binary_syslinux +++ b/helpers/lh_binary_syslinux @@ -103,7 +103,7 @@ case "${LIVE_BINARY_IMAGES}" in 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 @@ -163,7 +163,7 @@ fi if [ -n "${LIVE_HOSTNAME}" ] then - case "${LIVE_INITRAMFS}" in + case "${LH_INITRAMFS}" in casper) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" ;; @@ -238,7 +238,7 @@ then # 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 @@ case "${LIVE_BINARY_IMAGES}" in 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 diff --git a/helpers/lh_binary_hdd b/helpers/lh_binary_tar index 40762e828..e3ef16758 100755 --- a/helpers/lh_binary_hdd +++ b/helpers/lh_binary_tar @@ -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@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -32,7 +32,7 @@ Read_conffile config/binary 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 @@ Echo_message "Begin building binary harddisk image..." 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 @@ Check_lockfile .lock 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 diff --git a/helpers/lh_binary_yaboot b/helpers/lh_binary_yaboot index 0b0becf40..d368692ba 100755 --- a/helpers/lh_binary_yaboot +++ b/helpers/lh_binary_yaboot @@ -97,7 +97,7 @@ case "${LIVE_BINARY_IMAGES}" in DESTDIR="binary/live" ;; - net|usb-hdd|hdd) + net|tar|usb-hdd) Echo_error "not supported, FIXME" ;; esac @@ -139,7 +139,7 @@ fi if [ -n "${LIVE_HOSTNAME}" ] then - case "${LIVE_INITRAMFS}" in + case "${LH_INITRAMFS}" in casper) LIVE_BOOTAPPEND="${LIVE_BOOTAPPEND} hostname=${LIVE_HOSTNAME}" ;; diff --git a/helpers/lh_bootstrap b/helpers/lh_bootstrap index fbb8f17e8..5e483aea9 100755 --- a/helpers/lh_bootstrap +++ b/helpers/lh_bootstrap @@ -33,5 +33,7 @@ Read_conffile config/source Set_defaults # Bootstrapping system +lh_bootstrap_cache restore ${*} lh_bootstrap_cdebootstrap ${*} lh_bootstrap_debootstrap ${*} +lh_bootstrap_cache save ${*} diff --git a/helpers/lh_bootstrap_cache b/helpers/lh_bootstrap_cache new file mode 100755 index 000000000..6d79e09da --- /dev/null +++ b/helpers/lh_bootstrap_cache @@ -0,0 +1,92 @@ +#!/bin/sh + +# lh_bootstrap_cache(1) - cach bootstrap stage +# Copyright (C) 2006-2007 Daniel Baumann <daniel@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 + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="cache bootstrap stage" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Echo_message "Begin caching bootstrap stage..." + +for STAGE in ${LH_CACHE_STAGES} +do + case "${1}" in + restore) + # Checking stage file + Check_stagefile .stage/bootstrap_cache.restore + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] + then + # Restoring old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot + fi + + # Creating stage file + Create_stagefile .stage/bootstrap_cache.restore + + exit 0 + fi + ;; + + save) + # Checking stage file + Check_stagefile .stage/bootstrap_cache.save + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "bootstrap" ] + then + rm -rf cache/stages_bootstrap + + mkdir -p cache + + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap + fi + fi + ;; + esac +done diff --git a/helpers/lh_bootstrap_cdebootstrap b/helpers/lh_bootstrap_cdebootstrap index 2eaa23fe9..60ecade2b 100755 --- a/helpers/lh_bootstrap_cdebootstrap +++ b/helpers/lh_bootstrap_cdebootstrap @@ -44,6 +44,7 @@ lh_testroot # Checking stage file Check_stagefile .stage/bootstrap +Check_stagefile .stage/bootstrap_cache.restore # Checking lock file Check_lockfile .lock @@ -94,25 +95,6 @@ fi if [ -x "/usr/bin/cdebootstrap" ] then - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] - then - # Restore old cache - ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot - fi - - # Creating stage file - Create_stagefile .stage/bootstrap - - exit 0 - fi - done - if [ "${LH_CACHE_PACKAGES}" = "enabled" ] then if [ -d cache/packages_bootstrap ] @@ -163,27 +145,6 @@ then # Removing bootstrap cache rm -rf chroot/var/cache/bootstrap - # Saving new cache - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] - then - if [ -d cache/stages_bootstrap ] - then - rm -rf cache/stages_bootstrap - fi - - mkdir -p cache - - ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap - fi - fi - done - # Creating stage file Create_stagefile .stage/bootstrap else diff --git a/helpers/lh_bootstrap_debootstrap b/helpers/lh_bootstrap_debootstrap index 58d36c4d7..b4307a1ad 100755 --- a/helpers/lh_bootstrap_debootstrap +++ b/helpers/lh_bootstrap_debootstrap @@ -44,6 +44,7 @@ lh_testroot # Checking stage file Check_stagefile .stage/bootstrap +Check_stagefile .stage/bootstrap_cache.restore # Checking lock file Check_lockfile .lock @@ -72,25 +73,6 @@ fi if [ -x "/usr/sbin/debootstrap" ] then - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] && [ -d cache/stages_bootstrap ] - then - # Restore old cache - ${LH_ROOT_COMMAND} cp -a cache/stages_bootstrap/* chroot - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot - fi - - # Creating stage file - Create_stagefile .stage/bootstrap - - exit 0 - fi - done - if [ "${LH_CACHE_PACKAGES}" = "enabled" ] then if [ -d cache/packages_bootstrap ] @@ -130,27 +112,6 @@ then # Removing bootstrap cache rm -f chroot/var/cache/apt/archives/*.deb - # Saving new cache - for STAGE in ${LH_CACHE_STAGES} - do - if [ "${STAGE}" = "bootstrap" ] - then - if [ -d cache/stages_bootstrap ] - then - rm -rf cache/stages_bootstrap - fi - - mkdir -p cache - - ${LH_ROOT_COMMAND} cp -a chroot cache/stages_bootstrap - - if [ -n "${LH_ROOT_COMMAND}" ] - then - ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_bootstrap - fi - fi - done - # Creating stage file Create_stagefile .stage/bootstrap else diff --git a/helpers/lh_chroot b/helpers/lh_chroot index b12521ff6..94e60e1a1 100755 --- a/helpers/lh_chroot +++ b/helpers/lh_chroot @@ -33,6 +33,7 @@ Read_conffile config/source Set_defaults # Configuring chroot +lh_chroot_cache restore ${*} lh_chroot_proc install ${*} lh_chroot_sysfs install ${*} lh_chroot_debianchroot install ${*} @@ -69,3 +70,4 @@ lh_chroot_sysvrc remove ${*} lh_chroot_debianchroot remove ${*} lh_chroot_sysfs remove ${*} lh_chroot_proc remove ${*} +lh_chroot_cache save ${*} diff --git a/helpers/lh_chroot_cache b/helpers/lh_chroot_cache new file mode 100755 index 000000000..8d3d9620b --- /dev/null +++ b/helpers/lh_chroot_cache @@ -0,0 +1,92 @@ +#!/bin/sh + +# lh_chroot_cache(1) - cach chroot stage +# Copyright (C) 2006-2007 Daniel Baumann <daniel@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 + +# Including common functions +LH_BASE="${LH_BASE:-/usr/share/live-helper}" + +for FUNCTION in "${LH_BASE}"/functions/*.sh +do + . "${FUNCTION}" +done + +# Setting static variables +DESCRIPTION="cache chroot stage" +HELP="" +USAGE="${PROGRAM} [--force]" + +Arguments "${@}" + +# Reading configuration files +Read_conffile config/common +Read_conffile config/bootstrap +Read_conffile config/chroot +Read_conffile config/binary +Read_conffile config/source +Set_defaults + +Echo_message "Begin caching chroot stage..." + +for STAGE in ${LH_CACHE_STAGES} +do + case "${1}" in + restore) + # Checking stage file + Check_stagefile .stage/chroot_cache.restore + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "chroot" ] && [ -d cache/stages_chroot ] + then + # Restoring old cache + ${LH_ROOT_COMMAND} cp -a cache/stages_chroot/* chroot + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` chroot + fi + + # Creating stage file + Create_stagefile .stage/chroot_cache.restore + + exit 0 + fi + ;; + + save) + # Checking stage file + Check_stagefile .stage/chroot_cache.save + + # Checking lock file + Check_lockfile .lock + + # Creating lock file + Create_lockfile .lock + + if [ "${STAGE}" = "chroot" ] + then + rm -rf cache/stages_chroot + + mkdir -p cache + + ${LH_ROOT_COMMAND} cp -a chroot cache/stages_chroot + + if [ -n "${LH_ROOT_COMMAND}" ] + then + ${LH_ROOT_COMMAND} chown -R `whoami`:`whoami` cache/stages_chroot + fi + fi + ;; + esac +done diff --git a/helpers/lh_chroot_preseed b/helpers/lh_chroot_preseed index 88f9dd3f5..02418c780 100755 --- a/helpers/lh_chroot_preseed +++ b/helpers/lh_chroot_preseed @@ -32,6 +32,11 @@ Read_conffile config/binary Read_conffile config/source Set_defaults +if [ -z "${LIVE_PRESEED}" ] +then + exit 0 +fi + Echo_message "Begin executing preseed..." # Requiring stage file @@ -46,30 +51,27 @@ Check_lockfile .lock # Creating lock file Create_lockfile .lock -if [ -n "${LIVE_PRESEED}" ] +if [ -f "${LIVE_PRESEED}" ] then - if [ -f "${LIVE_PRESEED}" ] - then - # Check dependency - Check_package chroot/usr/bin/debconf-set-selections debconf + # Check dependency + Check_package chroot/usr/bin/debconf-set-selections debconf - # Install dependency - Install_package + # Install dependency + Install_package - # Copying preseed - cp "${LIVE_PRESEED}" chroot/root/preseed + # Copying preseed + cp "${LIVE_PRESEED}" chroot/root/preseed - Chroot "debconf-set-selections /root/preseed" + Chroot "debconf-set-selections /root/preseed" - # Removing preseed file - rm -f chroot/root/preseed + # Removing preseed file + rm -f chroot/root/preseed - # Remove dependency - Remove_package + # Remove dependency + Remove_package - # Creating stage file - Create_stagefile .stage/chroot_preseed - fi + # Creating stage file + Create_stagefile .stage/chroot_preseed else Echo_error "'${LIVE_PRESEED}' file doesn't exists." exit 1 diff --git a/helpers/lh_config b/helpers/lh_config index b911207d1..551e5b127 100755 --- a/helpers/lh_config +++ b/helpers/lh_config @@ -268,6 +268,10 @@ LIVE_PACKAGES="${LIVE_PACKAGES}" # (Default: ${LIVE_PACKAGES_LISTS}) LIVE_PACKAGES_LISTS="${LIVE_PACKAGES_LISTS}" +# \$LIVE_PRESEED: set package preseed +# (Default: ${LIVE_PRESEED}) +LIVE_PRESEED="${LIVE_PRESEED}" + # \$LIVE_TASKS: set tasks to install # (Default: empty) LIVE_TASKS="${LIVE_TASKS}" diff --git a/helpers/lh_source b/helpers/lh_source index bf077726e..40453cdc4 100755 --- a/helpers/lh_source +++ b/helpers/lh_source @@ -43,10 +43,9 @@ lh_source_debian ${*} lh_source_md5sum ${*} # Building images -lh_source_generic ${*} -lh_source_hdd ${*} lh_source_iso ${*} lh_source_net ${*} +lh_source_tar ${*} lh_source_usb-hdd ${*} # Deconfiguring chroot diff --git a/helpers/lh_source_hdd b/helpers/lh_source_hdd deleted file mode 100755 index 416f1ba59..000000000 --- a/helpers/lh_source_hdd +++ /dev/null @@ -1,70 +0,0 @@ -#!/bin/sh - -# lh_source_hdd(1) - build source harddisk image -# Copyright (C) 2006-2007 Daniel Baumann <daniel@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 - -# Including common functions -LH_BASE="${LH_BASE:-/usr/share/live-helper}" - -for FUNCTION in "${LH_BASE}"/functions/*.sh -do - . "${FUNCTION}" -done - -# Setting static variables -DESCRIPTION="build source harddisk image" -HELP="" -USAGE="${PROGRAM} [--force]" - -Arguments "${@}" - -# Reading configuration files -Read_conffile config/common -Read_conffile config/bootstrap -Read_conffile config/chroot -Read_conffile config/binary -Read_conffile config/source -Set_defaults - -if [ "${LIVE_SOURCE}" != "enabled" ] -then - exit 0 -fi - -if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs hdd -then - exit 0 -fi - -Echo_message "Begin building source harddisk image..." -Echo_message "This may take a while." - -# Requiring stage file -Require_stagefile .stage/source_debian - -# Checking stage file -Check_stagefile .stage/source_hdd - -# Checking lock file -Check_lockfile .lock - -# Creating lock file -Create_lockfile .lock - -# Remove old source -if [ -f source-hdd.tar.gz ] -then - rm -f source-hdd.tar.gz -fi - -# Create tarball -tar cfz source-hdd.tar.gz source - -# Creating stage file -Create_stagefile .stage/source_hdd diff --git a/helpers/lh_source_generic b/helpers/lh_source_tar index 7c1b82626..51170a33e 100755 --- a/helpers/lh_source_generic +++ b/helpers/lh_source_tar @@ -1,6 +1,6 @@ #!/bin/sh -# lh_source_generic(1) - build source generic image +# lh_source_tar(1) - build source tarball # Copyright (C) 2006-2007 Daniel Baumann <daniel@debian.org> # # live-helper comes with ABSOLUTELY NO WARRANTY; for details see COPYING. @@ -18,7 +18,7 @@ do done # Setting static variables -DESCRIPTION="build source generic image" +DESCRIPTION="build source tarball" HELP="" USAGE="${PROGRAM} [--force]" @@ -37,19 +37,19 @@ then exit 0 fi -if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs generic +if ! echo "${LIVE_SOURCE_IMAGES}" | grep -qs tar then exit 0 fi -Echo_message "Begin building source generic image..." +Echo_message "Begin building source tarball..." Echo_message "This may take a while." # Requiring stage file Require_stagefile .stage/source_debian # Checking stage file -Check_stagefile .stage/source_generic +Check_stagefile .stage/source_tar # Checking lock file Check_lockfile .lock @@ -58,13 +58,13 @@ Check_lockfile .lock Create_lockfile .lock # Remove old source -if [ -f source.tar ] +if [ -f source.tar.gz ] then - rm -f source.tar + rm -f source.tar.gz fi # Create tarball -tar cf source.tar source +tar cfz source.tar.gz source # Creating stage file -Create_stagefile .stage/source_generic +Create_stagefile .stage/source_tar diff --git a/helpers/make-live b/helpers/make-live index 3f71f5cf1..6681058bf 100755 --- a/helpers/make-live +++ b/helpers/make-live @@ -33,7 +33,7 @@ done # 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" @@ -363,7 +363,8 @@ Main () Read_conffile "${ROOT}"/config/common Read_conffile "${ROOT}"/config/bootstrap Read_conffile "${ROOT}"/config/chroot - Read_conffile "${ROOT}"/config/image + Read_conffile "${ROOT}"/config/binary + Read_conffile "${ROOT}"/config/source Local_arguments "${@}" |