[SCM] live-build branch, upstream, updated. upstream/3.0_a60-1-gee4cb97
Daniel Baumann
daniel at debian.org
Sun Sep 30 07:48:30 UTC 2012
The following commit has been merged in the upstream branch:
commit ee4cb97f1674413810b25445bddc2a5589c6391a
Author: Daniel Baumann <daniel at debian.org>
Date: Sun Sep 30 09:48:23 2012 +0200
Adding upstream version 3.0~a61.
diff --git a/VERSION b/VERSION
index f2853b3..4a81166 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-3.0~a60-1
+3.0~a61-1
diff --git a/functions/defaults.sh b/functions/defaults.sh
index 8af9c84..872dd53 100755
--- a/functions/defaults.sh
+++ b/functions/defaults.sh
@@ -717,7 +717,14 @@ Set_defaults ()
;;
ubuntu|kubuntu)
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+ case "${LB_DISTRIBUTION}" in
+ precise)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic-pae}"
+ ;;
+ *)
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-generic}"
+ ;;
+ esac
;;
*)
@@ -765,11 +772,11 @@ Set_defaults ()
ubuntu|kubuntu)
case "${LIST}" in
stripped|minimal)
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc}"
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp}"
;;
*)
- LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc powerpc64-smp}"
+ LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-powerpc-smp powerpc64-smp}"
;;
esac
;;
@@ -986,6 +993,16 @@ Set_defaults ()
LB_BOOTAPPEND_FAILSAFE="${LB_BOOTAPPEND_FAILSAFE:-memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal}"
# LB_BOOTAPPEND_LIVE
+ case "${LB_MODE}" in
+ ubuntu)
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=casper}"
+ ;;
+
+ *)
+ LB_BOOTAPPEND_LIVE="${LB_BOOTAPPEND_LIVE:-boot=live config}"
+ ;;
+ esac
+
if [ -n "${LB_DEBIAN_INSTALLER_PRESEEDFILE}" ]
then
case "${LB_BINARY_IMAGES}" in
diff --git a/functions/packagelists.sh b/functions/packagelists.sh
index 8a6141b..aad1ea2 100755
--- a/functions/packagelists.sh
+++ b/functions/packagelists.sh
@@ -43,7 +43,15 @@ Expand_packagelist ()
\!*)
_EXEC="$(echo ${_LB_LINE} | sed -e 's|^!||')"
- chroot chroot ${_EXEC}
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ chroot chroot sh -c "${_EXEC}"
+ ;;
+
+ false)
+ eval ${_EXEC}
+ ;;
+ esac
;;
\#if\ *)
diff --git a/manpages/de/lb.de.1 b/manpages/de/lb.de.1
index aafe0c6..c22b76e 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 09a4650..fc02895 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 4c3a1ce..f9daaf8 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 cfd906e..719d4a2 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 3649487..60f9938 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 3a1c76f..1bb060e 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 a8a0caa..8890e38 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
diff --git a/manpages/de/lb_source.de.1 b/manpages/de/lb_source.de.1
index dc9c445..77dd3f2 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 a8d1173..a688a35 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61\-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 e29bedf..e44d6f9 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\-09\-29 3.0~a60\-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-09\-30 3.0~a61\-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 1265455..b0b1623 100644
--- a/manpages/en/lb.1
+++ b/manpages/en/lb.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 93a46c1..2e5a824 100644
--- a/manpages/en/lb_binary.1
+++ b/manpages/en/lb_binary.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 b540b5d..ae9a91a 100644
--- a/manpages/en/lb_bootstrap.1
+++ b/manpages/en/lb_bootstrap.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 da9e922..90e6fc9 100644
--- a/manpages/en/lb_build.1
+++ b/manpages/en/lb_build.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 b6c37e8..d9c53ff 100644
--- a/manpages/en/lb_chroot.1
+++ b/manpages/en/lb_chroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 e530594..c29124a 100644
--- a/manpages/en/lb_clean.1
+++ b/manpages/en/lb_clean.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 263e134..49774ee 100644
--- a/manpages/en/lb_config.1
+++ b/manpages/en/lb_config.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-1 "Debian Live Project"
.SH NAME
\fBlb config\fR \- Create config directory
diff --git a/manpages/en/lb_source.1 b/manpages/en/lb_source.1
index 1bbd1e3..5390859 100644
--- a/manpages/en/lb_source.1
+++ b/manpages/en/lb_source.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 aeb4800..00443f6 100644
--- a/manpages/en/lb_testroot.1
+++ b/manpages/en/lb_testroot.1
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 1 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 1 2012\-09\-30 3.0~a61-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 91570ed..e0d5d63 100644
--- a/manpages/en/live-build.7
+++ b/manpages/en/live-build.7
@@ -1,4 +1,4 @@
-.TH LIVE\-BUILD 7 2012\-09\-29 3.0~a60-1 "Debian Live Project"
+.TH LIVE\-BUILD 7 2012\-09\-30 3.0~a61-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 e98d627..0ef43cc 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_binary.1.po b/manpages/po/de/lb_binary.1.po
index b205b76..94a56ac 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_bootstrap.1.po b/manpages/po/de/lb_bootstrap.1.po
index 31faa6b..a86d9bd 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_build.1.po b/manpages/po/de/lb_build.1.po
index 1547322..c7393fc 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_chroot.1.po b/manpages/po/de/lb_chroot.1.po
index 933443b..9810ba6 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_clean.1.po b/manpages/po/de/lb_clean.1.po
index 83cef7a..ef64a0d 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po
index a145556..f328cbe 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_source.1.po b/manpages/po/de/lb_source.1.po
index 8381322..628e956 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/lb_testroot.1.po b/manpages/po/de/lb_testroot.1.po
index 0c7ebe5..544d8de 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/po/de/live-build.7.po b/manpages/po/de/live-build.7.po
index f4c790d..78f740a 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb.1.pot b/manpages/pot/lb.1.pot
index 096a87b..537f287 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_binary.1.pot b/manpages/pot/lb_binary.1.pot
index 2a2bbe6..2732c6c 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_bootstrap.1.pot b/manpages/pot/lb_bootstrap.1.pot
index d379543..19f6a5d 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_build.1.pot b/manpages/pot/lb_build.1.pot
index 839e0b7..6930e95 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_chroot.1.pot b/manpages/pot/lb_chroot.1.pot
index a4c83fa..49453a8 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_clean.1.pot b/manpages/pot/lb_clean.1.pot
index 8b79f36..e44ef0b 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_config.1.pot b/manpages/pot/lb_config.1.pot
index 99ed017..6efb011 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_source.1.pot b/manpages/pot/lb_source.1.pot
index 5df9908..6d17ad9 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/lb_testroot.1.pot b/manpages/pot/lb_testroot.1.pot
index d931959..80e980f 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/manpages/pot/live-build.7.pot b/manpages/pot/live-build.7.pot
index 1d69648..aae71d4 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-09-29 14:08+0300\n"
+"POT-Creation-Date: 2012-09-30 09:47+0300\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
"Language-Team: LANGUAGE <LL at 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-09-29"
+msgid "2012-09-30"
msgstr ""
#. type: TH
@@ -37,7 +37,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 "3.0~a60-1"
+msgid "3.0~a61-1"
msgstr ""
#. type: TH
diff --git a/scripts/build/binary_debian-installer b/scripts/build/binary_debian-installer
index dd8a4d5..9720961 100755
--- a/scripts/build/binary_debian-installer
+++ b/scripts/build/binary_debian-installer
@@ -357,7 +357,14 @@ then
case "${LB_MODE}" in
ubuntu|kubuntu)
- DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+ case "${LB_DISTRIBUTION}" in
+ precise)
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic-pae"
+ ;;
+ *)
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-generic"
+ ;;
+ esac
;;
*)
@@ -383,7 +390,7 @@ then
DI_REQ_PACKAGES="yaboot"
case "${LB_MODE}" in
ubuntu|kubuntu)
- DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc linux-image-powerpc64-smp"
+ DI_PACKAGES="${DI_REQ_PACKAGES} linux-image-powerpc-smp linux-image-powerpc64-smp"
;;
*)
diff --git a/scripts/build/binary_hooks b/scripts/build/binary_hooks
index cd1270b..ef47d65 100755
--- a/scripts/build/binary_hooks
+++ b/scripts/build/binary_hooks
@@ -50,7 +50,7 @@ do
if [ -e "${FILE}" ]
then
cd binary
- ./"${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
+ "${FILE}" || { Echo_error "${_HOOK} failed (exit non-zero). You should check for errors."; exit 1 ;}
cd "${OLDPWD}"
fi
done
diff --git a/scripts/build/binary_package-lists b/scripts/build/binary_package-lists
index 8671678..ce459ab 100755
--- a/scripts/build/binary_package-lists
+++ b/scripts/build/binary_package-lists
@@ -41,15 +41,33 @@ Create_lockfile .lock
if ls config/package-lists/*.list > /dev/null 2>&1 || \
ls config/package-lists/*.list.binary > /dev/null 2>&1
then
- # Restoring cache
- Restore_cache cache/packages.chroot
-
- # Check depends
- Check_package chroot/usr/bin/apt-ftparchive apt-utils
- Check_package chroot/usr/bin/grep-aptavail dctrl-tools
-
- # Installing depends
- Install_package
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ # Restoring cache
+ Restore_cache cache/packages.chroot
+
+ # Check depends
+ Check_package chroot/usr/bin/apt-ftparchive apt-utils
+ Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+
+ # Installing depends
+ Install_package
+ ;;
+
+ false)
+ if [ ! -e /usr/bin/apt-ftparchive ]; then
+ # apt-utils
+ Echo_error "/usr/bin/apt-ftparchive - no such file."
+ exit 1
+ fi
+
+ if [ ! -e /usr/bin/grep-aptavail ]; then
+ # dctrl-tools
+ Echo_error "/usr/bin/grep-aptavail - no such file."
+ exit 1
+ fi
+ ;;
+ esac
if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
then
@@ -133,11 +151,15 @@ then
rm -rf chroot/binary.deb
mv chroot/var/lib/dpkg/status.tmp chroot/var/lib/dpkg/status
- # Removing depends
- Remove_package
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ # Removing depends
+ Remove_package
- # Saving cache
- Save_cache cache/packages.chroot
+ # Saving cache
+ Save_cache cache/packages.chroot
+ ;;
+ esac
# Creating stage file
Create_stagefile .build/binary_package-lists
diff --git a/scripts/build/binary_rootfs b/scripts/build/binary_rootfs
index 6704b52..41c284a 100755
--- a/scripts/build/binary_rootfs
+++ b/scripts/build/binary_rootfs
@@ -357,16 +357,11 @@ case "${LB_CHROOT_FILESYSTEM}" in
esac
fi
- case "${LB_PARENT_DISTRIBUTION}" in
- squeeze)
-
- ;;
-
- *)
- # FIXME: artax-backports too, once d-i has catched up
- MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
- ;;
- esac
+ if [ "${LB_PARENT_DISTRIBUTION}" != "squeeze" ] && \
+ [ "${LB_MODE}" != "ubuntu" ]
+ then
+ MKSQUASHFS_OPTIONS="${MKSQUASHFS_OPTIONS} -comp xz"
+ fi
case "${LB_BUILD_WITH_CHROOT}" in
true)
diff --git a/scripts/build/chroot_package-lists b/scripts/build/chroot_package-lists
index b85c000..8a7f2e7 100755
--- a/scripts/build/chroot_package-lists
+++ b/scripts/build/chroot_package-lists
@@ -46,14 +46,26 @@ if ls config/package-lists/*.list > /dev/null 2>&1 || \
ls config/package-lists/*.list.chroot > /dev/null 2>&1 || \
ls config/package-lists/*.list.chroot_${_PASS} > /dev/null 2>&1
then
- # Checking depends
- Check_package chroot/usr/bin/grep-aptavail dctrl-tools
-
- # Restoring cache
- Restore_cache cache/packages.chroot
-
- # Installing depends
- Install_package
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ # Checking depends
+ Check_package chroot/usr/bin/grep-aptavail dctrl-tools
+
+ # Restoring cache
+ Restore_cache cache/packages.chroot
+
+ # Installing depends
+ Install_package
+ ;;
+
+ false)
+ if [ ! -e /usr/bin/grep-aptavail ]; then
+ # dctrl-tools
+ Echo_error "/usr/bin/grep-aptavail - no such file."
+ exit 1
+ fi
+ ;;
+ esac
if [ -e "${LIVE_BUILD}/share/bin/Packages" ]
then
@@ -76,15 +88,19 @@ then
rm -f chroot/bin/Packages
- # Removing dctrl-tools again if the user has not installed it
- if ! grep -qs dctrl-tools chroot/root/packages.chroot
- then
- # Removing depends
- Remove_package
- fi
-
- # Saving cache
- Save_cache cache/packages.binary
+ case "${LB_BUILD_WITH_CHROOT}" in
+ true)
+ # Removing dctrl-tools again if the user has not installed it
+ if ! grep -qs dctrl-tools chroot/root/packages.chroot
+ then
+ # Removing depends
+ Remove_package
+ fi
+
+ # Saving cache
+ Save_cache cache/packages.binary
+ ;;
+ esac
# Creating stage file
Create_stagefile .build/chroot_package-lists.${_PASS}
diff --git a/scripts/build/chroot_resolv b/scripts/build/chroot_resolv
index b82e366..42ba071 100755
--- a/scripts/build/chroot_resolv
+++ b/scripts/build/chroot_resolv
@@ -90,6 +90,13 @@ case "${1}" in
Truncate chroot/etc/resolv.conf
fi
+ # Clean up resolvconf's pollution
+ if [ -e chroot/etc/resolvconf/resolv.conf.d ]
+ then
+ rm -f chroot/etc/resolvconf/resolv.conf.d/original
+ rm -f chroot/etc/resolvconf/resolv.conf.d/tail
+ fi
+
# Removing stage file
rm -f .build/chroot_resolv
;;
diff --git a/share/bin/Packages b/share/bin/Packages
index 33d94ff..a839e9a 100755
--- a/share/bin/Packages
+++ b/share/bin/Packages
@@ -17,7 +17,7 @@ then
exit 1
fi
-if [ -z "${@}" ]
+if [ -z "${2}" ]
then
echo "Usage: $(basename ${0}) FIELD VALUE"
diff --git a/share/bootloaders/extlinux/live.cfg.in b/share/bootloaders/extlinux/live.cfg.in
index e89e59c..8dca4d5 100644
--- a/share/bootloaders/extlinux/live.cfg.in
+++ b/share/bootloaders/extlinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@
label live- at FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/isolinux/live.cfg.in b/share/bootloaders/isolinux/live.cfg.in
index e89e59c..8dca4d5 100644
--- a/share/bootloaders/isolinux/live.cfg.in
+++ b/share/bootloaders/isolinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@
label live- at FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/pxelinux/live.cfg.in b/share/bootloaders/pxelinux/live.cfg.in
index e89e59c..8dca4d5 100644
--- a/share/bootloaders/pxelinux/live.cfg.in
+++ b/share/bootloaders/pxelinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@
label live- at FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
diff --git a/share/bootloaders/syslinux/live.cfg.in b/share/bootloaders/syslinux/live.cfg.in
index e89e59c..8dca4d5 100644
--- a/share/bootloaders/syslinux/live.cfg.in
+++ b/share/bootloaders/syslinux/live.cfg.in
@@ -2,10 +2,12 @@ label live- at FLAVOUR@
menu label ^Live (@FLAVOUR@)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@
label live- at FLAVOUR@-failsafe
menu label ^Live (@FLAVOUR@ failsafe)
menu default
kernel @KERNEL@
- append initrd=@INITRD@ boot=live config @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
+ initrd @INITRD@
+ append @LB_BOOTAPPEND_LIVE@ @LB_BOOTAPPEND_FAILSAFE@
--
live-build
More information about the debian-live-changes
mailing list