manuel
/
live-build
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Renaming progress mode to progress-linux to match the used naming scheme.

This commit is contained in:
Daniel Baumann 2012-10-25 13:36:12 +02:00
parent 743cf9775d
commit 2caef33ea2
50 changed files with 120 additions and 124 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

74
functions/defaults.sh
View File

@ -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}"
;;
@ -292,11 +292,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 +367,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 +402,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 +424,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 +456,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 +473,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 +510,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 +537,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 +568,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 +579,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 +592,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 +692,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 +739,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 +752,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 +785,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 +798,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 +882,7 @@ Set_defaults ()
# Setting apt indices
case "${LB_MODE}" in
progress)
progress-linux)
LB_APT_INDICES="${LB_APT_INDICES:-none}"
;;
@ -929,7 +925,7 @@ Set_defaults ()
# Setting debian-installer option
case "${LB_MODE}" in
progress)
progress-linux)
LB_DEBIAN_INSTALLER="${LB_DEBIAN_INSTALLER:-live}"
;;
@ -942,7 +938,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 +1037,7 @@ Set_defaults ()
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Emdebian Live}"
;;
progress)
progress-linux)
LB_ISO_APPLICATION="${LB_ISO_APPLICATION:-Progress Linux}"
;;
@ -1059,7 +1055,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 +1074,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 +1100,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 +1118,7 @@ Set_defaults ()
# Setting loadlin option
case "${LB_MODE}" in
progress|ubuntu|kubuntu)
progress-linux|ubuntu|kubuntu)
;;
@ -1146,7 +1142,7 @@ Set_defaults ()
# Setting win32-loader option
case "${LB_MODE}" in
progress|ubuntu|kubuntu)
progress-linux|ubuntu|kubuntu)
;;
@ -1173,7 +1169,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 +1189,7 @@ Set_defaults ()
# Setting syslinux theme package
case "${LB_MODE}" in
progress)
progress-linux)
LB_SYSLINUX_THEME="${LB_SYSLINUX_THEME:-progress-standard}"
;;

2
functions/releases.sh
View File

@ -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"

2
manpages/de/lb.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs

2
manpages/de/lb_binary.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage

2
manpages/de/lb_bootstrap.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage

2
manpages/de/lb_build.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages

2
manpages/de/lb_chroot.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage

2
manpages/de/lb_clean.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory

4
manpages/de/lb_config.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
@ -180,7 +180,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

2
manpages/de/lb_source.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage

2
manpages/de/lb_testroot.de.1
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root

2
manpages/de/live-build.de.7
View File

@ -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\-10\-25 3.0~a66\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite

2
manpages/en/lb.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb\fR \- wrapper for live\-build programs

2
manpages/en/lb_binary.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb binary\fR \- Complete the binary stage

2
manpages/en/lb_bootstrap.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fR \- Complete the bootstrap stage

2
manpages/en/lb_build.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb build\fR \- Complete the bootstrap, chroot, binary, and source stages

2
manpages/en/lb_chroot.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fR \- Complete the chroot stage

2
manpages/en/lb_clean.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb clean\fR \- Clean build directory

4
manpages/en/lb_config.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
@ -175,7 +175,7 @@
.br
[\fB\-\-mirror\-debian\-installer\fR \fIURL\fR]
.br
[\fB\-\-mode\fR debian|emdebian|progress|ubuntu|kubuntu]
[\fB\-\-mode\fR debian|emdebian|progress-linux|ubuntu|kubuntu]
.br
[\fB\-\-system\fR live|normal]
.br

2
manpages/en/lb_source.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb source\fR \- Complete the source stage

2
manpages/en/lb_testroot.1
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 1 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 1 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fR \- Ensure that a system is built as root

2
manpages/en/live-build.7
View File

@ -1,4 +1,4 @@
.TH LIVE\-BUILD 7 2012\-10\-22 3.0~a66-1 "Debian Live Project"
.TH LIVE\-BUILD 7 2012\-10\-25 3.0~a66-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fR \- the Debian Live tool suite

