diff --git a/Makefile b/Makefile index d79c79a..4604af5 100644 --- a/Makefile +++ b/Makefile @@ -4,7 +4,7 @@ LANGUAGES = $(shell cd manpages/po && ls) -SCRIPTS = frontend/cli/* frontend/cgi/live-build-cgi frontend/cgi/live-build-cgi.cron functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/* +SCRIPTS = frontend/* functions/* examples/auto/* examples/hooks/* scripts/*.sh scripts/*/* share/bin/* share/hooks/*/* all: build @@ -40,12 +40,12 @@ install: # Installing shared data mkdir -p $(DESTDIR)/usr/share/live/build - cp -r frontend/cgi data functions templates VERSION $(DESTDIR)/usr/share/live/build + cp -r data functions VERSION $(DESTDIR)/usr/share/live/build cp -r share/* $(DESTDIR)/usr/share/live/build # Installing executables mkdir -p $(DESTDIR)/usr/bin - cp -a frontend/cli/* $(DESTDIR)/usr/bin + cp -a frontend/* $(DESTDIR)/usr/bin mkdir -p $(DESTDIR)/usr/lib/live cp -a scripts/* $(DESTDIR)/usr/lib/live diff --git a/VERSION b/VERSION index 0a5cf79..50f22a7 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -4.0.4-1 +5.0~a11-1 diff --git a/data/debian-cd/lucid b/data/debian-cd/lucid deleted file mode 120000 index 5cb6e60..0000000 --- a/data/debian-cd/lucid +++ /dev/null @@ -1 +0,0 @@ -maverick \ No newline at end of file diff --git a/data/debian-cd/maverick/amd64_netinst_udeb_include b/data/debian-cd/maverick/amd64_netinst_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/amd64_netinst_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/amd64_udeb_include b/data/debian-cd/maverick/amd64_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/amd64_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/armel_netinst_udeb_include b/data/debian-cd/maverick/armel_netinst_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/armel_netinst_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/armel_udeb_include b/data/debian-cd/maverick/armel_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/armel_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/exclude-udebs b/data/debian-cd/maverick/exclude-udebs deleted file mode 100644 index 252dba2..0000000 --- a/data/debian-cd/maverick/exclude-udebs +++ /dev/null @@ -1 +0,0 @@ -kernel-image-* diff --git a/data/debian-cd/maverick/i386_businesscard_udeb_include b/data/debian-cd/maverick/i386_businesscard_udeb_include deleted file mode 100644 index c8849a9..0000000 --- a/data/debian-cd/maverick/i386_businesscard_udeb_include +++ /dev/null @@ -1,5 +0,0 @@ -choose-mirror -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/i386_netinst_udeb_include b/data/debian-cd/maverick/i386_netinst_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/i386_netinst_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/i386_udeb_include b/data/debian-cd/maverick/i386_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/i386_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/ia64_netinst_udeb_include b/data/debian-cd/maverick/ia64_netinst_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/ia64_netinst_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/ia64_udeb_include b/data/debian-cd/maverick/ia64_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/ia64_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/powerpc_businesscard_udeb_include b/data/debian-cd/maverick/powerpc_businesscard_udeb_include deleted file mode 100644 index b5c5e7e..0000000 --- a/data/debian-cd/maverick/powerpc_businesscard_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -choose-mirror -netcfg -ethdetect -wireless-tools-udeb diff --git a/data/debian-cd/maverick/powerpc_netinst_udeb_include b/data/debian-cd/maverick/powerpc_netinst_udeb_include deleted file mode 100644 index 4a83dd2..0000000 --- a/data/debian-cd/maverick/powerpc_netinst_udeb_include +++ /dev/null @@ -1,3 +0,0 @@ -netcfg -ethdetect -wireless-tools-udeb diff --git a/data/debian-cd/maverick/powerpc_udeb_include b/data/debian-cd/maverick/powerpc_udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/powerpc_udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/maverick/udeb_include b/data/debian-cd/maverick/udeb_include deleted file mode 100644 index 275197a..0000000 --- a/data/debian-cd/maverick/udeb_include +++ /dev/null @@ -1,4 +0,0 @@ -netcfg -ethdetect -pcmcia-cs-udeb -wireless-tools-udeb diff --git a/data/debian-cd/stretch b/data/debian-cd/stretch new file mode 120000 index 0000000..20f08b4 --- /dev/null +++ b/data/debian-cd/stretch @@ -0,0 +1 @@ +squeeze \ No newline at end of file diff --git a/data/debian-cd/wheezy b/data/debian-cd/wheezy deleted file mode 120000 index 20f08b4..0000000 --- a/data/debian-cd/wheezy +++ /dev/null @@ -1 +0,0 @@ -squeeze \ No newline at end of file diff --git a/examples/gitignore b/examples/gitignore index 2f15679..3f88dfa 100644 --- a/examples/gitignore +++ b/examples/gitignore @@ -5,7 +5,6 @@ binary*.contents binary*.packages binary*.zsync -live-image-* .build/ build.log @@ -14,7 +13,6 @@ chroot/ chroot.packages.* -chroot.files config/binary config/bootstrap @@ -22,7 +20,7 @@ config/common config/source -config/build +config/control source/ source*.iso diff --git a/examples/hooks/minimal.hook.chroot b/examples/hooks/minimal.hook.chroot index 7192257..d13ba42 100755 --- a/examples/hooks/minimal.hook.chroot +++ b/examples/hooks/minimal.hook.chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/examples/hooks/stripped.hook.chroot b/examples/hooks/stripped.hook.chroot index 2946403..ade2390 100755 --- a/examples/hooks/stripped.hook.chroot +++ b/examples/hooks/stripped.hook.chroot @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/frontend/cgi/Makefile b/frontend/cgi/Makefile deleted file mode 100644 index 8ac08dd..0000000 --- a/frontend/cgi/Makefile +++ /dev/null @@ -1,21 +0,0 @@ -# Makefile - -install: - install -D -m 0755 live-build-cgi $(DESTDIR)/usr/lib/cgi-bin/live-build - install -D -m 0755 live-build-cgi.cron $(DESTDIR)/etc/cron.hourly/live-build-cgi - install -D -m 0644 live-build-cgi.crontab $(DESTDIR)/etc/cron.d/live-build-cgi - install -D -m 0644 live-build-cgi.default $(DESTDIR)/etc/default/live-build-cgi - install -D -m 0644 live-build-cgi.logrotate $(DESTDIR)/etc/logrotate.d/live-build-cgi - - install -d -m 0755 $(DESTDIR)/var/log - touch $(DESTDIR)/var/log/live - chown www-data:www-data $(DESTDIR)/var/log/live - -uninstall: - rm -f $(DESTDIR)/usr/lib/cgi-bin/live-build - rm -f $(DESTDIR)/etc/cron.d/live-build-cgi - rm -f $(DESTDIR)/etc/cron.hourly/live-build-cgi - rm -f $(DESTDIR)/etc/default/live-build-cgi - rm -f $(DESTDIR)/etc/logrotate.d/live-build-cgi - -reinstall: uninstall install diff --git a/frontend/cgi/live-build-cgi b/frontend/cgi/live-build-cgi deleted file mode 100755 index 68267cf..0000000 --- a/frontend/cgi/live-build-cgi +++ /dev/null @@ -1,220 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann -## -## This program 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. - - -# Including common functions -. /usr/lib/live/build.sh - -# Reading defaults -if [ -r /etc/default/live-build-cgi ] -then - . /etc/default/live-build-cgi -else - echo "E: /etc/default/live-build-cgi missing" - exit 1 -fi - -_HOSTNAME="$(hostname -f)" - -# Turn on debug if true -if [ "${_DEBUG}" = "true" ] -then - set -x -fi - -# Sending http header -echo "Content-type: text/html" -echo - -# If we are passed something then read it in. -if [ "$REQUEST_METHOD" = "POST" ] && [ "$CONTENT_LENGTH" -gt 0 ] -then - #QUERY_STRING=`cat /dev/stdin` - QUERY_STRING=$(cat /dev/stdin) - #read -n $CONTENT_LENGTH POST_DATA <&0 -fi - -# Translate parameters -QUERY_STRING=$(echo "${POST_DATA}" | sed -e 's/%2F/\//g' -e 's/+/ /g' -e 's/%3B/;/g' -e 's/%7E/~/g' -e 's/%3A/:/g' -e 's/%40/@/g' -e 's/%3D/=/g' -e 's/%2B/+/g') -# Debug the filtering string -# echo ${QUERY_STRING} - - -# Sending html header -cat "${_TEMPLATES}"/header.html - -# CGI -if [ -z "${QUERY_STRING}" ] -then - # Sending html form - sed -e "s/VERSION/${VERSION}/" \ - -e "s/DATE/`date +%Y%m%d-%H:%M`/" \ - "${_TEMPLATES}"/form.html -else - # Converting spaces: sed 's/+/ /g' - # Converting '@': sed 's/%40/@/g' - # Converting ':': sed 's/%3A/:/g' - # Converting ';': sed 's/%3B/\;/g' - # Converting '/': sed 's/%2F/\//g' - # Converting '~': sed 's/%7E/\~/g' - # Converting '=': sed 's/%3D/=/g' - # Converting '+': sed 's/%2B/+/g' - - # Email - _EMAIL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])email=[-0-9a-zA-Z._@]+' | cut -f 2 -d '=' | head -n1) - - # CGI Packages List - _LB_CGIPACKAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])cgipackages=[-0-9a-zA-Z. _+]+' | cut -f 2 -d '=' | head -n1) - - # CGI Config for git - _LB_CONFIG=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])config=[-a-z]+' | cut -f 2 -d '=' | head -n1) - - # Standard options - LIVE_IMAGE_TYPE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])binary_images=[-a-z]+' | cut -f 2 -d '=' | head -n1) - LB_DISTRIBUTION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])distribution=[a-z]+' | cut -f 2 -d '=' | head -n1) - LB_APT=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt=[a-u]+' | cut -f 2 -d '=' | head -n1) - - # Advanced bootstrap options - LB_ARCHITECTURES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])architectures=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) - LB_ARCHIVE_AREAS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])archive_areas=[a-z]+' | cut -f 2 -d '=' | head -n1) - - # Advanced chroot options - LB_CHROOT_FILESYSTEM=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])chroot_filesystem=[0-9a-z]+' | cut -f 2 -d '=' | head -n1) - LB_LINUX_FLAVOURS=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])linux_flavours=[-0-9a-z]+' | cut -f 2 -d '=' | head -n1) - LB_SECURITY=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])security=[a-z]+' | cut -f 2 -d '=' | head -n1) - - # Advanced binary options - LB_APT_INDICES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])apt_indices=[a-z]+' | cut -f 2 -d '=' | head -n1) - LB_BOOTAPPEND_INSTALL=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_install=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1) - LB_BOOTAPPEND_LIVE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootappend_live=[-0-9a-zA-Z. _+=:/]+' | cut -f2- -d '=' | head -n1) - LB_BOOTLOADER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])bootloader=[a-z]+' | cut -f 2 -d '=' | head -n1) - LB_DEBIAN_INSTALLER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])debian_installer=[a-z]+' | cut -f 2 -d '=' | head -n1) - LB_ISO_APPLICATION=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_application=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1) - LB_ISO_PREPARER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_preparer=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1) - LB_ISO_PUBLISHER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_publisher=[-0-9a-zA-Z. ~;:/_@]+' | cut -f 2 -d '=' | head -n1) - LB_ISO_VOLUME=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])iso_volume=[-0-9a-zA-Z. ~;:/_]+' | cut -f 2 -d '=' | head -n1) - LB_MEMTEST=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])memtest=[0-9a-z+]+' | cut -f 2 -d '=' | head -n1) - LB_NET_ROOT_PATH=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_path=[-0-9a-zA-Z._/]+' | cut -f 2 -d '=' | head -n1) - LB_NET_ROOT_SERVER=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])net_server=[0-9.]+' | cut -f 2 -d '=' | head -n1) - - # Advanced source options - LB_SOURCE=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source=[a-z]+' | cut -f 2 -d '=' | head -n1) - LB_SOURCE_IMAGES=$(echo "${QUERY_STRING}" | grep -oE '(^|[?&])source_images=[a-z]+' | cut -f 2 -d '=' | head -n1) - - # FIXME: filter invalid options - unset QUERY_STRING - - if [ -z "${_EMAIL}" ] - then - echo "

