Adding upstream version 4.0~alpha38.

manpages/pot/lb-source-includes.1.pot

@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: live-build VERSION\n"
-"POT-Creation-Date: 2014-05-07 07:00+0200\n"
+"Project-Id-Version: live-build 4.0~alpha38-1\n"
+"POT-Creation-Date: 2014-06-25 21:07+0200\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"
@@ -33,7 +33,7 @@ msgstr ""
 #: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
 #: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
 #, no-wrap
-msgid "2014-05-07"
+msgid "2014-06-25"
 msgstr ""
 
 #. type: TH
@@ -43,7 +43,7 @@ msgstr ""
 #: en/lb-chroot-hooks.1:9 en/lb-chroot-includes.1:9 en/lb-init.1:9
 #: en/lb-source-hooks.1:9 en/lb-source-includes.1:9
 #, no-wrap
-msgid "4.0~alpha37-1"
+msgid "4.0~alpha38-1"
 msgstr ""
 
 #. type: TH

scripts/build/binary_syslinux

@@ -124,7 +124,7 @@ fi
 case "${LB_BUILD_WITH_CHROOT}" in
 	true)
 		case "${LB_PARENT_DISTRIBUTION}" in
-			wheezy|jessie|sid)
+			wheezy|jessie)
 				case "${_BOOTLOADER}" in
 					syslinux|extlinux)
 						Check_package chroot/usr/bin/${_BOOTLOADER} ${_BOOTLOADER}
@@ -151,7 +151,7 @@ case "${LB_BUILD_WITH_CHROOT}" in
 
 	false)
 		case "${LB_PARENT_DISTRIBUTION}" in
-			wheezy|jessie|sid)
+			wheezy|jessie)
 				case "${_BOOTLOADER}" in
 					syslinux|extlinux)
 						if [ ! -e /usr/bin/${_BOOTLOADER} ]

scripts/build/source_debian

@@ -197,3 +197,4 @@ fi
 
 # Creating stage file
 Create_stagefile .build/source_debian
+Create_stagefile .build/source

share/hooks/0020-create-mtab-symlink.hook.chroot

@@ -2,9 +2,10 @@
 
 set -e
 
-# Create /etc/mtab symlink
+# Create /etc/mtab symlink, replacing a regular file if necessary
 
 if [ ! -L /etc/mtab ]
 then
+	rm -f /etc/mtab
 	ln -s /proc/mtab /etc/mtab
 fi

templates/cgi/debian/build.html

@@ -15,6 +15,7 @@
 	<tr><td>--binary-image: </td><td>LIVE_IMAGE_TYPE</td></tr>
 	<tr><td>--distribution: </td><td>LB_DISTRIBUTION</td></tr>
 	<tr><td>--config: </td><td>_LB_CONFIG</td></tr>
+	<tr><td>--apt: </td><td>LB_APT</td></tr>
 	<tr><td>cgipackages.list.chroot: </td><td>_LB_CGIPACKAGES</td><tr>
 </table>
 

templates/cgi/debian/form.html

@@ -55,6 +55,15 @@
 				</select>
 			</td>
 		</tr>
+		<tr>
+			<td><label for="Apt">--apt:</label> </td>
+			<td>
+				<select id="Apt" name="apt" size="1" >
+					<option selected value="apt">apt</option>
+					<option value="aptitude">aptitude</option>
+				</select>
+			</td>
+		</tr>
 		<tr>
 			<td><label for="Packages">cgipackages.list.chroot:</label> </td>
 			<td><input id="Packages" name="cgipackages" maxlength="2000" size="50" type="text" /></td>