4
manpages/po/de/lb.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/po/de/lb_binary.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/po/de/lb_bootstrap.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/po/de/lb_build.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/po/de/lb_chroot.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/po/de/lb_clean.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

6
manpages/po/de/lb_config.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH
@ -598,7 +598,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:179
msgid " [B<--mode> debian|emdebian|progress|ubuntu|kubuntu]"
msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu|kubuntu]"
msgstr ""
#. type: Plain text

4
manpages/po/de/lb_source.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/po/de/lb_testroot.1.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/po/de/live-build.7.po
View File

@ -6,7 +6,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: 2012-08-02 18:55+0300\n"
"Last-Translator: Automatically generated\n"
"Language-Team: none\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/lb.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/lb_binary.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/lb_bootstrap.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/lb_build.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/lb_chroot.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/lb_clean.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

6
manpages/pot/lb_config.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH
@ -598,7 +598,7 @@ msgstr ""
#. type: Plain text
#: en/lb_config.1:179
msgid " [B<--mode> debian|emdebian|progress|ubuntu|kubuntu]"
msgid " [B<--mode> debian|emdebian|progress-linux|ubuntu|kubuntu]"
msgstr ""
#. type: Plain text

4
manpages/pot/lb_source.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/lb_testroot.1.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
manpages/pot/live-build.7.pot
View File

@ -7,7 +7,7 @@
msgid ""
msgstr ""
"Project-Id-Version: live-build VERSION\n"
"POT-Creation-Date: 2012-10-22 20:44+0300\n"
"POT-Creation-Date: 2012-10-25 13:29+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@ -29,7 +29,7 @@ msgstr ""
#: en/lb_chroot.1:1 en/lb_clean.1:1 en/lb_config.1:1 en/lb_source.1:1
#: en/lb_testroot.1:1 en/live-build.7:1
#, no-wrap
msgid "2012-10-22"
msgid "2012-10-25"
msgstr ""
#. type: TH

4
scripts/build/binary_debian-installer
View File

@ -272,10 +272,10 @@ case "${LB_DERIVATIVE}" in
URL="${LB_PARENT_MIRROR_DEBIAN_INSTALLER}/dists/${LB_PARENT_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
if [ "${LB_MODE}" = "progress" ]
if [ "${LB_MODE}" = "progress-linux" ]
then
# FIXME: normal derivatives probably don't rebuild d-i,
# but progress does.
# but progress-linux does.
URL="${LB_MIRROR_DEBIAN_INSTALLER}/dists/${LB_DEBIAN_INSTALLER_DISTRIBUTION}/main/installer-${LB_ARCHITECTURES}/current/images/"
fi
;;

2
scripts/build/binary_disk
View File

@ -72,7 +72,7 @@ case "${LB_MODE}" in
TRACE=""
;;
progress)
progress-linux)
TITLE="Progress Linux"
STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
TRACE="project/trace/archive-master.progress-linux.org"

2
scripts/build/binary_iso
View File

@ -128,7 +128,7 @@ case "${LB_BOOTLOADER}" in
syslinux)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -no-emul-boot -boot-load-size 4 -boot-info-table"
case "${LB_MODE}" in
progress)
progress-linux)
GENISOIMAGE_OPTIONS="${GENISOIMAGE_OPTIONS} -r -b boot/boot.bin -c boot/boot.cat"
GENISOIMAGE_EXCLUDE="boot/boot.bin"
;;

8
scripts/build/binary_syslinux
View File

@ -53,7 +53,7 @@ case "${LB_BINARY_IMAGES}" in
_BOOTLOADER="isolinux"
case "${LB_MODE}" in
progress)
progress-linux)
_TARGET="binary/boot"
;;
@ -72,7 +72,7 @@ case "${LB_BINARY_IMAGES}" in
_BOOTLOADER="syslinux"
case "${LB_MODE}" in
progress)
progress-linux)
_TARGET="binary/boot"
;;
@ -273,7 +273,7 @@ fi
if [ -e "${_TARGET}/splash.svg.in" ]
then
case "${LB_MODE}" in
progress)
progress-linux)
_PROJECT="Progress Linux"
if ls config/package-lists/client-gnome.list*
@ -350,7 +350,7 @@ then
fi
case "${LB_MODE}" in
progress)
progress-linux)
for _FILE in "${_TARGET}/isolinux.bin" "${_TARGET}/isolinux.cfg" "${_TARGET}/syslinux.cfg"
do
if [ -e "${_FILE}" ]