Error: No email address specified.

" - - sed -e "s/VERSION/${VERSION}/" \ - -e "s/DATE/`date +%Y%m%d-%H:%M`/" \ - "${_TEMPLATES}"/form.html - - exit - fi - - # Getting build identifier - _BUILD=$(date +%Y%m%d.%H%M%S.%N) - - # Getting number of builds pending. - _QUEUENUM=$(ls "${_TEMPDIR}"/*.build | wc -l) - - #echo "${QUERY_STRING}" - # Sending html confirmation - # Note: On each string remember to use a delimeter that is not in the string. - sed -e "s/BUILD/${_BUILD}/g" \ - -e "s/EMAIL/${_EMAIL}/" \ - -e "s/QUEUENUM/${_QUEUENUM}/" \ - -e "s/LIVE_IMAGE_TYPE/${LIVE_IMAGE_TYPE}/" \ - -e "s/LB_DISTRIBUTION/${LB_DISTRIBUTION}/" \ - -e "s#_LB_CONFIG#${_LB_CONFIG}#" \ - -e "s/LB_APT_INDICES/${LB_APT_INDICES}/" \ - -e "s/LB_APT/${LB_APT}/" \ - -e "s/_LB_CGIPACKAGES/${_LB_CGIPACKAGES}/" \ - -e "s/LB_ARCHITECTURES/${LB_ARCHITECTURES}/" \ - -e "s/LB_ARCHIVE_AREAS/${LB_ARCHIVE_AREAS}/" \ - -e "s/LB_CHROOT_FILESYSTEM/${LB_CHROOT_FILESYSTEM}/" \ - -e "s/LB_LINUX_FLAVOURS/${LB_LINUX_FLAVOURS}/" \ - -e "s/LB_SECURITY/${LB_SECURITY}/" \ - -e "s#LB_BOOTAPPEND_INSTALL#${LB_BOOTAPPEND_INSTALL}#" \ - -e "s#LB_BOOTAPPEND_LIVE#${LB_BOOTAPPEND_LIVE}#" \ - -e "s/LB_BOOTLOADER/${LB_BOOTLOADER}/" \ - -e "s/LB_DEBIAN_INSTALLER/${LB_DEBIAN_INSTALLER}/" \ - -e "s#LB_ISO_APPLICATION#${LB_ISO_APPLICATION}#" \ - -e "s#LB_ISO_PREPARER#${LB_ISO_PREPARER}#" \ - -e "s#LB_ISO_PUBLISHER#${LB_ISO_PUBLISHER}#" \ - -e "s#LB_ISO_VOLUME#${LB_ISO_VOLUME}#" \ - -e "s/LB_MEMTEST/${LB_MEMTEST}/" \ - -e "s#LB_NET_ROOT_PATH#${LB_NET_ROOT_PATH}#" \ - -e "s/LB_NET_ROOT_SERVER/${LB_NET_ROOT_SERVER}/" \ - -e "s#SERVER#${_SERVER}#g" \ - -e "s/LB_SOURCE_IMAGES/${LB_SOURCE_IMAGES}/" \ - -e "s/LB_SOURCE/${LB_SOURCE}/" \ - "${_TEMPLATES}"/build.html - - # Creating temporary directory - mkdir -p "${_TEMPDIR}" - -# Writing build file -cat > "${_TEMPDIR}"/"${_BUILD}".build << EOF -# live-build-cgi "${VERSION}" build file -# `date -R` - -_BUILD="${_BUILD}" -_EMAIL="${_EMAIL}" - -REMOTE_ADDR="${REMOTE_ADDR}" - -# CGI Packages List -_LB_CGIPACKAGES="${_LB_CGIPACKAGES}" - -# CGI Config for git -_LB_CONFIG="${_LB_CONFIG}" - -# Standard options -LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE}" -LB_DISTRIBUTION="${LB_DISTRIBUTION}" -LB_APT="${LB_APT}" - -# Advanced bootstrap options -LB_ARCHITECTURES="${LB_ARCHITECTURES}" -LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS}" - -# Advanced chroot options -LB_CHROOT_FILESYSTEM="${LB_CHROOT_FILESYSTEM}" -LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS}" -LB_SECURITY="${LB_SECURITY}" - -# Advanced binary options -LB_APT_INDICES="${LB_APT_INDICES}" -LB_BOOTAPPEND_INSTALL="${LB_BOOTAPPEND_INSTALL}" -LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE}" -LB_BOOTLOADER="${LB_BOOTLOADER}" -LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER}" -LB_ISO_APPLICATION="${LB_ISO_APPLICATION}" -LB_ISO_PREPARER="${LB_ISO_PREPARER}" -LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER}" -LB_ISO_VOLUME="${LB_ISO_VOLUME}" -LB_MEMTEST="${LB_MEMTEST}" -LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH}" -LB_NET_ROOT_SERVER="${LB_NET_ROOT_SERVER}" - -# Advanced source options -LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES}" -LB_SOURCE="${LB_SOURCE}" - -EOF - - echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: add web build (${_BUILD}) from ${REMOTE_ADDR}." >> /var/log/live/live-build-request - echo "$(date +%b\ %d\ %H:%M:%S) ${_HOSTNAME} live-build-cgi: options ${_BUILD} |email ${_EMAIL}|binary_images ${LIVE_IMAGE_TYPE}|distribution ${LB_DISTRIBUTION}|config ${_LB_CONFIG}|apt ${LB_APT}|cgipackages ${_LB_CGIPACKAGES}|architectures ${LB_ARCHITECTURES}|archive_areas ${LB_ARCHIVE_AREAS}|chroot_filesystem ${LB_CHROOT_FILESYSTEM}|linux_flavours ${LB_LINUX_FLAVOURS}|security ${LB_SECURITY}|apt_indices ${LB_APT_INDICES}|bootappend_install ${LB_BOOTAPPEND_INSTALL}|bootappend_live ${LB_BOOTAPPEND_LIVE}|bootloader ${LB_BOOTLOADER}|debian_installer ${LB_DEBIAN_INSTALLER}|iso_application ${LB_ISO_APPLICATION}|iso_preparer ${LB_ISO_PREPARER}|iso_publisher ${LB_ISO_PUBLISHER}|iso_volume ${LB_ISO_VOLUME}|memtest ${LB_MEMTEST}|net_path ${LB_NET_ROOT_PATH}|net_server ${LB_NET_ROOT_SERVER}|source_images ${LB_SOURCE_IMAGES}|sources ${LB_SOURCE}" >> /var/log/live/live-build-request -fi - -sed -e "s/VERSION/${VERSION}/" "${_TEMPLATES}"/footer.html diff --git a/frontend/cgi/live-build-cgi.cron b/frontend/cgi/live-build-cgi.cron deleted file mode 100755 index e340751..0000000 --- a/frontend/cgi/live-build-cgi.cron +++ /dev/null @@ -1,200 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann -## -## This program 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. - -# Including common functions -. /usr/lib/live/build.sh - -# Reading defaults -if [ -r /etc/default/live-build-cgi ] -then - . /etc/default/live-build-cgi -else - echo "E: /etc/default/live-build-cgi missing" - exit 1 -fi - -# Exit if disabled -if [ "${_WEBBUILD}" != "true" ] -then - exit 0 -fi - -_HOSTNAME="$(hostname -f)" - -# Turn on debug if true -if [ "${_DEBUG}" = "true" ] -then - set -x -fi - -# Locknum sets the lock enumeration for multiple instances of l-b-cgi -_LOCKNUM="$(expr 1 + $(expr $(date +%M) % ${_INSTANCES}))" - -# Checking lock file -if [ -f /var/lock/live-build-cgi-${_LOCKNUM}.lock ] -then - echo "E: live-build-cgi instance ${_LOCKNUM} already/still running." - exit 1 -fi - -# Creating lock trap -trap "test -f /var/lock/live-build-cgi-${_LOCKNUM}.lock && rm -f /var/lock/live-build-cgi-${_LOCKNUM}.lock; exit 0" 0 1 2 3 9 15 - -# Creating lock file -touch /var/lock/live-build-cgi-${_LOCKNUM}.lock - -# Cleanup old builds: cron should be run at least once per hour to take effect -if ls "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* > /dev/null 2>&1 -then - rm -rf "${_DESTDIR}"/`date -d yesterday +%Y%m%d.%H`* - - echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: remove web build (`date -d yesterday +%Y%m%d.%H`*)." >> /var/log/live/live-build -fi - -# Ok from here spin through the live-build-cgi files we have waiting to build -#if ls "${_TEMPDIR}"/*.build > /dev/null 2>&1 -if Find_files ${_TEMPDIR}/*.build -then - _FILE=$(ls "${_TEMPDIR}"/*.build | sort | head -1) - # Pull in variables from the build file. - . "${_FILE}" - - # Drop out some build data for information if something goes wrong. - echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: begin web build (${_BUILD})." >> /var/log/live/live-build - - # Clone the git config to target build directory - git clone ${_LB_GIT} "${_TEMPDIR}"/"${_BUILD}" >> /var/log/live/live-build - _ERRORGIT="${?}" - - # Moving build file to the tempdir and remove from submission area. - mv "${_TEMPDIR}"/"${_BUILD}".build "${_TEMPDIR}"/"${_BUILD}"/ - - # Sanity check to default to something since we are going to build from git clone. - if [ -z "${_LB_CONFIG}" ] - then - _LB_CONFIG="standard" - fi - - # Now set a variable for the correct build path - _BUILD_PATH="${_TEMPDIR}/${_BUILD}/images/${_LB_CONFIG}" - - _DATE_START="`date -R`" - echo "Begin live-build-cgi: ${_DATE_START}" > "${_BUILD_PATH}"/log - echo "Info live-build-cgi: Config tree cloned from ${_LB_GIT} for build ${_BUILD}" >> "${_BUILD_PATH}"/log - - # Creating directory for the config/package-lists - mkdir -p "${_BUILD_PATH}"/config/package-lists - - # Add cgipackages.list.chroot - if [ -n "${_LB_CGIPACKAGES}" ] - then - echo "${_LB_CGIPACKAGES}" > "${_BUILD_PATH}"/config/package-lists/cgipackages.list.chroot - fi - - # Generating config here - if [ "${_ERRORGIT}" -eq "0" ] - then - cd "${_BUILD_PATH}" - # Do config with git and stack on config file params to build - lb config ${_CGI_CONFIG_APPEND} --apt "${LB_APT}" --distribution "${LB_DISTRIBUTION}" --binary-images "${LB_BINARY_IMAGES}" --architectures "${LB_ARCHITECTURES}" --archive-areas "${LB_ARCHIVE_AREAS}" --chroot-filesystem "${LB_CHROOT_FILESYSTEM}" --linux-flavours "${LB_LINUX_FLAVOURS}" --security "${LB_SECURITY}" --apt-indices "${LB_APT_INDICES}" --bootappend-install "${LB_BOOTAPPEND_INSTALL}" --bootappend-live "${LB_BOOTAPPEND_LIVE}" --bootloader "${LB_BOOTLOADER}" --debian-installer "${LB_DEBIAN_INSTALLER}" --iso-application "${LB_ISO_APPLICATION}" --iso-preparer "${LB_ISO_PREPARER}" --iso-publisher "${LB_ISO_PUBLISHER}" --iso-volume "${LB_ISO_VOLUME}" --memtest "${LB_MEMTEST}" --net-root-path "${LB_NET_ROOT_PATH}" --net-root-server "${LB_NET_ROOT_SERVER}" --source-images "${LB_SOURCE_IMAGES}" --source "${LB_SOURCE}" - _ERRORCONFIG="${?}" - else - echo "Config stage skipped. The git clone produced an error: ${_ERRORGIT}" >> "${_BUILD_PATH}"/log - fi - - # Run build if config went ok - if [ "${_ERRORCONFIG}" -eq "0" ] - then - # We need to finish script. - set +e - lb build noauto >> "${_BUILD_PATH}"/log 2>&1 - _ERRORBUILD="${?}" - else - echo "Build stage skipped. Config produced an error: ${_ERRORCONFIG}" >> "${_BUILD_PATH}"/log - fi - - _DATE_END="`date -R`" - echo "End: ${_DATE_END}" >> "${_BUILD_PATH}"/log - - # Creating image directory - mkdir -p "${_DESTDIR}"/"${_BUILD}" - - # Creating mail and logging. - if [ "${_ERRORGIT}" -eq "0" ] && [ "${_ERRORCONFIG}" -eq "0" ] && [ "${_ERRORBUILD}" -eq "0" ] - then - _STATUS="maybe-successful" - echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 200 - \"-\" \"\"">>/var/log/live/live-build-cgi-status - else - _STATUS="maybe-failed" - echo "${REMOTE_ADDR} - - `date +[%d/%b/%Y:%H:%m:%S\ %z]` \"${_BUILD} ${LB_ARCHITECTURES}/${LB_DISTRIBUTION}/${_LB_CGIPACKAGES}\" 404 - \"-\" \"\"">>/var/log/live/live-build-cgi-status - fi - - sed -e "s/BUILD/${_BUILD}/g" \ - -e "s/EMAIL/${_EMAIL}/" \ - -e "s/VERSION/${VERSION}/" \ - -e "s/DATE_START/${_DATE_START}/" \ - -e "s/DATE_END/${_DATE_END}/" \ - -e "s/STATUS/${_STATUS}/" \ - -e "s#SERVER#${_SERVER}#" \ - "${_TEMPLATES}"/mail.txt > "${_DESTDIR}"/"${_BUILD}"/mail - -cat >> "${_DESTDIR}"/"${_BUILD}"/mail << EOF - ---- - -Here's a list of all build-options that were used to build your image: - -EOF - - cat "${_TEMPDIR}"/"${_BUILD}"/"${_BUILD}".build >> "${_DESTDIR}"/"${_BUILD}"/mail - - # Moving live-image-* files - if Find_files ${_BUILD_PATH}/live-image-* - then - mv "${_BUILD_PATH}"/live-image-* "${_DESTDIR}"/"${_BUILD}" - fi - - # Moving build - mv "${_TEMPDIR}"/"${_BUILD}"/"${_BUILD}".build "${_DESTDIR}"/"${_BUILD}"/build - - # Moving log - mv "${_BUILD_PATH}"/log "${_DESTDIR}"/"${_BUILD}" - - # Generating md5sum - cd "${_DESTDIR}"/"${_BUILD}" - md5sum * > md5sum - cd "${OLDPWD}" - - # Sending mail - cat "${_DESTDIR}"/"${_BUILD}"/mail | /usr/sbin/sendmail -t - - # Unmounting devpts-live - #if ls "${_TEMPDIR}"/"${_BUILD}"/chroot/dev/pts/* > /dev/null 2>&1 - if Find_files ${_BUILD_PATH}/chroot/dev/pts/* - then - umount "${_BUILD_PATH}"/chroot/dev/pts - fi - - # Unmounting proc - if [ -f "${_BUILD_PATH}"/chroot/proc/version ] - then - umount "${_BUILD_PATH}"/chroot/proc - fi - - # Unmounting sysfs - if [ -d "${_BUILD_PATH}"/chroot/sys/kernel ] - then - umount "${_BUILD_PATH}"/chroot/sys - fi - - # Removing build directory - rm -rf "${_TEMPDIR}"/"${_BUILD}" - - echo "`date +%b\ %d\ %H:%M:%S` ${_HOSTNAME} live-build-cgi: end web build (${_BUILD}: ${_STATUS})." >> /var/log/live/live-build -fi diff --git a/frontend/cgi/live-build-cgi.crontab b/frontend/cgi/live-build-cgi.crontab deleted file mode 100644 index 1bf7a81..0000000 --- a/frontend/cgi/live-build-cgi.crontab +++ /dev/null @@ -1,7 +0,0 @@ -# /etc/crontab - system-wide crontab - -SHELL=/bin/sh -PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin - -# m h dom mon dow user command -*/1 * * * * root /etc/cron.hourly/live-build-cgi > /dev/null 2>&1 diff --git a/frontend/cgi/live-build-cgi.default b/frontend/cgi/live-build-cgi.default deleted file mode 100644 index c7e26bc..0000000 --- a/frontend/cgi/live-build-cgi.default +++ /dev/null @@ -1,19 +0,0 @@ -# Defaults for /etc/cron.daily/live-build-cgi - -_WEBBUILD="false" - -_MODE="debian" - -_DEBUG="false" - -_INSTANCES="1" - -_DESTDIR="/srv/debian-live/build/www" -_TEMPLATES="/usr/share/live/build/templates/cgi/${_MODE}" -_TEMPDIR="/srv/debian-live/build/tmp" - -_SERVER="http://live-systems.org/build" - -_LB_GIT="git://live-systems.org/git/live-images.git" - -_CGI_CONFIG_APPEND="" diff --git a/frontend/cgi/live-build-cgi.logrotate b/frontend/cgi/live-build-cgi.logrotate deleted file mode 100644 index 75d89a9..0000000 --- a/frontend/cgi/live-build-cgi.logrotate +++ /dev/null @@ -1,11 +0,0 @@ -# /etc/logrotate.d/live-build - -/var/log/live -{ - compress - copytruncate - missingok - monthly - notifempty - rotate 24 -} diff --git a/frontend/cli/lb b/frontend/cli/lb deleted file mode 100755 index 63e46a9..0000000 --- a/frontend/cli/lb +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann -## -## This program 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 -[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh - -# Setting static variables -DESCRIPTION="$(Echo 'utility to build live systems')" -HELP="FIXME" -USAGE="FIXME" - -case "${1}" in - -h|--help) - if [ -x "$(which man 2>/dev/null)" ] - then - man lb - exit 0 - else - ${0} --usage - exit 0 - fi - ;; - - ""|-u|--usage) - Usage - ;; - - -v|--version) - echo "${VERSION}" - exit 0 - ;; - - *) - COMMAND="${1}" - shift - - ENV="" - - if [ "${COMMAND}" != "config" ] - then - # Checking user account - if [ "$(id -u)" -ne "0" ] - then - Echo_error "need root privileges" - exit 1 - fi - fi - - for _FILE in config/environment config/environment.binary - do - if [ -e "${_FILE}" ] - then - ENV="${ENV} $(grep -v '^#' ${_FILE})" - fi - done - - if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ] - then - # User has live-build copied locally in the system - SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}" - elif [ -x "local/live-build/scripts/build/${COMMAND}" ] - then - # User has live-build copied locally in the config - SCRIPT="local/live-build/scripts/build/${COMMAND}" - elif [ -x /usr/lib/live/build/${COMMAND} ] - then - # User has live-build installed in the system - SCRIPT=/usr/lib/live/build/"${COMMAND}" - elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] - then - # User has live-build commands in path - SCRIPT="${COMMAND}" - else - Echo_error "no such script: ${COMMAND}" - exit 1 - fi - - Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})" - ${ENV} exec "${SCRIPT}" "${@}" - ;; -esac diff --git a/frontend/cli/live-build b/frontend/cli/live-build deleted file mode 100755 index d6defab..0000000 --- a/frontend/cli/live-build +++ /dev/null @@ -1,37 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann -## -## This program is free software: you can redistribute it and/or modify -## it under the terms of the GNU General Public License as published by -## the Free Software Foundation, either version 3 of the License, or -## (at your option) any later version. -## -## This program is distributed in the hope that it will be useful, -## but WITHOUT ANY WARRANTY; without even the implied warranty of -## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -## GNU General Public License for more details. -## -## You should have received a copy of the GNU General Public License -## along with this program. If not, see . -## -## The complete text of the GNU General Public License -## can be found in /usr/share/common-licenses/GPL-3 file. - - -set -e - -if [ -x "$(which man 2>/dev/null)" ] -then - man live-build -else - -cat << EOF -live-build contains the scripts to build a live system from a configuration -directory. - -An introduction to live-build can be found in the live-build(7) manpage. -EOF - -fi diff --git a/frontend/lb b/frontend/lb new file mode 100755 index 0000000..03ab043 --- /dev/null +++ b/frontend/lb @@ -0,0 +1,90 @@ +#!/bin/sh + +## live-build(7) - System Build Scripts +## Copyright (C) 2006-2015 Daniel Baumann +## +## This program 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 +[ -e "${LIVE_BUILD}/scripts/build.sh" ] && . "${LIVE_BUILD}/scripts/build.sh" || . /usr/lib/live/build.sh + +# Setting static variables +DESCRIPTION="$(Echo 'utility to build live systems')" +HELP="FIXME" +USAGE="FIXME" + +case "${1}" in + -h|--help) + if [ -x "$(which man 2>/dev/null)" ] + then + man lb + exit 0 + else + ${0} --usage + exit 0 + fi + ;; + + ""|-u|--usage) + Usage + ;; + + -v|--version) + echo "${VERSION}" + exit 0 + ;; + + *) + COMMAND="${1}" + shift + + ENV="" + + if [ "${COMMAND}" != "config" ] + then + # Checking user account + if [ "$(id -u)" -ne "0" ] + then + Echo_error "need root privileges" + exit 1 + fi + fi + + for _FILE in config/environment config/environment.binary + do + if [ -e "${_FILE}" ] + then + ENV="${ENV} $(grep -v '^#' ${_FILE})" + fi + done + + if [ -x "${LIVE_BUILD}/scripts/build/${COMMAND}" ] + then + # User has live-build copied locally in the system + SCRIPT="${LIVE_BUILD}/scripts/build/${COMMAND}" + elif [ -x "local/live-build/scripts/build/${COMMAND}" ] + then + # User has live-build copied locally in the config + SCRIPT="local/live-build/scripts/build/${COMMAND}" + elif [ -x /usr/lib/live/build/${COMMAND} ] + then + # User has live-build installed in the system + SCRIPT=/usr/lib/live/build/"${COMMAND}" + elif [ -x "$(which ${COMMAND} 2>/dev/null)" ] + then + # User has live-build commands in path + SCRIPT="${COMMAND}" + else + Echo_error "no such script: ${COMMAND}" + exit 1 + fi + + Echo "[%s] %s" "$(date +'%F %T')" "lb ${COMMAND} $(echo ${@})" + ${ENV} exec "${SCRIPT}" "${@}" + ;; +esac diff --git a/frontend/live-build b/frontend/live-build new file mode 100755 index 0000000..52b8437 --- /dev/null +++ b/frontend/live-build @@ -0,0 +1,37 @@ +#!/bin/sh + +## live-build(7) - System Build Scripts +## Copyright (C) 2006-2015 Daniel Baumann +## +## This program is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. +## +## This program is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. +## +## You should have received a copy of the GNU General Public License +## along with this program. If not, see . +## +## The complete text of the GNU General Public License +## can be found in /usr/share/common-licenses/GPL-3 file. + + +set -e + +if [ -x "$(which man 2>/dev/null)" ] +then + man live-build +else + +cat << EOF +live-build contains the scripts to build a live system from a configuration +directory. + +An introduction to live-build can be found in the live-build(7) manpage. +EOF + +fi diff --git a/functions/aliases.sh b/functions/aliases.sh index 33bdbe6..3df028f 100755 --- a/functions/aliases.sh +++ b/functions/aliases.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -36,6 +36,9 @@ { for FILE in ${@} do - : > ${FILE} + if [ ! -L ${FILE} ] + then + : > ${FILE} + fi done } diff --git a/functions/architectures.sh b/functions/architectures.sh index 4d253c2..7c6c48c 100755 --- a/functions/architectures.sh +++ b/functions/architectures.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/arguments.sh b/functions/arguments.sh index 66c73c9..eede5c5 100755 --- a/functions/arguments.sh +++ b/functions/arguments.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/breakpoints.sh b/functions/breakpoints.sh index f5ba3c4..55f4d42 100755 --- a/functions/breakpoints.sh +++ b/functions/breakpoints.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/cache.sh b/functions/cache.sh index 42d45d6..467a674 100755 --- a/functions/cache.sh +++ b/functions/cache.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -17,7 +17,7 @@ if [ -e "${DIRECTORY}" ] then # Restore old cache - if [ "$(stat --printf %d ${DIRECTORY})" = "$(stat --printf %d chroot/var/cache/apt/archives)" ] + if [ "$(stat --printf %d ${DIRECTORY}/)" = "$(stat --printf %d chroot/var/cache/apt/archives/)" ] then # with hardlinks find "${DIRECTORY}" -name "*.deb" | xargs cp -fl -t chroot/var/cache/apt/archives diff --git a/functions/chroot.sh b/functions/chroot.sh index 16cd757..23c5046 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/chroot_bind_path.sh b/functions/chroot_bind_path.sh new file mode 100755 index 0000000..b296f69 --- /dev/null +++ b/functions/chroot_bind_path.sh @@ -0,0 +1,38 @@ +#!/bin/sh + +## live-build(7) - System Build Scripts +## Copyright (C) 2006-2015 Daniel Baumann +## +## This program 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. + + +Chroot_bind_path () +{ + CHROOT="$(readlink -f ${1})" + BIND_SRC="$(readlink -f ${2})" + + BIND_DEST=$(echo "${BIND_SRC}" | sed -e 's|/\+||') + if [ ! -d "${CHROOT}/${BIND_DEST}" -o \ + -z "$(cat /proc/mounts | awk -vdir="${CHROOT}/${BIND_DEST}" '$2 ~ dir { print $2}')" ] + then + Echo_message "Binding local repository path" + mkdir -p "${CHROOT}/${BIND_DEST}" + mount --bind "${LB_PARENT_MIRROR_CHROOT#file:}" \ + "${CHROOT}/${BIND_DEST}" + fi +} + +Chroot_unbind_path () +{ + CHROOT="$(readlink -f ${1})" + BIND_SRC="$(readlink -f ${2})" + + BIND_DEST=$(echo "${BIND_SRC}" | sed -e 's|/\+||') + if [ -d "${CHROOT}/${BIND_DEST}" ] + then + Echo_message "Unbinding local repository path" + umount "${CHROOT}/${BIND_DEST}" > /dev/null 2>&1 || true + fi +} diff --git a/functions/color.sh b/functions/color.sh index 8bd3731..6eb4019 100755 --- a/functions/color.sh +++ b/functions/color.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/common.sh b/functions/common.sh index 161722b..2edebc5 100755 --- a/functions/common.sh +++ b/functions/common.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/conffile.sh b/functions/conffile.sh index c4fe191..13407c3 100755 --- a/functions/conffile.sh +++ b/functions/conffile.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/configuration.sh b/functions/configuration.sh index cdcc9f2..6c0fb2f 100755 --- a/functions/configuration.sh +++ b/functions/configuration.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/cursor.sh b/functions/cursor.sh index 6d1f9c9..1f683a1 100755 --- a/functions/cursor.sh +++ b/functions/cursor.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/defaults.sh b/functions/defaults.sh index b419232..eba52ae 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -58,10 +58,6 @@ LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}" ;; - ubuntu) - LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main restricted}" - ;; - *) LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main}" ;; @@ -70,9 +66,9 @@ export LB_ARCHIVE_AREAS # Image: Archive Areas - LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build Parent-Archive-Areas)}" - LIVE_IMAGE_PARENT_ARCHIVE_AREAS="${LIVE_IMAGE_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" - export LIVE_IMAGE_PARENT_ARCHIVE_AREAS + LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-$(Get_configuration config/build Parent-Archive-Areas)}" + LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}" + export LB_PARENT_ARCHIVE_AREAS # Image: Type LIVE_IMAGE_TYPE="${LIVE_IMAGE_TYPE:-$(Get_configuration config/build Type)}" @@ -96,13 +92,13 @@ # Setting system type LB_SYSTEM="${LB_SYSTEM:-live}" - # Setting mode (currently: debian, progress-linux, and ubuntu) + # Setting mode (currently: debian, progress-linux) if [ -x /usr/bin/lsb_release ] then _DISTRIBUTOR="$(lsb_release -is | tr "[A-Z]" "[a-z]")" case "${_DISTRIBUTOR}" in - debian|progress-linux|ubuntu) + debian|progress-linux) LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}" ;; @@ -114,9 +110,6 @@ if [ -e /etc/progress-linux_version ] then LB_MODE="${LB_MODE:-progress-linux}" - elif [ -e /etc/ubuntu_version ] - then - LB_MODE="${LB_MODE:-ubuntu}" else LB_MODE="${LB_MODE:-debian}" fi @@ -125,17 +118,13 @@ # Setting distribution name case "${LB_MODE}" in progress-linux) - LB_DISTRIBUTION="${LB_DISTRIBUTION:-baureo}" + LB_DISTRIBUTION="${LB_DISTRIBUTION:-cairon}" LB_DERIVATIVE="true" - ;; - - ubuntu) - LB_DISTRIBUTION="${LB_DISTRIBUTION:-quantal}" - LB_DERIVATIVE="false" - ;; - - *) - LB_DISTRIBUTION="${LB_DISTRIBUTION:-jessie}" + LB_DERIVATIVE_IS_BASED_ON="debian" + ;; + + *) + LB_DISTRIBUTION="${LB_DISTRIBUTION:-stretch}" LB_DERIVATIVE="false" ;; esac @@ -148,7 +137,7 @@ LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" ;; - charon|charon-backports) + cairon|cairon-backports) LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-sid}" LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION="${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION:-${LB_PARENT_DISTRIBUTION}}" ;; @@ -219,18 +208,6 @@ LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES:-true}" ;; esac - - # Setting bootstrap program - if [ -z "${LB_BOOTSTRAP}" ] || ( [ ! -x "$(which ${LB_BOOTSTRAP} 2>/dev/null)" ] && [ "${LB_BOOTSTRAP}" != "copy" ] ) - then - if [ -x "/usr/sbin/debootstrap" ] - then - LB_BOOTSTRAP="debootstrap" - elif [ -x "/usr/bin/cdebootstrap" ] - then - LB_BOOTSTRAP="cdebootstrap" - fi - fi # Setting cache option LB_CACHE="${LB_CACHE:-true}" @@ -245,15 +222,7 @@ # Setting initramfs hook case "${LB_SYSTEM}" in live) - case "${LB_MODE}" in - ubuntu) - LB_INITRAMFS="${LB_INITRAMFS:-casper}" - ;; - - *) - LB_INITRAMFS="${LB_INITRAMFS:-live-boot}" - ;; - esac + LB_INITRAMFS="${LB_INITRAMFS:-live-boot}" ;; normal) @@ -265,17 +234,9 @@ # Setting initsystem case "${LB_MODE}" in - ubuntu) - case "${LB_INITRAMFS}" in - live-boot) - LB_INITSYSTEM="${LB_INITSYSTEM:-upstart}" - ;; - esac - ;; - progress-linux) case "${LB_DISTRIBUTION}" in - chairon*) + cairon*) LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}" ;; @@ -288,15 +249,7 @@ *) case "${LB_SYSTEM}" in live) - case "${LB_PARENT_DISTRIBUTION}" in - wheezy) - LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}" - ;; - - *) - LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}" - ;; - esac + LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}" ;; normal) @@ -360,14 +313,6 @@ ;; esac - # Setting templates - if [ -n "${LIVE_BUILD}" ] - then - LB_TEMPLATES="${LB_TEMPLATES:-${LIVE_BUILD}/templates}" - else - LB_TEMPLATES="${LB_TEMPLATES:-/usr/share/live/build/templates}" - fi - # Setting live build options _BREAKPOINTS="${_BREAKPOINTS:-false}" _COLOR="${_COLOR:-false}" @@ -389,20 +334,6 @@ LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-http://ftp.debian.org/debian/}" LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://cdn.archive.progress-linux.org/packages/}" ;; - - ubuntu) - case "${LB_ARCHITECTURES}" in - amd64|i386) - LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://archive.ubuntu.com/ubuntu/}" - ;; - - *) - LB_MIRROR_BOOTSTRAP="${LB_MIRROR_BOOTSTRAP:-http://ports.ubuntu.com/ubuntu-ports/}" - ;; - esac - - LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}" - ;; esac LB_PARENT_MIRROR_CHROOT="${LB_PARENT_MIRROR_CHROOT:-${LB_PARENT_MIRROR_BOOTSTRAP}}" @@ -419,46 +350,18 @@ LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-http://security.debian.org/}" LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT}}" ;; - - ubuntu) - case "${LB_ARCHITECTURES}" in - amd64|i386) - LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://security.ubuntu.com/ubuntu/}" - ;; - - *) - LB_MIRROR_CHROOT_SECURITY="${LB_MIRROR_CHROOT_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}" - ;; - esac - - LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}" - ;; esac # Setting mirror which ends up in the image case "${LB_MODE}" in debian) - LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://http.debian.net/debian/}" + LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://httpredir.debian.org/debian/}" LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}" ;; progress-linux) LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ftp.debian.org/debian/}" LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}" - ;; - - ubuntu) - case "${LB_ARCHITECTURES}" in - amd64|i386) - LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://archive.ubuntu.com/ubuntu/}" - ;; - - *) - LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-http://ports.ubuntu.com/ubuntu-ports/}" - ;; - esac - - LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}" ;; esac @@ -473,20 +376,6 @@ LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-http://security.debian.org/}" LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-${LB_MIRROR_CHROOT}}" ;; - - ubuntu) - case "${LB_ARCHITECTURES}" in - amd64|i386) - LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://security.ubuntu.com/ubuntu/}" - ;; - - *) - LB_MIRROR_BINARY_SECURITY="${LB_MIRROR_BINARY_SECURITY:-http://ports.ubuntu.com/ubuntu-ports/}" - ;; - esac - - LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}" - ;; esac case "${LB_MODE}" in @@ -513,61 +402,28 @@ LB_INTERACTIVE="${LB_INTERACTIVE:-false}" # Setting keyring packages - case "${LB_MODE}" in - ubuntu) - LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-ubuntu-keyring}" - ;; - - *) - LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}" - ;; - esac + LB_KEYRING_PACKAGES="${LB_KEYRING_PACKAGES:-debian-archive-keyring}" # Setting linux flavour string case "${LB_ARCHITECTURES}" in + arm64) + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-arm64}" + ;; + armel) - case "${LB_MODE}" in - ubuntu) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-omap}" - ;; - *) - # armel will have special images: one rootfs image and many additional kernel images. - # therefore we default to all available armel flavours - case "${LB_DISTRIBUTION}" in - wheezy) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-iop32x ixp4xx kirkwood orion5x versatile}" - ;; - *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}" - ;; - esac - ;; - esac + # armel will have special images: one rootfs image and many additional kernel images. + # therefore we default to all available armel flavours + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-ixp4xx kirkwood orion5x versatile}" ;; armhf) # armhf will have special images: one rootfs image and many additional kernel images. # therefore we default to all available armhf flavours - case "${LB_DISTRIBUTION}" in - wheezy) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-mx5 omap}" - ;; - *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}" - ;; - esac + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-armmp armmp-lpae}" ;; amd64) - case "${LB_MODE}" in - ubuntu) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" - ;; - - *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-amd64}" - ;; - esac + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-amd64}" ;; i386) @@ -576,20 +432,8 @@ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae}" ;; - ubuntu) - case "${LB_DISTRIBUTION}" in - precise) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}" - ;; - - *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}" - ;; - esac - ;; - *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}" + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-586}" ;; esac ;; @@ -614,10 +458,6 @@ exit 1 ;; - ubuntu) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp e500 powerpc-e500mc}" - ;; - *) LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc64 powerpc}" ;; @@ -625,19 +465,6 @@ ;; s390x) - case "${LB_MODE}" in - progress-linux|ubuntu) - Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." - exit 1 - ;; - - *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-s390x}" - ;; - esac - ;; - - sparc) case "${LB_MODE}" in progress-linux) Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode." @@ -645,7 +472,7 @@ ;; *) - LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-sparc64}" + LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-s390x}" ;; esac ;; @@ -657,19 +484,11 @@ esac # Set linux packages - case "${LB_MODE}" in - ubuntu) - LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux}" - ;; - - *) - LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}" - ;; - esac + LB_LINUX_PACKAGES="${LB_LINUX_PACKAGES:-linux-image}" # Setting security updates option case "${LB_PARENT_DISTRIBUTION}" in - jessie|sid) + sid) LB_SECURITY="${LB_SECURITY:-false}" ;; @@ -680,7 +499,7 @@ # Setting updates updates option case "${LB_PARENT_DISTRIBUTION}" in - jessie|sid) + sid) LB_UPDATES="${LB_UPDATES:-false}" ;; @@ -692,15 +511,7 @@ ## config/binary # Setting image filesystem - case "${LB_ARCHITECTURES}" in - sparc) - LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-ext4}" - ;; - - *) - LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-fat32}" - ;; - esac + LB_BINARY_FILESYSTEM="${LB_BINARY_FILESYSTEM:-fat32}" # Setting image type case "${LB_ARCHITECTURES}" in @@ -793,11 +604,6 @@ LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" ;; - casper) - LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper quiet splash}" - LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-boot=casper memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" - ;; - none) LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-quiet splash}" LB_BOOTAPPEND_LIVE_FAILSAFE="${LB_BOOTAPPEND_LIVE_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}" @@ -812,20 +618,7 @@ ;; hdd*) - case "${LB_MODE}" in - ubuntu) - if [ "${LB_DEBIAN_INSTALLER}" = "live" ] - then - _LB_BOOTAPPEND_PRESEED="file=/cdrom/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}" - else - _LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}" - fi - ;; - - *) - _LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}" - ;; - esac + _LB_BOOTAPPEND_PRESEED="file=/hd-media/install/${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ;; netboot) @@ -861,10 +654,6 @@ progress-linux) LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}" ;; - - ubuntu) - LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Ubuntu Live}" - ;; esac # Set iso preparer @@ -890,10 +679,6 @@ progress-linux) LB_HDD_LABEL="${LB_HDD_LABEL:-PROGRESS_$(echo ${LB_DISTRIBUTION} | tr "[a-z]" "[A-Z]")}" ;; - - ubuntu) - LB_HDD_LABEL="${LB_HDD_LABEL:-UBUNTU}" - ;; esac # Setting hdd size @@ -908,10 +693,6 @@ progress-linux) LB_ISO_VOLUME="${LB_ISO_VOLUME:-Progress ${LB_DISTRIBUTION}}" ;; - - ubuntu) - LB_ISO_VOLUME="${LB_ISO_VOLUME:-Ubuntu ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}" - ;; esac # Setting memtest option @@ -919,7 +700,7 @@ # Setting loadlin option case "${LB_MODE}" in - progress-linux|ubuntu) + progress-linux) ;; @@ -943,7 +724,7 @@ # Setting win32-loader option case "${LB_MODE}" in - progress-linux|ubuntu) + progress-linux) ;; @@ -989,17 +770,8 @@ LB_NET_TARBALL="${LB_NET_TARBALL:-true}" # Setting firmware option - case "${LB_MODE}" in - ubuntu) - LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-false}" - LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-false}" - ;; - - *) - LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}" - LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}" - ;; - esac + LB_FIRMWARE_CHROOT="${LB_FIRMWARE_CHROOT:-true}" + LB_FIRMWARE_BINARY="${LB_FIRMWARE_BINARY:-true}" # Setting swap file LB_SWAP_FILE_SIZE="${LB_SWAP_FILE_SIZE:-512}" diff --git a/functions/echo.sh b/functions/echo.sh index 3d6f5f8..96b742c 100755 --- a/functions/echo.sh +++ b/functions/echo.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/exit.sh b/functions/exit.sh index 36637e6..6ff9cdc 100755 --- a/functions/exit.sh +++ b/functions/exit.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/help.sh b/functions/help.sh index cdec8e2..cd9344b 100755 --- a/functions/help.sh +++ b/functions/help.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/lockfile.sh b/functions/lockfile.sh index e592518..cabb85f 100755 --- a/functions/lockfile.sh +++ b/functions/lockfile.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/losetup.sh b/functions/losetup.sh index 8289c6e..3216dca 100755 --- a/functions/losetup.sh +++ b/functions/losetup.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/man.sh b/functions/man.sh index 8fdf81c..11366b7 100755 --- a/functions/man.sh +++ b/functions/man.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/packagelists.sh b/functions/packagelists.sh index 8470d9a..0ee13ce 100755 --- a/functions/packagelists.sh +++ b/functions/packagelists.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -107,6 +107,10 @@ _LB_ENABLED=1 ;; + \#*) + # Skip comments + ;; + *) if [ ${_LB_ENABLED} -eq 1 ] then @@ -134,7 +138,7 @@ for _LB_PACKAGE_LINE_PART in ${_LB_PACKAGE_LINE} do # Looking for : - if [ -n "$(echo ${_LB_PACKAGE_LINE_PART} | awk -F':' '{print $2}')" ] + if [ -n "$(echo ${_LB_PACKAGE_LINE_PART} | awk -F"=" '{print $1}' | awk -F':' '{print $2}')" ] then _LB_DISCOVERED_ARCHITECTURES="${_LB_DISCOVERED_ARCHITECTURES} $(echo ${_LB_PACKAGE_LINE_PART} | awk -F':' '{print $2}')" fi diff --git a/functions/packages.sh b/functions/packages.sh index 4211c0e..477d337 100755 --- a/functions/packages.sh +++ b/functions/packages.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -10,10 +10,11 @@ Check_package () { - FILE="${1}" - PACKAGE="${2}" + CHROOT="${1}" + FILE="${2}" + PACKAGE="${3}" - Check_installed "${FILE}" "${PACKAGE}" + Check_installed "${CHROOT}" "${FILE}" "${PACKAGE}" case "${INSTALL_STATUS}" in 1) @@ -66,38 +67,35 @@ # 2 if package isn't installed and we aren't in an apt managed system Check_installed () { - FILE="${1}" - PACKAGE="${2}" + CHROOT="${1}" + FILE="${2}" + PACKAGE="${3}" - case "${LB_BUILD_WITH_CHROOT}" in - true) + if [ "${LB_BUILD_WITH_CHROOT}" = "true" ] && [ "${CHROOT}" = "chroot" ] + then + if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install" + then + INSTALL_STATUS=0 + else + INSTALL_STATUS=1 + fi + else + if which dpkg-query > /dev/null 2>&1 + then if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install" then INSTALL_STATUS=0 else INSTALL_STATUS=1 fi - ;; - false) - if which dpkg-query > /dev/null 2>&1 + else + if [ ! -e "${FILE}" ] then - if Chroot chroot "dpkg-query -s ${PACKAGE}" 2> /dev/null | grep -qs "Status: install" - then - INSTALL_STATUS=0 - else - INSTALL_STATUS=1 - fi + INSTALL_STATUS=2 else - FILE="$(echo ${FILE} | sed -e 's|chroot||')" - - if [ ! -e "${FILE}" ] - then - INSTALL_STATUS=2 - else - INSTALL_STATUS=0 - fi + INSTALL_STATUS=0 fi - ;; - esac + fi + fi } diff --git a/functions/releases.sh b/functions/releases.sh deleted file mode 100755 index 4c679cd..0000000 --- a/functions/releases.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann -## -## This program 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. - - -# Debian releases -RELEASE_wheezy="7" -RELEASE_jessie="8" -RELEASE_sid="unstable" - -# Progress Linux releases -RELEASE_baureo="2" -RELEASE_charon="3" - -# Ubuntu releases -RELEASE_lucid="10.04" # LTS: 2015-04-01 -RELEASE_precise="12.04" # LTS: 2017-04-01 -RELEASE_quantal="12.10" # 2014-04-01 -RELEASE_raring="13.04" # 2014-10-01 diff --git a/functions/stagefile.sh b/functions/stagefile.sh index 4bcb119..c1be52c 100755 --- a/functions/stagefile.sh +++ b/functions/stagefile.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/templates.sh b/functions/templates.sh deleted file mode 100755 index d74c943..0000000 --- a/functions/templates.sh +++ /dev/null @@ -1,25 +0,0 @@ -#!/bin/sh - -## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann -## -## This program 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. - - -Check_templates () -{ - PACKAGE="${1}" - - if [ -d "config/templates/${PACKAGE}" ] - then - TEMPLATES="config/templates/${PACKAGE}" - elif [ -d "${LB_TEMPLATES}/${PACKAGE}" ] - then - TEMPLATES="${LB_TEMPLATES}/${PACKAGE}" - else - Echo_error "%s templates not accessible in %s nor config/templates" "${PACKAGE}" "${LB_TEMPLATES}" - exit 1 - fi -} diff --git a/functions/usage.sh b/functions/usage.sh index b70b862..86809ad 100755 --- a/functions/usage.sh +++ b/functions/usage.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/functions/wrapper.sh b/functions/wrapper.sh index f1eac86..136f4f9 100755 --- a/functions/wrapper.sh +++ b/functions/wrapper.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - System Build Scripts -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it diff --git a/manpages/bin/update-version.sh b/manpages/bin/update-version.sh index a98fd90..f1c8afd 100755 --- a/manpages/bin/update-version.sh +++ b/manpages/bin/update-version.sh @@ -1,7 +1,7 @@ #!/bin/sh ## live-build(7) - Live System Build Components -## Copyright (C) 2006-2014 Daniel Baumann +## Copyright (C) 2006-2015 Daniel Baumann ## ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This is free software, and you are welcome to redistribute it @@ -35,8 +35,8 @@ then for _FILE in po/${_LANGUAGE}/*.po do - sed -i -e "s|^msgstr .*.2014-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ - -e "s|^msgstr .*.2014\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ + sed -i -e "s|^msgstr .*.2015-.*$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ + -e "s|^msgstr .*.2015\"$|msgstr \"${DAY}.${MONTH}.${YEAR}\"|g" \ "${_FILE}" done fi @@ -47,8 +47,8 @@ then for _FILE in po/pt_BR/*.po do - sed -i -e "s|^msgstr .*.2014-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ - -e "s|^msgstr .*-2014\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ + sed -i -e "s|^msgstr .*.2015-.*$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ + -e "s|^msgstr .*-2015\"$|msgstr \"${DAY}-${MONTH}-${YEAR}\"|g" \ "${_FILE}" done fi diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index bd43e2d..20844e8 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb\fR \- wrapper for live\-build programs diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1 index 7197bd8..18792f1 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb binary\fR \- Complete the binary stage diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1 index b47d801..d10b1b1 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb bootstrap\fR \- Complete the bootstrap stage diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1 index 842117b..6e886b9 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1 index ba049ba..391565c 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb chroot\fR \- Complete the chroot stage diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1 index ccf7ade..c511111 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb clean\fR \- Clean build directory diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index b612f87..3c0255f 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb config\fR \- Create config directory @@ -40,8 +40,6 @@ [\fB\-\-bootappend\-live\fR \fIPARAMETER\fR|\fI"PARAMETERS"\fR] .br [\fB\-\-bootloader\fR grub|grub2|syslinux] -.br - [\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap] .br [\fB\-\-cache\fR true|false] .br @@ -267,8 +265,6 @@ sets boot parameters specific to debian\-live. A complete list of boot parameters can be found in the \fIlive\-boot\fR(7) and \fIlive\-config\fR(7) manual pages. .IP "\fB\-\-bootloader\fR grub|grub2|syslinux" 4 defines which bootloader is being used in the generated image. This has only an effect if the selected binary image type does allow to choose the bootloader. For example, if you build a iso, always syslinux (or more precise, isolinux) is being used. Also note that some combinations of binary images types and bootloaders may be possible but live\-build does not support them yet. \fBlb config\fR will fail to create such a not yet supported configuration and give a explanation about it. For hdd images on amd64 and i386, the default is syslinux. -.IP "\fB\-\-bootstrap\fR cdebootstrap|cdebootstrap-static|debootstrap" 4 -defines which program is used to bootstrap the debian chroot, default is debootstrap. .IP "\fB\-\-cache\fR true|false" 4 defines globally if any cache should be used at all. Different caches can be controlled through the their own options. .IP "\fB\-\-cache\-indices\fR true|false" 4 @@ -348,7 +344,7 @@ .IP "\-k|\fB\-\-linux\-flavours\fR \fIFLAVOUR\fR|""\fIFLAVOURS\fR""" 4 sets the kernel flavours to be installed. Note that in case you specify more than that the first will be configured the default kernel that gets booted. .IP "\fB\-\-linux\-packages\fR ""\fIPACKAGES\fR""" 4 -sets the internal name of the kernel packages naming scheme. If you use debian kernel packages, you will not have to adjust it. If you decide to use custom kernel packages that do not follow the debian naming scheme, remember to set this option to the stub of the packages only (for debian this is linux\-image\-2.6), so that \fISTUB\fR-\fIFLAVOUR\fR results in a valid package name (for debian e.g. linux\-image\-2.6\-486). Preferably you use the meta package name, if any, for the stub, so that your configuration is ABI independent. Also don't forget that you have to include stubs of the binary modules packages for unionfs or aufs, and squashfs if you built them out-of-tree. +sets the internal name of the kernel packages naming scheme. If you use debian kernel packages, you will not have to adjust it. If you decide to use custom kernel packages that do not follow the debian naming scheme, remember to set this option to the stub of the packages only (for debian this is linux\-image\-2.6), so that \fISTUB\fR-\fIFLAVOUR\fR results in a valid package name (for debian e.g. linux\-image\-586). Preferably you use the meta package name, if any, for the stub, so that your configuration is ABI independent. Also don't forget that you have to include stubs of the binary modules packages for unionfs or aufs, and squashfs if you built them out-of-tree. .IP "\fB\-\-losetup\fR losetup|losetup.orig" 4 sets the filename of the losetup binary from the host system that should be used. This is autodetected and does generally not need any customization. .IP "\fB\-\-memtest\fR memtest86+|memtest86|none" 4 @@ -364,7 +360,7 @@ .IP "\fB\-\-parent\-mirror\-chroot\-backports\fR \fIURL\fR" 4 sets the location of the debian backports package mirror that will be used to fetch packages in order to build the live system. By default, this points to http://backports.debian.org/debian-backports/. .IP "\fB\-\-parent\-mirror\-binary\fR \fIURL\fR" 4 -sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://http.debian.net/debian/' is used. +sets the location of the debian package mirror that should end up configured in the final image and which is the one a user would see and use. This has not necessarily to be the same that is used to build the image, e.g. if you use a local mirror but want to have an official mirror in the image. By default, 'http://httpredir.debian.org/debian/' is used. .IP "\fB\-\-parent\-mirror\-binary\-security\fR \fIURL\fR" 4 sets the location of the debian security package mirror that should end up configured in the final image. By default, 'http://security.debian.org/' is used. .IP "\fB\-\-parent\-mirror\-binary\-updates\fR \fIURL\fR" 4 diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index 6137ec5..483f007 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlb source\fR \- Complete the source stage diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index fec5869..3b79cd2 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -1,4 +1,4 @@ -.TH LIVE\-BUILD 7 2014\-12\-10 4.0.4-1 "Live Systems Project" +.TH LIVE\-BUILD 7 2015\-08\-23 5.0~a11-1 "Live Systems Project" .SH NAME \fBlive\-build\fR \- the live systems tool suite @@ -86,8 +86,6 @@ .SS Bootstrap commands .IP "\fBlb_bootstrap_cache\fR(1)" 4 cache bootstrap stage -.IP "\fBlb_bootstrap_cdebootstrap\fR(1)" 4 -bootstrap a Debian system with cdebootstrap(1) .IP "\fBlb_bootstrap_debootstrap\fR(1)" 4 bootstrap a Debian system with debootstrap(8) .SS Chroot commands diff --git a/manpages/ja/lb.ja.1 b/manpages/ja/lb.ja.1 index eadd263..c204952 100644 --- a/manpages/ja/lb.ja.1 +++ b/manpages/ja/lb.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb\fP \- live\-build プログラムのラッパー diff --git a/manpages/ja/lb_binary.ja.1 b/manpages/ja/lb_binary.ja.1 index 4702455..2a89a52 100644 --- a/manpages/ja/lb_binary.ja.1 +++ b/manpages/ja/lb_binary.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb binary\fP \- バイナリ段階を完了させます diff --git a/manpages/ja/lb_bootstrap.ja.1 b/manpages/ja/lb_bootstrap.ja.1 index 9aaeb1b..ed98e65 100644 --- a/manpages/ja/lb_bootstrap.ja.1 +++ b/manpages/ja/lb_bootstrap.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb bootstrap\fP \- パッケージ収集段階を完了させます diff --git a/manpages/ja/lb_build.ja.1 b/manpages/ja/lb_build.ja.1 index c0ed7bd..7843f0e 100644 --- a/manpages/ja/lb_build.ja.1 +++ b/manpages/ja/lb_build.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb build\fP \- パッケージ収集、chroot、バイナリ、ソース段階を完了させます diff --git a/manpages/ja/lb_chroot.ja.1 b/manpages/ja/lb_chroot.ja.1 index e4f6fe3..91cd636 100644 --- a/manpages/ja/lb_chroot.ja.1 +++ b/manpages/ja/lb_chroot.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb chroot\fP \- chroot 段階を完了させます diff --git a/manpages/ja/lb_clean.ja.1 b/manpages/ja/lb_clean.ja.1 index bb0a06d..eac71e0 100644 --- a/manpages/ja/lb_clean.ja.1 +++ b/manpages/ja/lb_clean.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb clean\fP \- 設定ディレクトリを掃除します diff --git a/manpages/ja/lb_config.ja.1 b/manpages/ja/lb_config.ja.1 index 70e5eeb..5e6d3a9 100644 --- a/manpages/ja/lb_config.ja.1 +++ b/manpages/ja/lb_config.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb config\fP \- 設定ディレクトリを作成します @@ -45,8 +45,6 @@ [\fB\-\-bootappend\-live\fP \fIパラメータ\fP|\fI"パラメータ"\fP] .br [\fB\-\-bootloader\fP grub|grub2|syslinux] -.br - [\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap] .br [\fB\-\-cache\fP true|false] .br @@ -304,8 +302,6 @@ でのサポートが追いついていないものがあり得ることに注意してください。\fBlb config\fP はそういった未サポートの設定の作成には失敗し、そのことについて説明します。amd64 や i386 用のhddイメージでは syslinux がデフォルトとなっています。 -.IP "\fB\-\-bootstrap\fP cdebootstrap|cdebootstrap\-static|debootstrap" 4 -debian chroot でのパッケージ収集に利用するプログラムを選択します。デフォルトでは debootstrap となっています。 .IP "\fB\-\-cache\fP true|false" 4 全体としてキャッシュを使うか否か大域的に決定します。異なるキャッシュを、キャッシュそれぞれのオプションで制御できます。 .IP "\fB\-\-cache\-indices\fP true|false" 4 @@ -432,8 +428,7 @@ .IP "\fB\-\-linux\-packages\fP \(dq\fIパッケージ\fP\(dq" 4 カーネルのパッケージ命名規則に従った内部名をセットします。Debian のカーネルパッケージを利用している場合は調整する必要はありません。Debian の命名規則に従わない独自のカーネルパッケージを利用する場合にはこのオプションでパッケージの前半部 (Debian の場合は -linux\-image\-2.6) だけを忘れずに指定し、\fI前半部\fP\-\fIフレーバー\fP (Debian の場合は例えば -linux\-image\-2.6\-486) +linux\-image\-2.6) だけを忘れずに指定し、\fI前半部\fP\-\fIフレーバー\fP (Debian の場合は例えば linux\-image\-586) が有効なパッケージ名になるようにしてください。好ましいのは、メタパッケージがある場合にはその名前を前半部に使うことで、そうすると設定とABIが独立します。また、unionfs や aufs、squashfs のバイナリモジュールパッケージについても、ツリー外でビルドした場合にはその前半部を含める必要があることを忘れないようにしてください。 @@ -459,7 +454,7 @@ パッケージのミラーの場所をセットします。デフォルトでは「http://backports.debian.org/debian\-backports/」が利用されます。 .IP "\fB\-\-parent\-mirror\-binary\fP \fIURL\fP" 4 出来上がったイメージ中で設定され、ユーザが利用することになる Debian -パッケージミラーの場所を指定します。これはイメージのビルドに利用するものと同一である必要はありません。例えばローカルミラーを利用しているけれどもイメージでは公式のミラーを使うようにしたい場合。デフォルトでは「http://http.debian.net/debian/」を利用します。 +パッケージミラーの場所を指定します。これはイメージのビルドに利用するものと同一である必要はありません。例えばローカルミラーを利用しているけれどもイメージでは公式のミラーを使うようにしたい場合。デフォルトでは「http://httpredir.debian.org/debian/」を利用します。 .IP "\fB\-\-parent\-mirror\-binary\-security\fP \fIURL\fP" 4 最終的に出来上がるイメージで設定すべきセキュリティパッケージのミラーの場所をセットします。デフォルトでは「http://security.debian.org/」が利用されます。 .IP "\fB\-\-parent\-mirror\-binary\-updates\fP \fIURL\fP" 4 @@ -486,7 +481,7 @@ Live システムをビルドするために派生物のパッケージを取得するのに利用する backports パッケージのミラーの場所をセットします。デフォルトでは「http://backports.debian.org/debian\-backports/」が利用されます。 .IP "\fB\-\-mirror\-binary\fP \fIURL\fP" 4 -出来上がったイメージ中で設定され、ユーザが利用することになる派生物のパッケージミラーの場所を指定します。これはイメージのビルドに利用するものと同一である必要はありません。例えばローカルミラーを利用しているけれどもイメージでは公式のミラーを使うようにしたい場合。デフォルトでは「http://http.debian.net/debian/」を利用します。 +出来上がったイメージ中で設定され、ユーザが利用することになる派生物のパッケージミラーの場所を指定します。これはイメージのビルドに利用するものと同一である必要はありません。例えばローカルミラーを利用しているけれどもイメージでは公式のミラーを使うようにしたい場合。デフォルトでは「http://httpredir.debian.org/debian/」を利用します。 .IP "\fB\-\-mirror\-binary\-security\fP \fIURL\fP" 4 最終的に出来上がるイメージで設定すべき派生セキュリティパッケージのミラーの場所をセットします。 .IP "\fB\-\-mirror\-binary\-updates\fP \fIURL\fP" 4 diff --git a/manpages/ja/lb_source.ja.1 b/manpages/ja/lb_source.ja.1 index 843452b..bc4d142 100644 --- a/manpages/ja/lb_source.ja.1 +++ b/manpages/ja/lb_source.ja.1 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 1 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 1 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlb source\fP \- ソース段階を完了させます diff --git a/manpages/ja/live-build.ja.7 b/manpages/ja/live-build.ja.7 index 3d65b90..635be3d 100644 --- a/manpages/ja/live-build.ja.7 +++ b/manpages/ja/live-build.ja.7 @@ -3,7 +3,7 @@ .\" This file was generated with po4a. Translate the source file. .\" .\"******************************************************************* -.TH LIVE\-BUILD 7 2014\-12\-10 4.0.4\-1 "Live システムプロジェクト" +.TH LIVE\-BUILD 7 2015\-08\-23 5.0~a11\-1 "Live システムプロジェクト" .SH 名前 \fBlive\-build\fP \- Live システムツール集 @@ -98,8 +98,6 @@ .SS パッケージ収集用のコマンド .IP \fBlb_bootstrap_cache\fP(1) 4 パッケージ収集段階をキャッシュします -.IP \fBlb_bootstrap_cdebootstrap\fP(1) 4 -cdebootstrap(1) により Debian システムのパッケージ収集を行います .IP \fBlb_bootstrap_debootstrap\fP(1) 4 debootstrap(8) により Debian システムのパッケージ収集を行います .SS "chroot コマンド" diff --git a/manpages/po/ja/lb.1.po b/manpages/po/ja/lb.1.po index 1763e25..7c6ee45 100644 --- a/manpages/po/ja/lb.1.po +++ b/manpages/po/ja/lb.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-12-10 08:24+0100\n" +"POT-Creation-Date: 2015-08-23 10:57+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "2014-12-10" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.4-1" -msgstr "" +#, fuzzy, no-wrap +msgid "2015-08-23" +msgstr "2015-02-07" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, fuzzy, no-wrap +msgid "5.0~a11-1" +msgstr "5.0~a3-1" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -79,7 +79,7 @@ #. type: SH #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9 -#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9 +#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9 #: en/live-build.7:11 #, no-wrap msgid "DESCRIPTION" @@ -96,7 +96,7 @@ #. type: SH #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14 -#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14 +#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14 #: en/live-build.7:20 #, no-wrap msgid "OPTIONS" @@ -115,8 +115,8 @@ #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 -#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17 -#: en/live-build.7:215 +#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17 +#: en/live-build.7:213 #, no-wrap msgid "FILES" msgstr "ファイル" @@ -130,37 +130,37 @@ #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 -#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20 -#: en/live-build.7:219 +#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20 +#: en/live-build.7:217 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24 -#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22 +#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22 msgid "I(7)" msgstr "I(7)" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 -#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24 -#: en/live-build.7:225 +#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24 +#: en/live-build.7:223 msgid "This program is a part of live-build." msgstr "このプログラムは live-build の一部です。" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 -#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25 -#: en/live-build.7:226 +#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25 +#: en/live-build.7:224 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 -#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27 -#: en/live-build.7:228 +#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27 +#: en/live-build.7:226 msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -172,16 +172,16 @@ #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 -#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28 -#: en/live-build.7:229 +#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28 +#: en/live-build.7:227 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 -#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30 -#: en/live-build.7:231 +#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30 +#: en/live-build.7:229 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Bug Tracking System at EIE or by " @@ -195,16 +195,16 @@ #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 -#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31 -#: en/live-build.7:232 +#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31 +#: en/live-build.7:230 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 -#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32 -#: en/live-build.7:233 +#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32 +#: en/live-build.7:231 msgid "" "live-build was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/ja/lb_binary.1.po b/manpages/po/ja/lb_binary.1.po index 28a87db..67e51ca 100644 --- a/manpages/po/ja/lb_binary.1.po +++ b/manpages/po/ja/lb_binary.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-12-10 08:24+0100\n" +"POT-Creation-Date: 2015-08-23 10:57+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "2014-12-10" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.4-1" -msgstr "" +#, fuzzy, no-wrap +msgid "2015-08-23" +msgstr "2015-02-07" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, fuzzy, no-wrap +msgid "5.0~a11-1" +msgstr "5.0~a3-1" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -64,7 +64,7 @@ #. type: SH #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9 -#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9 +#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9 #: en/live-build.7:11 #, no-wrap msgid "DESCRIPTION" @@ -72,7 +72,7 @@ #. type: SH #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14 -#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14 +#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14 #: en/live-build.7:20 #, no-wrap msgid "OPTIONS" @@ -80,8 +80,8 @@ #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 -#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17 -#: en/live-build.7:215 +#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17 +#: en/live-build.7:213 #, no-wrap msgid "FILES" msgstr "ファイル" @@ -95,37 +95,37 @@ #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 -#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20 -#: en/live-build.7:219 +#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20 +#: en/live-build.7:217 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24 -#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22 +#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22 msgid "I(7)" msgstr "I(7)" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 -#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24 -#: en/live-build.7:225 +#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24 +#: en/live-build.7:223 msgid "This program is a part of live-build." msgstr "このプログラムは live-build の一部です。" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 -#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25 -#: en/live-build.7:226 +#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25 +#: en/live-build.7:224 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 -#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27 -#: en/live-build.7:228 +#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27 +#: en/live-build.7:226 msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -137,16 +137,16 @@ #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 -#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28 -#: en/live-build.7:229 +#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28 +#: en/live-build.7:227 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 -#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30 -#: en/live-build.7:231 +#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30 +#: en/live-build.7:229 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Bug Tracking System at EIE or by " @@ -160,16 +160,16 @@ #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 -#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31 -#: en/live-build.7:232 +#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31 +#: en/live-build.7:230 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 -#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32 -#: en/live-build.7:233 +#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32 +#: en/live-build.7:231 msgid "" "live-build was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/ja/lb_bootstrap.1.po b/manpages/po/ja/lb_bootstrap.1.po index 02103b9..920cdb0 100644 --- a/manpages/po/ja/lb_bootstrap.1.po +++ b/manpages/po/ja/lb_bootstrap.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-12-10 08:24+0100\n" +"POT-Creation-Date: 2015-08-23 10:57+0200\n" "PO-Revision-Date: 2014-08-29 06:25+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "2014-12-10" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.4-1" -msgstr "" +#, fuzzy, no-wrap +msgid "2015-08-23" +msgstr "2015-02-07" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, fuzzy, no-wrap +msgid "5.0~a11-1" +msgstr "5.0~a3-1" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -64,7 +64,7 @@ #. type: SH #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9 -#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9 +#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9 #: en/live-build.7:11 #, no-wrap msgid "DESCRIPTION" @@ -72,7 +72,7 @@ #. type: SH #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14 -#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14 +#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14 #: en/live-build.7:20 #, no-wrap msgid "OPTIONS" @@ -80,8 +80,8 @@ #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 -#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17 -#: en/live-build.7:215 +#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17 +#: en/live-build.7:213 #, no-wrap msgid "FILES" msgstr "ファイル" @@ -95,37 +95,37 @@ #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 -#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20 -#: en/live-build.7:219 +#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20 +#: en/live-build.7:217 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24 -#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22 +#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22 msgid "I(7)" msgstr "I(7)" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 -#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24 -#: en/live-build.7:225 +#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24 +#: en/live-build.7:223 msgid "This program is a part of live-build." msgstr "このプログラムは live-build の一部です。" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 -#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25 -#: en/live-build.7:226 +#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25 +#: en/live-build.7:224 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 -#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27 -#: en/live-build.7:228 +#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27 +#: en/live-build.7:226 msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -137,16 +137,16 @@ #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 -#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28 -#: en/live-build.7:229 +#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28 +#: en/live-build.7:227 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 -#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30 -#: en/live-build.7:231 +#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30 +#: en/live-build.7:229 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Bug Tracking System at EIE or by " @@ -160,16 +160,16 @@ #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 -#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31 -#: en/live-build.7:232 +#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31 +#: en/live-build.7:230 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 -#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32 -#: en/live-build.7:233 +#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32 +#: en/live-build.7:231 msgid "" "live-build was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/ja/lb_build.1.po b/manpages/po/ja/lb_build.1.po index 06faa09..46b5a3c 100644 --- a/manpages/po/ja/lb_build.1.po +++ b/manpages/po/ja/lb_build.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-12-10 08:24+0100\n" +"POT-Creation-Date: 2015-08-23 10:57+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "2014-12-10" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.4-1" -msgstr "" +#, fuzzy, no-wrap +msgid "2015-08-23" +msgstr "2015-02-07" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, fuzzy, no-wrap +msgid "5.0~a11-1" +msgstr "5.0~a3-1" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -64,7 +64,7 @@ #. type: SH #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9 -#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9 +#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9 #: en/live-build.7:11 #, no-wrap msgid "DESCRIPTION" @@ -72,7 +72,7 @@ #. type: SH #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14 -#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14 +#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14 #: en/live-build.7:20 #, no-wrap msgid "OPTIONS" @@ -80,45 +80,45 @@ #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 -#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17 -#: en/live-build.7:215 +#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17 +#: en/live-build.7:213 #, no-wrap msgid "FILES" msgstr "ファイル" #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 -#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20 -#: en/live-build.7:219 +#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20 +#: en/live-build.7:217 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24 -#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22 +#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22 msgid "I(7)" msgstr "I(7)" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 -#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24 -#: en/live-build.7:225 +#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24 +#: en/live-build.7:223 msgid "This program is a part of live-build." msgstr "このプログラムは live-build の一部です。" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 -#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25 -#: en/live-build.7:226 +#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25 +#: en/live-build.7:224 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 -#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27 -#: en/live-build.7:228 +#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27 +#: en/live-build.7:226 msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -130,16 +130,16 @@ #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 -#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28 -#: en/live-build.7:229 +#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28 +#: en/live-build.7:227 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 -#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30 -#: en/live-build.7:231 +#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30 +#: en/live-build.7:229 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Bug Tracking System at EIE or by " @@ -153,16 +153,16 @@ #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 -#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31 -#: en/live-build.7:232 +#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31 +#: en/live-build.7:230 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 -#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32 -#: en/live-build.7:233 +#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32 +#: en/live-build.7:231 msgid "" "live-build was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/ja/lb_chroot.1.po b/manpages/po/ja/lb_chroot.1.po index 0471d17..706ffdd 100644 --- a/manpages/po/ja/lb_chroot.1.po +++ b/manpages/po/ja/lb_chroot.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-12-10 08:24+0100\n" +"POT-Creation-Date: 2015-08-23 10:57+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "2014-12-10" -msgstr "" - -#. type: TH -#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 -#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 -#: en/live-build.7:1 -#, no-wrap -msgid "4.0.4-1" -msgstr "" +#, fuzzy, no-wrap +msgid "2015-08-23" +msgstr "2015-02-07" + +#. type: TH +#: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 +#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 +#: en/live-build.7:1 +#, fuzzy, no-wrap +msgid "5.0~a11-1" +msgstr "5.0~a3-1" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -64,7 +64,7 @@ #. type: SH #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9 -#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9 +#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9 #: en/live-build.7:11 #, no-wrap msgid "DESCRIPTION" @@ -72,7 +72,7 @@ #. type: SH #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14 -#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14 +#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14 #: en/live-build.7:20 #, no-wrap msgid "OPTIONS" @@ -80,8 +80,8 @@ #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 -#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17 -#: en/live-build.7:215 +#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17 +#: en/live-build.7:213 #, no-wrap msgid "FILES" msgstr "ファイル" @@ -95,37 +95,37 @@ #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 -#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20 -#: en/live-build.7:219 +#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20 +#: en/live-build.7:217 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24 -#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22 +#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22 msgid "I(7)" msgstr "I(7)" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 -#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24 -#: en/live-build.7:225 +#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24 +#: en/live-build.7:223 msgid "This program is a part of live-build." msgstr "このプログラムは live-build の一部です。" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 -#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25 -#: en/live-build.7:226 +#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25 +#: en/live-build.7:224 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 -#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27 -#: en/live-build.7:228 +#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27 +#: en/live-build.7:226 msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -137,16 +137,16 @@ #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 -#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28 -#: en/live-build.7:229 +#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28 +#: en/live-build.7:227 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 -#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30 -#: en/live-build.7:231 +#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30 +#: en/live-build.7:229 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Bug Tracking System at EIE or by " @@ -160,16 +160,16 @@ #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 -#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31 -#: en/live-build.7:232 +#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31 +#: en/live-build.7:230 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 -#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32 -#: en/live-build.7:233 +#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32 +#: en/live-build.7:231 msgid "" "live-build was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/ja/lb_clean.1.po b/manpages/po/ja/lb_clean.1.po index e2e63e7..012dbc0 100644 --- a/manpages/po/ja/lb_clean.1.po +++ b/manpages/po/ja/lb_clean.1.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-12-10 08:24+0100\n" +"POT-Creation-Date: 2015-08-23 10:57+0200\n" "PO-Revision-Date: 2014-08-28 02:52+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "2014-12-10" -msgstr "" +#, fuzzy, no-wrap +msgid "2015-08-23" +msgstr "2015-02-07" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "4.0.4-1" -msgstr "" +#, fuzzy, no-wrap +msgid "5.0~a11-1" +msgstr "5.0~a3-1" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -64,7 +64,7 @@ #. type: SH #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9 -#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9 +#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9 #: en/live-build.7:11 #, no-wrap msgid "DESCRIPTION" @@ -72,7 +72,7 @@ #. type: SH #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14 -#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14 +#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14 #: en/live-build.7:20 #, no-wrap msgid "OPTIONS" @@ -80,45 +80,45 @@ #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 -#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17 -#: en/live-build.7:215 +#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17 +#: en/live-build.7:213 #, no-wrap msgid "FILES" msgstr "ファイル" #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 -#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20 -#: en/live-build.7:219 +#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20 +#: en/live-build.7:217 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24 -#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22 +#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22 msgid "I(7)" msgstr "I(7)" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 -#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24 -#: en/live-build.7:225 +#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24 +#: en/live-build.7:223 msgid "This program is a part of live-build." msgstr "このプログラムは live-build の一部です。" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 -#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25 -#: en/live-build.7:226 +#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25 +#: en/live-build.7:224 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 -#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27 -#: en/live-build.7:228 +#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27 +#: en/live-build.7:226 msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -130,16 +130,16 @@ #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 -#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28 -#: en/live-build.7:229 +#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28 +#: en/live-build.7:227 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 -#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30 -#: en/live-build.7:231 +#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30 +#: en/live-build.7:229 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Bug Tracking System at EIE or by " @@ -153,16 +153,16 @@ #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 -#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31 -#: en/live-build.7:232 +#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31 +#: en/live-build.7:230 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 -#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32 -#: en/live-build.7:233 +#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32 +#: en/live-build.7:231 msgid "" "live-build was written by Daniel Baumann EIE." msgstr "" diff --git a/manpages/po/ja/lb_config.1.po b/manpages/po/ja/lb_config.1.po index 575001e..7b8f214 100644 --- a/manpages/po/ja/lb_config.1.po +++ b/manpages/po/ja/lb_config.1.po @@ -1,12 +1,12 @@ # Japanese translations for live-build package -# Copyright (C) 2014 victory +# Copyright (C) 2014-2015 victory # This file is distributed under the same license as the live-build package. # msgid "" msgstr "" "Project-Id-Version: live-build\n" -"POT-Creation-Date: 2014-12-10 08:24+0100\n" -"PO-Revision-Date: 2014-09-07 13:13+0900\n" +"POT-Creation-Date: 2015-08-23 10:57+0200\n" +"PO-Revision-Date: 2015-02-07 14:57+0900\n" "Last-Translator: victory \n" "Language-Team: none\n" "Language: ja\n" @@ -26,17 +26,17 @@ #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "2014-12-10" -msgstr "" +#, fuzzy, no-wrap +msgid "2015-08-23" +msgstr "2015-02-07" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 #: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1 #: en/live-build.7:1 -#, no-wrap -msgid "4.0.4-1" -msgstr "" +#, fuzzy, no-wrap +msgid "5.0~a11-1" +msgstr "5.0~a3-1" #. type: TH #: en/lb.1:1 en/lb_binary.1:1 en/lb_bootstrap.1:1 en/lb_build.1:1 @@ -64,7 +64,7 @@ #. type: SH #: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9 -#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:225 en/lb_source.1:9 +#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:223 en/lb_source.1:9 #: en/live-build.7:11 #, no-wrap msgid "DESCRIPTION" @@ -72,7 +72,7 @@ #. type: SH #: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14 -#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:234 en/lb_source.1:14 +#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:232 en/lb_source.1:14 #: en/live-build.7:20 #, no-wrap msgid "OPTIONS" @@ -80,45 +80,45 @@ #. type: SH #: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17 -#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:466 en/lb_source.1:17 -#: en/live-build.7:215 +#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:462 en/lb_source.1:17 +#: en/live-build.7:213 #, no-wrap msgid "FILES" msgstr "ファイル" #. type: SH #: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22 -#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:473 en/lb_source.1:20 -#: en/live-build.7:219 +#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:469 en/lb_source.1:20 +#: en/live-build.7:217 #, no-wrap msgid "SEE ALSO" msgstr "関連項目" #. type: Plain text #: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24 -#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:475 en/lb_source.1:22 +#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:471 en/lb_source.1:22 msgid "I(7)" msgstr "I(7)" #. type: Plain text #: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26 -#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:481 en/lb_source.1:24 -#: en/live-build.7:225 +#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:477 en/lb_source.1:24 +#: en/live-build.7:223 msgid "This program is a part of live-build." msgstr "このプログラムは live-build の一部です。" #. type: SH #: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27 -#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:482 en/lb_source.1:25 -#: en/live-build.7:226 +#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:478 en/lb_source.1:25 +#: en/live-build.7:224 #, no-wrap msgid "HOMEPAGE" msgstr "ホームページ" #. type: Plain text #: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29 -#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:484 en/lb_source.1:27 -#: en/live-build.7:228 +#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:480 en/lb_source.1:27 +#: en/live-build.7:226 msgid "" "More information about live-build and the Live Systems project can be found " "on the homepage at EIE and in the manual " @@ -130,16 +130,16 @@ #. type: SH #: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30 -#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:485 en/lb_source.1:28 -#: en/live-build.7:229 +#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:481 en/lb_source.1:28 +#: en/live-build.7:227 #, no-wrap msgid "BUGS" msgstr "バグ" #. type: Plain text #: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32 -#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:487 en/lb_source.1:30 -#: en/live-build.7:231 +#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:483 en/lb_source.1:30 +#: en/live-build.7:229 msgid "" "Bugs can be reported by submitting a bugreport for the live-build package in " "the Bug Tracking System at EIE or by " @@ -153,16 +153,16 @@ #. type: SH #: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33 -#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:488 en/lb_source.1:31 -#: en/live-build.7:232 +#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:484 en/lb_source.1:31 +#: en/live-build.7:230 #, no-wrap msgid "AUTHOR" msgstr "作者" #. type: Plain text #: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34 -#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:489 en/lb_source.1:32 -#: en/live-build.7:233 +#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:485 en/lb_source.1:32 +#: en/live-build.7:231 msgid "" "live-build was written by Daniel Baumann EIE." msgstr "" @@ -262,410 +262,403 @@ #. type: Plain text #: en/lb_config.1:43 -#, fuzzy -#| msgid " [B<--bootloader> grub|syslinux]" msgid " [B<--bootloader> grub|grub2|syslinux]" -msgstr " [B<--bootloader> grub|syslinux]" +msgstr " [B<--bootloader> grub|grub2|syslinux]" #. type: Plain text #: en/lb_config.1:45 -msgid " [B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap]" -msgstr " [B<--bootstrap> cdebootstrap|cdebootstrap-static|debootstrap]" - -#. type: Plain text -#: en/lb_config.1:47 msgid " [B<--cache> true|false]" msgstr " [B<--cache> true|false]" #. type: Plain text -#: en/lb_config.1:49 +#: en/lb_config.1:47 msgid " [B<--cache-indices> true|false]" msgstr " [B<--cache-indices> true|false]" #. type: Plain text -#: en/lb_config.1:51 +#: en/lb_config.1:49 msgid " [B<--cache-packages> true|false]" msgstr " [B<--cache-packages> true|false]" #. type: Plain text -#: en/lb_config.1:53 +#: en/lb_config.1:51 msgid " [B<--cache-stages> I|I<\"STAGES\">]" msgstr " [B<--cache-stages> I<段階>|I<\"段階\">]" #. type: Plain text -#: en/lb_config.1:55 +#: en/lb_config.1:53 msgid " [B<--checksums> md5|sha1|sha256|none]" msgstr " [B<--checksums> md5|sha1|sha256|none]" #. type: Plain text -#: en/lb_config.1:57 +#: en/lb_config.1:55 msgid " [B<--compression> bzip2|gzip|lzip|none]" msgstr " [B<--compression> bzip2|gzip|lzip|none]" #. type: Plain text -#: en/lb_config.1:59 +#: en/lb_config.1:57 msgid " [B<--config> I]" msgstr " [B<--config> I]" #. type: Plain text -#: en/lb_config.1:61 +#: en/lb_config.1:59 msgid " [B<--build-with-chroot> true|false]" msgstr " [B<--build-with-chroot> true|false]" #. type: Plain text -#: en/lb_config.1:63 +#: en/lb_config.1:61 msgid " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]" msgstr " [B<--chroot-filesystem> ext2|ext3|ext4|squashfs|jffs2|none]" #. type: Plain text -#: en/lb_config.1:65 +#: en/lb_config.1:63 msgid " [B<--clean>]" msgstr " [B<--clean>]" #. type: Plain text -#: en/lb_config.1:67 +#: en/lb_config.1:65 msgid " [-c|B<--conffile> I]" msgstr " [-c|B<--conffile> I<ファイル>]" #. type: Plain text -#: en/lb_config.1:69 +#: en/lb_config.1:67 msgid " [B<--debconf-frontend> dialog|editor|noninteractive|readline]" msgstr " [B<--debconf-frontend> dialog|editor|noninteractive|readline]" #. type: Plain text -#: en/lb_config.1:71 +#: en/lb_config.1:69 msgid " [B<--debconf-priority> low|medium|high|critical]" msgstr " [B<--debconf-priority> low|medium|high|critical]" #. type: Plain text +#: en/lb_config.1:71 +msgid "" +" [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]" +msgstr "" +" [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]" + +#. type: Plain text #: en/lb_config.1:73 -msgid "" -" [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]" -msgstr "" -" [B<--debian-installer> true|cdrom|netinst|netboot|businesscard|live|false]" - -#. type: Plain text -#: en/lb_config.1:75 msgid " [B<--debian-installer-distribution> daily|I]" msgstr " [B<--debian-installer-distribution> daily|I<コード名>]" #. type: Plain text -#: en/lb_config.1:77 +#: en/lb_config.1:75 msgid " [B<--debian-installer-preseedfile> I|I]" msgstr " [B<--debian-installer-preseedfile> I<ファイル>|I]" #. type: Plain text -#: en/lb_config.1:79 +#: en/lb_config.1:77 msgid " [B<--debian-installer-gui> true|false]" msgstr " [B<--debian-installer-gui> true|false]" #. type: Plain text -#: en/lb_config.1:81 +#: en/lb_config.1:79 msgid " [B<--debug>]" msgstr " [B<--debug>]" #. type: Plain text -#: en/lb_config.1:83 +#: en/lb_config.1:81 msgid " [-d|B<--distribution> I]" msgstr " [-d|B<--distribution> I<コード名>]" #. type: Plain text -#: en/lb_config.1:85 +#: en/lb_config.1:83 msgid " [B<--parent-distribution> I]" msgstr " [B<--parent-distribution> I<コード名>]" #. type: Plain text -#: en/lb_config.1:87 +#: en/lb_config.1:85 msgid " [B<--parent-debian-installer-distribution> I]" msgstr " [B<--parent-debian-installer-distribution> I<コード名>]" #. type: Plain text -#: en/lb_config.1:89 +#: en/lb_config.1:87 msgid " [B<--dump>]" msgstr " [B<--dump>]" #. type: Plain text -#: en/lb_config.1:91 +#: en/lb_config.1:89 msgid " [B<--fdisk> fdisk|fdisk.dist]" msgstr " [B<--fdisk> fdisk|fdisk.dist]" #. type: Plain text -#: en/lb_config.1:93 +#: en/lb_config.1:91 msgid " [B<--firmware-binary true|false>]" msgstr " [B<--firmware-binary true|false>]" #. type: Plain text -#: en/lb_config.1:95 +#: en/lb_config.1:93 msgid " [B<--firmware-chroot true|false>]" msgstr " [B<--firmware-chroot true|false>]" #. type: Plain text -#: en/lb_config.1:97 +#: en/lb_config.1:95 msgid " [B<--force>]" msgstr " [B<--force>]" #. type: Plain text -#: en/lb_config.1:99 +#: en/lb_config.1:97 msgid " [B<--grub-splash> I]" msgstr " [B<--grub-splash> I<ファイル>]" #. type: Plain text -#: en/lb_config.1:101 +#: en/lb_config.1:99 msgid " [B<--gzip-options> I