Commit e422a68c authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~alpha27.

parent cfcdd3e6
4.0~alpha26-1 4.0~alpha27-1
...@@ -627,7 +627,7 @@ Set_defaults () ...@@ -627,7 +627,7 @@ Set_defaults ()
esac esac
;; ;;
s390) s390x)
case "${LB_MODE}" in case "${LB_MODE}" in
progress-linux|ubuntu) progress-linux|ubuntu)
Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode." Echo_error "Architecture ${LIVE_IMAGE_ARCHITECTURE} not supported in the ${LB_MODE} mode."
...@@ -635,7 +635,7 @@ Set_defaults () ...@@ -635,7 +635,7 @@ Set_defaults ()
;; ;;
*) *)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-s390}" LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-s390x}"
;; ;;
esac esac
;; ;;
......
#!/bin/sh #!/bin/sh
## live-build(7) - System Build Scripts ## live-build(7) - Live System Build Components
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch> ## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
## ##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Live Systems Projekt" .TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Live Systems Projekt"
.SH NAME .SH NAME
\fBlive\-build\fP \- System Build Skripte \fBlive\-build\fP \- System Build Skripte
...@@ -59,10 +59,10 @@ unter <\fIhttp://live\-systems.org/manual/\fP> gefunden werden. ...@@ -59,10 +59,10 @@ unter <\fIhttp://live\-systems.org/manual/\fP> gefunden werden.
.SH FEHLER .SH FEHLER
Fehler können durch Einreichen eines Fehlerberichtes für das live\-build Fehler können durch Einreichen eines Fehlerberichtes für das live\-build
Paket im Debian Bug Tracking System unter Paket im Bug Tracking System unter <\fIhttp://bugs.debian.org/\fP> oder
<\fIhttp://bugs.debian.org/\fP> oder durch Senden einer E\-Mail an die durch Senden einer E\-Mail an die Live Systems Mailing Liste unter
Debian Live Mailing Liste unter <\fIdebian\-live@lists.debian.org\fP> <\fIdebian\-live@lists.debian.org\fP> (englischsprachig) mitgeteilt
(englischsprachig) mitgeteilt werden. werden.
.SH AUTOR .SH AUTOR
live\-build wurde von Daniel Baumann <\fImail@daniel\-baumann.ch\fP> live\-build wurde von Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Live Systems Projekt" .TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Live Systems Projekt"
.SH NAME .SH NAME
\fBlive\-build\fP \- System Build Skripte \fBlive\-build\fP \- System Build Skripte
...@@ -59,10 +59,10 @@ unter <\fIhttp://live\-systems.org/manual/\fP> gefunden werden. ...@@ -59,10 +59,10 @@ unter <\fIhttp://live\-systems.org/manual/\fP> gefunden werden.
.SH FEHLER .SH FEHLER
Fehler können durch Einreichen eines Fehlerberichtes für das live\-build Fehler können durch Einreichen eines Fehlerberichtes für das live\-build
Paket im Debian Bug Tracking System unter Paket im Bug Tracking System unter <\fIhttp://bugs.debian.org/\fP> oder
<\fIhttp://bugs.debian.org/\fP> oder durch Senden einer E\-Mail an die durch Senden einer E\-Mail an die Live Systems Mailing Liste unter
Debian Live Mailing Liste unter <\fIdebian\-live@lists.debian.org\fP> <\fIdebian\-live@lists.debian.org\fP> (englischsprachig) mitgeteilt
(englischsprachig) mitgeteilt werden. werden.
.SH AUTOR .SH AUTOR
live\-build wurde von Daniel Baumann <\fImail@daniel\-baumann.ch\fP> live\-build wurde von Daniel Baumann <\fImail@daniel\-baumann.ch\fP>
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details. .\" under certain conditions; see COPYING for details.
.\" .\"
.\" .\"
.TH LIVE\-BUILD 1 2013\-09\-19 4.0~alpha26-1 "Live Systems Project" .TH LIVE\-BUILD 1 2013\-10\-18 4.0~alpha27-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlive\-build\fR \- System Build Scripts \fBlive\-build\fR \- System Build Scripts
......
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
.\" under certain conditions; see COPYING for details. .\" under certain conditions; see COPYING for details.
.\" .\"
.\" .\"
.TH LIVE\-BUILD 1 2013\-09\-19 4.0~alpha26-1 "Live Systems Project" .TH LIVE\-BUILD 1 2013\-10\-18 4.0~alpha27-1 "Live Systems Project"
.SH NAME .SH NAME
\fBlive\-build\fR \- System Build Scripts \fBlive\-build\fR \- System Build Scripts
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Proyecto Live Systems" .TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Proyecto Live Systems"
.SH NOMBRE .SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema \fBlive\-build\fP \- Scripts de Creación del Sistema
......
...@@ -11,7 +11,7 @@ ...@@ -11,7 +11,7 @@
.\" This file was generated with po4a. Translate the source file. .\" This file was generated with po4a. Translate the source file.
.\" .\"
.\"******************************************************************* .\"*******************************************************************
.TH LIVE\-BUILD 1 19.09.2013 4.0~alpha26\-1 "Proyecto Live Systems" .TH LIVE\-BUILD 1 18.10.2013 4.0~alpha27\-1 "Proyecto Live Systems"
.SH NOMBRE .SH NOMBRE
\fBlive\-build\fP \- Scripts de Creación del Sistema \fBlive\-build\fP \- Scripts de Creación del Sistema
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~alpha26-1\n" "Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n" "POT-Creation-Date: 2013-10-18 09:45+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n" "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD" ...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-09-19" msgid "2013-10-18"
msgstr "19.09.2013" msgstr "18.10.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~alpha26-1" msgid "4.0~alpha27-1"
msgstr "4.0~alpha26-1" msgstr "4.0~alpha27-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...@@ -232,8 +232,8 @@ msgid "" ...@@ -232,8 +232,8 @@ msgid ""
"debian.org>E<gt>." "debian.org>E<gt>."
msgstr "" msgstr ""
"Fehler können durch Einreichen eines Fehlerberichtes für das live-build " "Fehler können durch Einreichen eines Fehlerberichtes für das live-build "
"Paket im Debian Bug Tracking System unter E<lt>I<http://bugs.debian.org/" "Paket im Bug Tracking System unter E<lt>I<http://bugs.debian.org/>E<gt> oder "
">E<gt> oder durch Senden einer E-Mail an die Debian Live Mailing Liste unter " "durch Senden einer E-Mail an die Live Systems Mailing Liste unter "
"E<lt>I<debian-live@lists.debian.org>E<gt> (englischsprachig) mitgeteilt " "E<lt>I<debian-live@lists.debian.org>E<gt> (englischsprachig) mitgeteilt "
"werden." "werden."
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~alpha26-1\n" "Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n" "POT-Creation-Date: 2013-10-18 09:45+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n" "Last-Translator: Daniel Baumann <mail@daniel-baumann.ch>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD" ...@@ -24,14 +24,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-09-19" msgid "2013-10-18"
msgstr "19.09.2013" msgstr "18.10.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~alpha26-1" msgid "4.0~alpha27-1"
msgstr "4.0~alpha26-1" msgstr "4.0~alpha27-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
...@@ -184,8 +184,8 @@ msgid "" ...@@ -184,8 +184,8 @@ msgid ""
"debian.org>E<gt>." "debian.org>E<gt>."
msgstr "" msgstr ""
"Fehler können durch Einreichen eines Fehlerberichtes für das live-build " "Fehler können durch Einreichen eines Fehlerberichtes für das live-build "
"Paket im Debian Bug Tracking System unter E<lt>I<http://bugs.debian.org/" "Paket im Bug Tracking System unter E<lt>I<http://bugs.debian.org/>E<gt> oder "
">E<gt> oder durch Senden einer E-Mail an die Debian Live Mailing Liste unter " "durch Senden einer E-Mail an die Live Systems Mailing Liste unter "
"E<lt>I<debian-live@lists.debian.org>E<gt> (englischsprachig) mitgeteilt " "E<lt>I<debian-live@lists.debian.org>E<gt> (englischsprachig) mitgeteilt "
"werden." "werden."
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~alpha26-1\n" "Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n" "POT-Creation-Date: 2013-10-18 09:45+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n" "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD" ...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-09-19" msgid "2013-10-18"
msgstr "19.09.2013" msgstr "18.10.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~alpha26-1" msgid "4.0~alpha27-1"
msgstr "4.0~alpha26-1" msgstr "4.0~alpha27-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
...@@ -4,8 +4,8 @@ ...@@ -4,8 +4,8 @@
# #
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build 4.0~alpha26-1\n" "Project-Id-Version: live-build 4.0~alpha27-1\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n" "POT-Creation-Date: 2013-10-18 09:45+0300\n"
"PO-Revision-Date: 2010-05-24 09:59+0300\n" "PO-Revision-Date: 2010-05-24 09:59+0300\n"
"Last-Translator: Carlos Zuferri <chals@altorricon.com>\n" "Last-Translator: Carlos Zuferri <chals@altorricon.com>\n"
"Language-Team: none\n" "Language-Team: none\n"
...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD" ...@@ -23,14 +23,14 @@ msgstr "LIVE-BUILD"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-09-19" msgid "2013-10-18"
msgstr "19.09.2013" msgstr "18.10.2013"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~alpha26-1" msgid "4.0~alpha27-1"
msgstr "4.0~alpha26-1" msgstr "4.0~alpha27-1"
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n" "POT-Creation-Date: 2013-10-18 09:45+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -25,13 +25,13 @@ msgstr "" ...@@ -25,13 +25,13 @@ msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-09-19" msgid "2013-10-18"
msgstr "" msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~alpha26-1" msgid "4.0~alpha27-1"
msgstr "" msgstr ""
#. type: TH #. type: TH
......
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: live-build VERSION\n" "Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2013-09-19 09:09+0300\n" "POT-Creation-Date: 2013-10-18 09:45+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n" "Language-Team: LANGUAGE <LL@li.org>\n"
...@@ -25,13 +25,13 @@ msgstr "" ...@@ -25,13 +25,13 @@ msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "2013-09-19" msgid "2013-10-18"
msgstr "" msgstr ""
#. type: TH #. type: TH
#: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9 #: en/lb_bootstrap_cdebootstrap.1:9 en/lb_bootstrap_debootstrap.1:9
#, no-wrap #, no-wrap
msgid "4.0~alpha26-1" msgid "4.0~alpha27-1"
msgstr "" msgstr ""
#. type: TH #. type: TH
......
...@@ -173,7 +173,7 @@ esac ...@@ -173,7 +173,7 @@ esac
case "${LB_BUILD_WITH_CHROOT}" in case "${LB_BUILD_WITH_CHROOT}" in
true) true)
Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true Chroot chroot "parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE}" || true
Chroot chroot "parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0% 100%" || true Chroot chroot "parted -a optimal -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0% 100%" || true
Chroot chroot "parted -s ${FREELO} set 1 boot on" || true Chroot chroot "parted -s ${FREELO} set 1 boot on" || true
Chroot chroot "parted -s ${FREELO} set 1 lba off" || true Chroot chroot "parted -s ${FREELO} set 1 lba off" || true
...@@ -185,7 +185,7 @@ case "${LB_BUILD_WITH_CHROOT}" in ...@@ -185,7 +185,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
false) false)
parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true parted -s ${FREELO} mklabel ${PARTITION_TABLE_TYPE} || true
parted -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0% 100% || true parted -a optimal -s ${FREELO} mkpart primary ${PARTITION_TYPE} 0% 100% || true
parted -s "${FREELO}" set 1 boot on || true parted -s "${FREELO}" set 1 boot on || true
parted -s "${FREELO}" set 1 lba off || true parted -s "${FREELO}" set 1 lba off || true
......
...@@ -55,6 +55,7 @@ lb chroot_apt install ${@} ...@@ -55,6 +55,7 @@ lb chroot_apt install ${@}
lb bootstrap_archive-keys ${@} lb bootstrap_archive-keys ${@}
lb bootstrap_archives binary ${@} lb bootstrap_archives binary ${@}
lb bootstrap_hooks ${@}
# Deconfiguring chroot # Deconfiguring chroot
lb chroot_apt remove ${@} lb chroot_apt remove ${@}
......
#!/usr/bin/python3.3 #!/usr/bin/python
## live-build(7) - System Build Scripts ## live-build(7) - Live System Build Components
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch> ## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
## ##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
...@@ -17,21 +17,22 @@ import subprocess ...@@ -17,21 +17,22 @@ import subprocess
import sys import sys
# TODO: # TODOs:
# - lockfile handling # * logfile output
# - cdebootstrap-options from config # * lockfile handling
# - use gettext for i18n # * use gettext for i18n
# - take mirrors from config/archives/debian.{bootstrap,chroot} # * cdebootstrap-options from config
# * take mirrors from config/archives/debian.{bootstrap,chroot}
def main(): def main():
## Parsing Arguments ## Parsing Arguments
arguments = argparse.ArgumentParser( arguments = argparse.ArgumentParser(
prog = 'lb bootstrap_cdebootstrap', prog = 'lb bootstrap_cdebootstrap',
usage = '%(prog)s [arguments]', usage = '%(prog)s [arguments]',
description = '''live-build contains the programs to build a live system from a configuration directory. description = '''live-build contains the components to build a live system from a configuration directory.
The lb bootstrap_cdebootstrap program bootstraps the chroot system with cdebootstrap.''', The bootstrap_cdebootstrap command bootstraps the chroot system with cdebootstrap.''',
epilog = 'See \'man lb_bootstrap_cdebootstrap\' for more information.', epilog = 'See \'man lb_bootstrap_cdebootstrap\' for more information.',
version = 'live-build 4.0', version = 'live-build 4',
formatter_class = argparse.ArgumentDefaultsHelpFormatter formatter_class = argparse.ArgumentDefaultsHelpFormatter
) )
...@@ -109,7 +110,8 @@ def main(): ...@@ -109,7 +110,8 @@ def main():
if verbose: if verbose:
print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/bootstrap/*.deb') print('I: Copying cache/packages.bootstrap/*.deb to chroot/var/cache/bootstrap/*.deb')
# Note: copy instead of move to make cache survive incomplete build # Notes:
# * copy instead of move to make cache survive incomplete build
os.makedirs('chroot/var/cache/bootstrap', exist_ok=True) os.makedirs('chroot/var/cache/bootstrap', exist_ok=True)
for package in glob.glob('cache/packages.bootstrap/*.deb'): for package in glob.glob('cache/packages.bootstrap/*.deb'):
...@@ -119,9 +121,10 @@ def main(): ...@@ -119,9 +121,10 @@ def main():
if verbose: if verbose:
print('I: Calling \'/usr/bin/debootstrap --download-only ' + cdebootstrap_options + '\'') print('I: Calling \'/usr/bin/debootstrap --download-only ' + cdebootstrap_options + '\'')
# Note: calling cdebootstrap twice: # Notes:
# - to use already downloaded /var/cache/bootstrap/*.deb on incomplete builds # * calling cdebootstrap twice:
# - to use /var/cache/boottrap/*.deb for debian-installer # - to use already downloaded /var/cache/bootstrap/*.deb on incomplete builds
# - to use /var/cache/boottrap/*.deb for debian-installer
cdebootstrap = subprocess.call('/usr/bin/cdebootstrap --download-only ' + cdebootstrap_options, shell=True) cdebootstrap = subprocess.call('/usr/bin/cdebootstrap --download-only ' + cdebootstrap_options, shell=True)
# package cache # package cache
...@@ -129,8 +132,9 @@ def main(): ...@@ -129,8 +132,9 @@ def main():
if verbose: if verbose:
print('I: Copying chroot/var/cache/bootstrap/*.deb to cache/packages.bootstrap') print('I: Copying chroot/var/cache/bootstrap/*.deb to cache/packages.bootstrap')
# Notes: - remove first to keep cache minimal # Notes:
# - remove files instead of directory to work with symlinked directory # * remove first to keep cache minimal
# * remove files instead of directory to work with symlinked directory
for package in glob.glob('cache/packages.bootstrap/*.deb'): for package in glob.glob('cache/packages.bootstrap/*.deb'):
os.remove(package) os.remove(package)
......
#!/usr/bin/python3.3 #!/usr/bin/python
## live-build(7) - System Build Scripts ## live-build(7) - Live System Build Components
## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch> ## Copyright (C) 2006-2013 Daniel Baumann <mail@daniel-baumann.ch>
## ##
## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING. ## This program comes with ABSOLUTELY NO WARRANTY; for details see COPYING.
...@@ -18,20 +18,21 @@ import sys ...@@ -18,20 +18,21 @@ import sys
# TODO: # TODO:
# - lockfile handling # * logfile output
# - debootstrap-options from config # * lockfile handling
# - use gettext for i18n # * use gettext for i18n
# - take mirrors from config/archives/debian.{bootstrap,chroot} # * debootstrap-options from config
# * take mirrors from config/archives/debian.{bootstrap,chroot}
def main(): def main():
## Parsing Arguments ## Parsing Arguments
arguments = argparse.ArgumentParser( arguments = argparse.ArgumentParser(
prog = 'lb bootstrap_debootstrap', prog = 'lb bootstrap_debootstrap',
usage = '%(prog)s [arguments]', usage = '%(prog)s [arguments]',
description = '''live-build contains the programs to build a live system from a configuration directory. description = '''live-build contains the components to build a live system from a configuration directory.
The lb bootstrap_debootstrap program bootstraps the chroot system with debootstrap.''', The bootstrap_debootstrap command bootstraps the chroot system with debootstrap.''',
epilog = 'See \'man lb_bootstrap_debootstrap\' for more information.', epilog = 'See \'man lb_bootstrap_debootstrap\' for more information.',
version = 'live-build 4