diff options
50 files changed, 120 insertions, 124 deletions
diff --git a/functions/defaults.sh b/functions/defaults.sh index e7151b6c5..ec1aa336f 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -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}" ;; diff --git a/functions/releases.sh b/functions/releases.sh index 635a2c757..61d2a3548 100755 --- a/functions/releases.sh +++ b/functions/releases.sh @@ -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" diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1 index 16881bd91..b305dd665 100644 --- a/manpages/de/lb.de.1 +++ b/manpages/de/lb.de.1 @@ -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 diff --git a/manpages/de/lb_binary.de.1 b/manpages/de/lb_binary.de.1 index cb5fba147..a11c28929 100644 --- a/manpages/de/lb_binary.de.1 +++ b/manpages/de/lb_binary.de.1 @@ -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 diff --git a/manpages/de/lb_bootstrap.de.1 b/manpages/de/lb_bootstrap.de.1 index 9a1059341..454722a80 100644 --- a/manpages/de/lb_bootstrap.de.1 +++ b/manpages/de/lb_bootstrap.de.1 @@ -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 diff --git a/manpages/de/lb_build.de.1 b/manpages/de/lb_build.de.1 index 0dccb9951..82034a3e5 100644 --- a/manpages/de/lb_build.de.1 +++ b/manpages/de/lb_build.de.1 @@ -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 diff --git a/manpages/de/lb_chroot.de.1 b/manpages/de/lb_chroot.de.1 index 1a0597a72..58d901466 100644 --- a/manpages/de/lb_chroot.de.1 +++ b/manpages/de/lb_chroot.de.1 @@ -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 diff --git a/manpages/de/lb_clean.de.1 b/manpages/de/lb_clean.de.1 index 51f9e96bd..66b122fe9 100644 --- a/manpages/de/lb_clean.de.1 +++ b/manpages/de/lb_clean.de.1 @@ -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 diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index 043981d4a..5350a617b 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -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 diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1 index 362f04f5b..5da3743fa 100644 --- a/manpages/de/lb_source.de.1 +++ b/manpages/de/lb_source.de.1 @@ -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 diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1 index 0b26095fd..4786b1779 100644 --- a/manpages/de/lb_testroot.de.1 +++ b/manpages/de/lb_testroot.de.1 @@ -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 diff --git a/manpages/de/live-build.de.7 b/manpages/de/live-build.de.7 index a595f9b01..becd4624d 100644 --- a/manpages/de/live-build.de.7 +++ b/manpages/de/live-build.de.7 @@ -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 diff --git a/manpages/en/lb.1 b/manpages/en/lb.1 index 8402ec69c..53e4c7992 100644 --- a/manpages/en/lb.1 +++ b/manpages/en/lb.1 @@ -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 diff --git a/manpages/en/lb_binary.1 b/manpages/en/lb_binary.1 index b5857769b..511069a76 100644 --- a/manpages/en/lb_binary.1 +++ b/manpages/en/lb_binary.1 @@ -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 diff --git a/manpages/en/lb_bootstrap.1 b/manpages/en/lb_bootstrap.1 index 54b073de1..a25bb3cd9 100644 --- a/manpages/en/lb_bootstrap.1 +++ b/manpages/en/lb_bootstrap.1 @@ -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 diff --git a/manpages/en/lb_build.1 b/manpages/en/lb_build.1 index 6283ac000..77f2912c7 100644 --- a/manpages/en/lb_build.1 +++ b/manpages/en/lb_build.1 @@ -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 diff --git a/manpages/en/lb_chroot.1 b/manpages/en/lb_chroot.1 index 625484bf3..01fa5e298 100644 --- a/manpages/en/lb_chroot.1 +++ b/manpages/en/lb_chroot.1 @@ -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 diff --git a/manpages/en/lb_clean.1 b/manpages/en/lb_clean.1 index e41e3c0fb..c63983fbc 100644 --- a/manpages/en/lb_clean.1 +++ b/manpages/en/lb_clean.1 @@ -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 diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index 8596660b1..085d42b9c 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -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 diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1 index dcd8d4d5d..1e18c9748 100644 --- a/manpages/en/lb_source.1 +++ b/manpages/en/lb_source.1 @@ -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 diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1 index 395f7fd6f..a822bc499 100644 --- a/manpages/en/lb_testroot.1 +++ b/manpages/en/lb_testroot.1 @@ -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 diff --git a/manpages/en/live-build.7 b/manpages/en/live-build.7 index 551c62d35..4ff6d73e4 100644 --- a/manpages/en/live-build.7 +++ b/manpages/en/live-build.7 @@ -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 diff --git a/manpages/po/de/lb.1.po b/manpages/po/de/lb.1.po index 5773c32b9..5bc1e8497 100644 --- a/manpages/po/de/lb.1.po +++ b/manpages/po/de/lb.1.po @@ -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 diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po index 3ff232b0a..cd4c14db2 100644 --- a/manpages/po/de/lb_binary.1.po +++ b/manpages/po/de/lb_binary.1.po @@ -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 diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po index fea7de072..1d9744d21 100644 --- a/manpages/po/de/lb_bootstrap.1.po +++ b/manpages/po/de/lb_bootstrap.1.po @@ -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 diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po index 7b9a7e9dc..ece92a0fe 100644 --- a/manpages/po/de/lb_build.1.po +++ b/manpages/po/de/lb_build.1.po @@ -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 diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po index 811696bc3..f3eddb4c6 100644 --- a/manpages/po/de/lb_chroot.1.po +++ b/manpages/po/de/lb_chroot.1.po @@ -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 diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po index 5e75aa544..04139ede9 100644 --- a/manpages/po/de/lb_clean.1.po +++ b/manpages/po/de/lb_clean.1.po @@ -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 diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index 85d798d61..32692033c 100644 --- a/manpages/po/de/lb_config.1.po +++ b/manpages/po/de/lb_config.1.po @@ -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 diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po index 5e015b1f5..ae1abf6f3 100644 --- a/manpages/po/de/lb_source.1.po +++ b/manpages/po/de/lb_source.1.po @@ -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 diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po index 9360d5b1d..d5f8185b4 100644 --- a/manpages/po/de/lb_testroot.1.po +++ b/manpages/po/de/lb_testroot.1.po @@ -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 diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po index bbd3d45eb..2c04933c0 100644 --- a/manpages/po/de/live-build.7.po +++ b/manpages/po/de/live-build.7.po @@ -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 diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot index 991bd01a1..5a86896cd 100644 --- a/manpages/pot/lb.1.pot +++ b/manpages/pot/lb.1.pot @@ -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 diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot index acf000028..c8c8bc114 100644 --- a/manpages/pot/lb_binary.1.pot +++ b/manpages/pot/lb_binary.1.pot @@ -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 diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot index 3fd1c52f6..968867ab3 100644 --- a/manpages/pot/lb_bootstrap.1.pot +++ b/manpages/pot/lb_bootstrap.1.pot @@ -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 diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot index c40ac963e..612027ac7 100644 --- a/manpages/pot/lb_build.1.pot +++ b/manpages/pot/lb_build.1.pot @@ -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 diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot index b88b186f5..5b5378d7e 100644 --- a/manpages/pot/lb_chroot.1.pot +++ b/manpages/pot/lb_chroot.1.pot @@ -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 diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot index 4801027b2..92c087cf3 100644 --- a/manpages/pot/lb_clean.1.pot +++ b/manpages/pot/lb_clean.1.pot @@ -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 diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot index b21f54983..78cb78fc1 100644 --- a/manpages/pot/lb_config.1.pot +++ b/manpages/pot/lb_config.1.pot @@ -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 diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot index d28091aad..c8286ae4b 100644 --- a/manpages/pot/lb_source.1.pot +++ b/manpages/pot/lb_source.1.pot @@ -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 diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot index f500a57e4..aa278f7f1 100644 --- a/manpages/pot/lb_testroot.1.pot +++ b/manpages/pot/lb_testroot.1.pot @@ -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 diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot index 1b5e84ff0..2a740b50e 100644 --- a/manpages/pot/live-build.7.pot +++ b/manpages/pot/live-build.7.pot @@ -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 diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer index 67122d9e7..c7d764476 100755 --- a/scripts/build/binary_debian-installer +++ b/scripts/build/binary_debian-installer @@ -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 ;; diff --git a/scripts/build/binary_disk b/scripts/build/binary_disk index e8e5c0ddc..c71338a90 100755 --- a/scripts/build/binary_disk +++ b/scripts/build/binary_disk @@ -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" diff --git a/scripts/build/binary_iso b/scripts/build/binary_iso index c25674bbb..d9a277379 100755 --- a/scripts/build/binary_iso +++ b/scripts/build/binary_iso @@ -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" ;; diff --git a/scripts/build/binary_syslinux b/scripts/build/binary_syslinux index 7c6c20c75..5836b0a26 100755 --- a/scripts/build/binary_syslinux +++ b/scripts/build/binary_syslinux @@ -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}" ] diff --git a/scripts/build/bootstrap b/scripts/build/bootstrap index 260445afc..9d964006f 100755 --- a/scripts/build/bootstrap +++ b/scripts/build/bootstrap @@ -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 diff --git a/scripts/build/chroot_apt b/scripts/build/chroot_apt index 62fbd4e67..b31ab94ba 100755 --- a/scripts/build/chroot_apt +++ b/scripts/build/chroot_apt @@ -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 diff --git a/scripts/build/chroot_archives b/scripts/build/chroot_archives index e4de5a209..502ff449f 100755 --- a/scripts/build/chroot_archives +++ b/scripts/build/chroot_archives @@ -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 diff --git a/scripts/build/source_disk b/scripts/build/source_disk index e51b74df3..380fdd599 100755 --- a/scripts/build/source_disk +++ b/scripts/build/source_disk @@ -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" |