2
scripts/build/bootstrap
View File

@ -43,6 +43,6 @@ lb bootstrap_cache save ${@}
# Temporary hack for base-files wrt/ plymouth
case "${LB_DISTRIBUTION}" in
artax*)
echo '0.0.0' > chroot/etc/progress_version
echo '0.0.0' > chroot/etc/progress-linux_version
;;
esac

12
scripts/build/chroot_apt
View File

@ -147,8 +147,8 @@ case "${1}" in
fi
case "${LB_MODE}" in
progress)
if [ ! -e chroot/etc/apt/preferences.d/progress.pref ]
progress-linux)
if [ ! -e chroot/etc/apt/preferences.d/progress-linux.pref ]
then
_DISTRIBUTION="$(echo ${LB_DISTRIBUTION} | sed -e 's|-backports||')"
@ -184,7 +184,7 @@ case "${1}" in
for _DISTRIBUTION in ${_ENABLE_DISTRIBUTIONS}
do
cat >> chroot/etc/apt/preferences.d/progress.pref << EOF
cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF
Package: *
Pin: release n=${_DISTRIBUTION}
@ -196,7 +196,7 @@ EOF
for _DISTRIBUTION in ${_DISABLE_DISTRIBUTIONS}
do
cat >> chroot/etc/apt/preferences.d/progress.pref << EOF
cat >> chroot/etc/apt/preferences.d/progress-linux.pref << EOF
#Package: *
#Pin: release n=${_DISTRIBUTION}
@ -209,7 +209,7 @@ EOF
case "${LB_DISTRIBUTION}" in
artax-backports)
cat >> chroot/etc/apt/preferences.d/progress.tmp.pref << EOF
cat >> chroot/etc/apt/preferences.d/progress-linux.tmp.pref << EOF
Package: squashfs-tools
Pin: release n=squeeze
Pin-Priority: 1001
@ -323,7 +323,7 @@ EOF
fi
# Remove temporary hack to avoid squashfs version mismatch for artax-backports
rm -f chroot/etc/apt/preferences.d/progress.tmp.pref
rm -f chroot/etc/apt/preferences.d/progress-linux.tmp.pref
# Removing stage file
rm -f .build/chroot_apt

8
scripts/build/chroot_archives
View File

@ -94,7 +94,7 @@ EOF
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_MODE}" in
debian|progress)
debian|progress-linux)
case "${LB_PARENT_DISTRIBUTION}" in
sid)
@ -110,7 +110,7 @@ EOF
;;
esac
if [ "${LB_MODE}" = progress ]
if [ "${LB_MODE}" = progress-linux ]
then
echo "deb ${LB_MIRROR_CHROOT_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list
@ -664,7 +664,7 @@ EOF
if [ "${LB_SECURITY}" = "true" ]
then
case "${LB_MODE}" in
debian|progress)
debian|progress-linux)
case "${LB_PARENT_DISTRIBUTION}" in
sid)
@ -680,7 +680,7 @@ EOF
;;
esac
if [ "${LB_MODE}" = progress ]
if [ "${LB_MODE}" = progress-linux ]
then
echo "deb ${LB_MIRROR_BINARY_SECURITY} ${_DISTRIBUTION}-security ${LB_ARCHIVE_AREAS}" >> chroot/etc/apt/sources.list.d/${LB_MODE}.list

2
scripts/build/source_disk
View File

@ -72,7 +72,7 @@ case "${LB_MODE}" in
TRACE=""
;;
progress)
progress-linux)
TITLE="Progress Linux"
STRING="${VERSION} (${DISTRIBUTION}) - ${ARCHITECTURE}"
TRACE="project/trace/archive-master.progress-linux.org"