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

Adding upstream version 3.0~a67.

parent eea980a5
3.0~a66-1
3.0~a67-1
......@@ -20,10 +20,10 @@ Restore_cache ()
if [ "$(stat --printf %d ${DIRECTORY})" = "$(stat --printf %d chroot/var/cache/apt/archives)" ]
then
# with hardlinks
cp -fl "${DIRECTORY}"/*.deb chroot/var/cache/apt/archives
find "${DIRECTORY}" -name "*.deb" | xargs cp -fl -t chroot/var/cache/apt/archives
else
# without hardlinks
cp "${DIRECTORY}"/*.deb chroot/var/cache/apt/archives
find "${DIRECTORY}" -name "*.deb" | xargs cp -t chroot/var/cache/apt/archives
fi
fi
fi
......
......@@ -28,7 +28,7 @@ Chroot ()
if [ "${LB_USE_FAKEROOT}" != "true" ]
then
${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS}" ${ENV} ${COMMANDS}
${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NONINTERACTIVE_SEEN="true" DEBCONF_NOWARNINGS="true" ${ENV} ${COMMANDS}
else
# Building with fakeroot/fakechroot
${LB_ROOT_COMMAND} ${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS}
......
......@@ -21,13 +21,13 @@ Set_defaults ()
# Setting system type
LB_SYSTEM="${LB_SYSTEM:-live}"
# Setting mode (currently: debian, emdebian, progress, ubuntu and kubuntu)
# Setting mode (currently: debian, emdebian, progress-linux, ubuntu and kubuntu)
if [ -x /usr/bin/lsb_release ]
then
_DISTRIBUTOR="$(lsb_release -is | tr [A-Z] [a-z])"
case "${_DISTRIBUTOR}" in
debian|progress|ubuntu)
debian|progress-linux|ubuntu)
LB_MODE="${LB_MODE:-${_DISTRIBUTOR}}"
;;
......@@ -36,9 +36,9 @@ Set_defaults ()
;;
esac
else
if [ -e /etc/progress_version ]
if [ -e /etc/progress-linux_version ]
then
LB_MODE="${LB_MODE:-progress}"
LB_MODE="${LB_MODE:-progress-linux}"
elif [ -e /etc/ubuntu_version ]
then
LB_MODE="${LB_MODE:-ubuntu}"
......@@ -49,7 +49,7 @@ Set_defaults ()
# Setting distribution name
case "${LB_MODE}" in
progress)
progress-linux)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-baureo}"
LB_DERIVATIVE="true"
;;
......@@ -66,7 +66,7 @@ Set_defaults ()
esac
case "${LB_MODE}" in
progress)
progress-linux)
case "${LB_DISTRIBUTION}" in
artax|artax-backports)
LB_PARENT_DISTRIBUTION="${LB_PARENT_DISTRIBUTION:-squeeze}"
......@@ -127,7 +127,7 @@ Set_defaults ()
# Setting apt recommends
case "${LB_MODE}" in
emdebian|progress)
emdebian|progress-linux)
LB_APT_RECOMMENDS="${LB_APT_RECOMMENDS:-false}"
;;
......@@ -141,7 +141,7 @@ Set_defaults ()
# Setting apt source
case "${LB_MODE}" in
progress)
progress-linux)
LB_APT_SOURCE_ARCHIVES="${LB_APT_SOURCE_ARCHIVES:-false}"
;;
......@@ -170,19 +170,8 @@ Set_defaults ()
# Setting debconf frontend
LB_DEBCONF_FRONTEND="${LB_DEBCONF_FRONTEND:-noninteractive}"
LB_DEBCONF_NOWARNINGS="${LB_DEBCONF_NOWARNINGS:-yes}"
LB_DEBCONF_PRIORITY="${LB_DEBCONF_PRIORITY:-critical}"
case "${LB_DEBCONF_NOWARNINGS}" in
true)
LB_DEBCONF_NOWARNINGS="yes"
;;
false)
LB_DEBCONF_NOWARNINGS="no"
;;
esac
# Setting initramfs hook
case "${LB_SYSTEM}" in
live)
......@@ -214,6 +203,18 @@ Set_defaults ()
esac
;;
progress-linux)
case "${LB_DISTRIBUTION}" in
artax|artax-backports)
LB_INITSYSTEM="${LB_INITSYSTEM:-sysvinit}"
;;
*)
LB_INITSYSTEM="${LB_INITSYSTEM:-systemd}"
;;
esac
;;
*)
case "${LB_SYSTEM}" in
live)
......@@ -292,11 +293,7 @@ Set_defaults ()
# Setting root directory
case "${LB_MODE}" in
debian)
LB_ROOT="${LB_ROOT:-debian-live}"
;;
progress)
progress-linux)
LB_ROOT="${LB_ROOT:-progress-linux}"
;;
......@@ -371,7 +368,7 @@ Set_defaults ()
LB_PARENT_MIRROR_BOOTSTRAP="${LB_PARENT_MIRROR_BOOTSTRAP:-${LB_MIRROR_BOOTSTRAP}}"
;;
progress)
progress-linux)
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/progress/}"
;;
......@@ -406,7 +403,7 @@ Set_defaults ()
LB_PARENT_MIRROR_CHROOT_SECURITY="${LB_PARENT_MIRROR_CHROOT_SECURITY:-${LB_MIRROR_CHROOT_SECURITY}}"
;;
progress)
progress-linux)
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}}"
;;
......@@ -428,7 +425,7 @@ Set_defaults ()
# Setting updates mirror to fetch packages from
case "${LB_MODE}" in
debian|progress)
debian|progress-linux)
LB_PARENT_MIRROR_CHROOT_UPDATES="${LB_PARENT_MIRROR_CHROOT_UPDATES:-${LB_PARENT_MIRROR_CHROOT}}"
LB_MIRROR_CHROOT_UPDATES="${LB_MIRROR_CHROOT_UPDATES:-${LB_MIRROR_CHROOT}}"
;;
......@@ -460,7 +457,7 @@ Set_defaults ()
LB_PARENT_MIRROR_CHROOT_BACKPORTS="${LB_PARENT_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT_BACKPORTS}}"
;;
progress)
progress-linux)
LB_MIRROR_CHROOT_BACKPORTS="${LB_MIRROR_CHROOT_BACKPORTS:-${LB_MIRROR_CHROOT}}"
;;
......@@ -477,7 +474,7 @@ Set_defaults ()
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-${LB_MIRROR_BINARY}}"
;;
progress)
progress-linux)
LB_PARENT_MIRROR_BINARY="${LB_PARENT_MIRROR_BINARY:-http://ftp.debian.org/debian/}"
LB_MIRROR_BINARY="${LB_MIRROR_BINARY:-${LB_MIRROR_CHROOT}}"
;;
......@@ -514,7 +511,7 @@ Set_defaults ()
LB_PARENT_MIRROR_BINARY_SECURITY="${LB_PARENT_MIRROR_BINARY_SECURITY:-${LB_MIRROR_BINARY_SECURITY}}"
;;
progress)
progress-linux)
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}}"
;;
......@@ -541,7 +538,7 @@ Set_defaults ()
LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-${LB_PARENT_MIRROR_BINARY}}"
;;
progress)
progress-linux)
LB_PARENT_MIRROR_BINARY_UPDATES="${LB_PARENT_MIRROR_BINARY_UPDATES:-${LB_PARENT_MIRROR_BINARY}}"
LB_MIRROR_BINARY_UPDATES="${LB_MIRROR_BINARY_UPDATES:-${LB_MIRROR_BINARY}}"
;;
......@@ -572,7 +569,7 @@ Set_defaults ()
LB_PARENT_MIRROR_BINARY_BACKPORTS="${LB_PARENT_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY_BACKPORTS}}"
;;
progress)
progress-linux)
LB_MIRROR_BINARY_BACKPORTS="${LB_MIRROR_BINARY_BACKPORTS:-${LB_MIRROR_BINARY}}"
;;
......@@ -583,7 +580,7 @@ Set_defaults ()
esac
case "${LB_MODE}" in
progress)
progress-linux)
LB_PARENT_MIRROR_DEBIAN_INSTALLER="${LB_PARENT_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
LB_MIRROR_DEBIAN_INSTALLER="${LB_MIRROR_DEBIAN_INSTALLER:-${LB_MIRROR_CHROOT}}"
;;
......@@ -596,7 +593,7 @@ Set_defaults ()
# Setting archive areas value
case "${LB_MODE}" in
progress)
progress-linux)
LB_ARCHIVE_AREAS="${LB_ARCHIVE_AREAS:-main contrib non-free}"
LB_PARENT_ARCHIVE_AREAS="${LB_PARENT_ARCHIVE_AREAS:-${LB_ARCHIVE_AREAS}}"
;;
......@@ -696,7 +693,7 @@ Set_defaults ()
i386)
case "${LB_MODE}" in
progress)
progress-linux)
case "${LB_DISTRIBUTION}" in
artax)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686}"
......@@ -743,7 +740,7 @@ Set_defaults ()
ia64)
case "${LB_MODE}" in
progress)
progress-linux)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1
;;
......@@ -756,7 +753,7 @@ Set_defaults ()
powerpc)
case "${LB_MODE}" in
progress)
progress-linux)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1
;;
......@@ -789,7 +786,7 @@ Set_defaults ()
s390)
case "${LB_MODE}" in
progress|ubuntu|kubuntu)
progress-linux|ubuntu|kubuntu)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1
;;
......@@ -802,7 +799,7 @@ Set_defaults ()
sparc)
case "${LB_MODE}" in
progress)
progress-linux)
Echo_error "Architecture ${LB_ARCHITECTURES} not supported in the ${LB_MODE} mode."
exit 1
;;
......@@ -886,7 +883,7 @@ Set_defaults ()
# Setting apt indices
case "${LB_MODE}" in
progress)
progress-linux)
LB_APT_INDICES="${LB_APT_INDICES:-none}"
;;
......@@ -929,7 +926,7 @@ Set_defaults ()
# Setting debian-installer option
case "${LB_MODE}" in
progress)
progress-linux)
LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-live}"
;;
......@@ -942,7 +939,7 @@ Set_defaults ()
# Setting debian-installer-gui
case "${LB_MODE}" in
debian|progress)
debian|progress-linux)
LB_DEBIAN_INSTALLER_GUI="${LB_DEBIAN_INSTALLER_GUI:-true}"
;;
......@@ -1041,7 +1038,7 @@ Set_defaults ()
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Emdebian Live}"
;;
progress)
progress-linux)
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}"
;;
......@@ -1059,7 +1056,7 @@ Set_defaults ()
# Set iso publisher
case "${LB_MODE}" in
progress)
progress-linux)
LB_ISO_PUBLISHER="${LB_ISO_PUBLISHER:-Progress Linux; http://www.progress-linux.org/; progress-project@lists.progress-linux.org}"
;;
......@@ -1078,7 +1075,7 @@ Set_defaults ()
LB_HDD_LABEL="${LB_HDD_LABEL:-EMDEBIAN_LIVE}"
;;
progress)
progress-linux)
LB_HDD_LABEL="${LB_HDD_LABEL:-PROGRESS_$(echo ${LB_DISTRIBUTION} | tr [a-z] [A-Z])}"
;;
......@@ -1104,7 +1101,7 @@ Set_defaults ()
LB_ISO_VOLUME="${LB_ISO_VOLUME:-Emdebian ${LB_DISTRIBUTION} \$(date +%Y%m%d-%H:%M)}"
;;
progress)
progress-linux)
LB_ISO_VOLUME="${LB_ISO_VOLUME:-Progress ${LB_DISTRIBUTION}}"
;;
......@@ -1122,7 +1119,7 @@ Set_defaults ()
# Setting loadlin option
case "${LB_MODE}" in
progress|ubuntu|kubuntu)
progress-linux|ubuntu|kubuntu)
;;
......@@ -1146,7 +1143,7 @@ Set_defaults ()
# Setting win32-loader option
case "${LB_MODE}" in
progress|ubuntu|kubuntu)
progress-linux|ubuntu|kubuntu)
;;
......@@ -1173,7 +1170,7 @@ Set_defaults ()
# Setting netboot server path
case "${LB_MODE}" in
progress)
progress-linux)
LB_NET_ROOT_PATH="${LB_NET_ROOT_PATH:-/srv/progress-linux}"
;;
......@@ -1193,7 +1190,7 @@ Set_defaults ()
# Setting syslinux theme package
case "${LB_MODE}" in
progress)
progress-linux)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-progress-standard}"
;;
......
......@@ -14,7 +14,7 @@ RELEASE_wheezy="7.0~a2"
RELEASE_jessie="8"
RELEASE_sid="unstable"
# Progress releases
# Progress Linux releases
RELEASE_artax="1.0"
RELEASE_baureo="2.0"
RELEASE_charon="unstable"
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
......@@ -71,8 +71,6 @@
[\-c|\fB\-\-conffile\fP \fIFILE\fP]
.br
[\fB\-\-debconf\-frontend\fP dialog|editor|noninteractive|readline]
.br
[\fB\-\-debconf\-nowarnings\fP true|false]
.br
[\fB\-\-debconf\-priority\fP low|medium|high|critical]
.br
......@@ -180,7 +178,7 @@
.br
[\fB\-\-mirror\-debian\-installer\fP \fIURL\fP]
.br
[\fB\-\-mode\fP debian|emdebian|progress|ubuntu|kubuntu]
[\fB\-\-mode\fP debian|emdebian|progress\-linux|ubuntu|kubuntu]
.br
[\fB\-\-system\fP live|normal]
.br
......@@ -410,10 +408,6 @@ normally used one in the config directory.
defines what value the debconf frontend should be set to inside the
chroot. Note that setting it to anything by noninteractive, which is the
default, makes your build asking questions during the build.
.IP "\fB\-\-debconf\-nowarnings\fP true|false" 4
defines if warnings of debconf should be displayed or not. Warnings from
debconf are generally very rare and by default, we skip them, if any, in
order to keep the build process entirely non interactive.
.IP "\fB\-\-debconf\-priority\fP low|medium|high|critical" 4
defines what value the debconf priority shoul dbe set to inside the
chroot. By default, it is set to critical, which means that almost no
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 7 2012\-10\-22 3.0~a66\-1 "Debian Live Project"
.TH LIVE\-BUILD 7 2012\-11\-02 3.0~a67\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
......
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs
......
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage
......
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage
......
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages
......
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-11\-02 3.0~a67-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment