Removing incomplete support for fakeroot.
This commit is contained in:
parent
04cec317cc
commit
dbfe7b10d7
|
@ -17,7 +17,7 @@ Recommends:
|
|||
gnu-fdisk
|
||||
Suggests:
|
||||
dosfstools, debian-keyring, xorriso, git, gpgv, loadlin, memtest86+ | memtest86,
|
||||
mtools, parted, squashfs-tools | mtd-tools, sudo | fakeroot, syslinux | grub,
|
||||
mtools, parted, squashfs-tools | mtd-tools, syslinux | grub,
|
||||
uuid-runtime, win32-loader
|
||||
Description: Live System Build Scripts
|
||||
live-build contains the scripts that build a live system from a configuration
|
||||
|
|
|
@ -6,7 +6,7 @@ DEFAULT_SETTINGS="/etc/live/build.conf"
|
|||
dpkg -l debootstrap cdebootstrap
|
||||
|
||||
# Checking suggests
|
||||
dpkg -l dosfstools xorriso loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools sudo fakeroot syslinux grub uuid-runtime win32-loader
|
||||
dpkg -l dosfstools xorriso loadlin memtest86+ memtest86 mtools parted squashfs-tools mtd-tools syslinux grub uuid-runtime win32-loader
|
||||
|
||||
if [ -e "${DEFAULT_SETTINGS}" ]; then
|
||||
echo "Contents of ${DEFAULT_SETTINGS}:"
|
||||
|
|
|
@ -26,13 +26,7 @@ Chroot ()
|
|||
fi
|
||||
done
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
then
|
||||
${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NONINTERACTIVE_SEEN="true" DEBCONF_NOWARNINGS="true" ${ENV} ${COMMANDS}
|
||||
else
|
||||
# Building with fakeroot/fakechroot
|
||||
${_LINUX32} chroot "${CHROOT}" ${ENV} ${COMMANDS}
|
||||
fi
|
||||
${_LINUX32} chroot "${CHROOT}" /usr/bin/env -i HOME="/root" PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" TERM="${TERM}" DEBIAN_FRONTEND="${LB_DEBCONF_FRONTEND}" DEBIAN_PRIORITY="${LB_DEBCONF_PRIORITY}" DEBCONF_NONINTERACTIVE_SEEN="true" DEBCONF_NOWARNINGS="true" ${ENV} ${COMMANDS}
|
||||
|
||||
return "${?}"
|
||||
}
|
||||
|
|
|
@ -1128,9 +1128,6 @@ Set_defaults ()
|
|||
|
||||
# Setting image type
|
||||
LB_SOURCE_IMAGES="${LB_SOURCE_IMAGES:-tar}"
|
||||
|
||||
# Setting fakeroot/fakechroot
|
||||
LB_USE_FAKEROOT="${LB_USE_FAKEROOT:-false}"
|
||||
}
|
||||
|
||||
Check_defaults ()
|
||||
|
|
|
@ -201,8 +201,6 @@
|
|||
[\fB\-\-net\-tarball\fP true|false]
|
||||
.br
|
||||
[\fB\-\-quiet\fP]
|
||||
.br
|
||||
[\fB\-\-use\-fakeroot\fP true|false]
|
||||
.br
|
||||
[\fB\-\-archives\fP \fIARCHIVE\fP|\fI"ARCHIVES"\fP]
|
||||
.br
|
||||
|
@ -670,10 +668,6 @@ reduces the verbosity of messages output by \fBlb build\fP.
|
|||
.IP "\fB\-\-archives\fP \fIARCHIVE\fP|\(dq\fIARCHIVES\fP\(dq" 4
|
||||
enables one of available third\-party archive configurations in
|
||||
/usr/share/live/build/archives.
|
||||
.IP "\fB\-\-use\-fakeroot\fP true|false" 4
|
||||
controls if live\-build should utilize fakeroot and fakechroot to try and
|
||||
avoid requiring root privillages where possible. By default, this option is
|
||||
false.
|
||||
.IP "\fB\-\-archive\-areas\fP \fIARCHIVE_AREA\fP|\(dq\fIARCHIVE_AREAS\fP\(dq" 4
|
||||
defines which package archive areas of a debian packages archive should be
|
||||
used for configured debian package mirrors. By default, this is set to
|
||||
|
|
|
@ -16,13 +16,10 @@
|
|||
Debian Live tool suite.
|
||||
.PP
|
||||
.\" FIXME
|
||||
\fBlb testroot\fP simply checks to see if you are root. If not, it exits with
|
||||
an error. Debian Live images must currently be built as real root.
|
||||
.PP
|
||||
.\" FIXME
|
||||
Note: Support for using \fIfakeroot\fP(1) and \fIsudo\fP(8) internally in
|
||||
live\-build itself is still experimental, however, calling a helper yourself
|
||||
with sudo is safe.
|
||||
\fBlb testroot\fP simply checks to see if you are root. If not, it exits with
|
||||
an error. Debian Live images must currently be built as real root (using
|
||||
sudo is fine too).
|
||||
|
||||
.SH OPTIONS
|
||||
\fBlb testroot\fP has no specific options but understands all generic
|
||||
|
|
|
@ -196,8 +196,6 @@
|
|||
[\fB\-\-net\-tarball\fR true|false]
|
||||
.br
|
||||
[\fB\-\-quiet\fR]
|
||||
.br
|
||||
[\fB\-\-use-fakeroot\fR true|false]
|
||||
.br
|
||||
[\fB\-\-archives\fR \fIARCHIVE\fR|\fI"ARCHIVES"\fR]
|
||||
.br
|
||||
|
@ -432,8 +430,6 @@ defines if a compressed tarball should be created. Disabling this options leads
|
|||
reduces the verbosity of messages output by \fBlb build\fR.
|
||||
.IP "\fB\-\-archives\fR \fIARCHIVE\fR|""\fIARCHIVES\fR""" 4
|
||||
enables one of available third-party archive configurations in /usr/share/live/build/archives.
|
||||
.IP "\fB\-\-use-fakeroot\fR true|false" 4
|
||||
controls if live\-build should utilize fakeroot and fakechroot to try and avoid requiring root privillages where possible. By default, this option is false.
|
||||
.IP "\fB\-\-archive\-areas\fR \fIARCHIVE_AREA\fR|""\fIARCHIVE_AREAS\fR""" 4
|
||||
defines which package archive areas of a debian packages archive should be used for configured debian package mirrors. By default, this is set to main. Remember to check the licenses of each packages with respect to their redistributability in your juristiction when enabling contrib or non\-free with this mechanism.
|
||||
.IP "\fB\-\-parent\-archive\-areas\fR \fIPARENT_ARCHIVE_AREA\fR|""\fIPARENT_ARCHIVE_AREAS\fR""" 4
|
||||
|
|
|
@ -10,9 +10,7 @@
|
|||
\fBlb testroot\fR is a high\-level command (porcelain) of \fIlive\-build\fR(7), the Debian Live tool suite.
|
||||
.PP
|
||||
.\" FIXME
|
||||
\fBlb testroot\fR simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root.
|
||||
.PP
|
||||
Note: Support for using \fIfakeroot\fR(1) and \fIsudo\fR(8) internally in live\-build itself is still experimental, however, calling a helper yourself with sudo is safe.
|
||||
\fBlb testroot\fR simply checks to see if you are root. If not, it exits with an error. Debian Live images must currently be built as real root (using sudo is fine too).
|
||||
.\" FIXME
|
||||
|
||||
.SH OPTIONS
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -5,7 +5,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: live-build 4.0~a10-1\n"
|
||||
"POT-Creation-Date: 2013-02-18 11:28+0100\n"
|
||||
"POT-Creation-Date: 2013-02-18 13:55+0100\n"
|
||||
"PO-Revision-Date: 2010-05-24 09:59+0300\n"
|
||||
"Last-Translator: Daniel Baumann <daniel@debian.org>\n"
|
||||
"Language-Team: none\n"
|
||||
|
@ -65,7 +65,7 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
|
||||
#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:231 en/lb_source.1:9
|
||||
#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
|
||||
#: en/lb_testroot.1:9 en/live-build.7:11
|
||||
#, no-wrap
|
||||
msgid "DESCRIPTION"
|
||||
|
@ -73,61 +73,61 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
|
||||
#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:240 en/lb_source.1:14
|
||||
#: en/lb_testroot.1:18 en/live-build.7:20
|
||||
#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
|
||||
#: en/lb_testroot.1:16 en/live-build.7:20
|
||||
#, no-wrap
|
||||
msgid "OPTIONS"
|
||||
msgstr ""
|
||||
|
||||
#. type: SH
|
||||
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
|
||||
#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:478 en/lb_source.1:17
|
||||
#: en/lb_testroot.1:21 en/live-build.7:215
|
||||
#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
|
||||
#: en/lb_testroot.1:19 en/live-build.7:215
|
||||
#, no-wrap
|
||||
msgid "FILES"
|
||||
msgstr ""
|
||||
|
||||
#. type: IP
|
||||
#: en/lb.1:20 en/lb_binary.1:18 en/lb_bootstrap.1:18 en/lb_chroot.1:18
|
||||
#: en/lb_source.1:18 en/lb_testroot.1:22
|
||||
#: en/lb_source.1:18 en/lb_testroot.1:20
|
||||
#, no-wrap
|
||||
msgid "B<none>"
|
||||
msgstr ""
|
||||
|
||||
#. type: SH
|
||||
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
|
||||
#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:485 en/lb_source.1:20
|
||||
#: en/lb_testroot.1:24 en/live-build.7:219
|
||||
#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
|
||||
#: en/lb_testroot.1:22 en/live-build.7:219
|
||||
#, no-wrap
|
||||
msgid "SEE ALSO"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
|
||||
#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:487 en/lb_source.1:22
|
||||
#: en/lb_testroot.1:26
|
||||
#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
|
||||
#: en/lb_testroot.1:24
|
||||
msgid "I<live-build>(7)"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
|
||||
#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:493 en/lb_source.1:24
|
||||
#: en/lb_testroot.1:28 en/live-build.7:225
|
||||
#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
|
||||
#: en/lb_testroot.1:26 en/live-build.7:225
|
||||
msgid "This program is a part of live-build."
|
||||
msgstr ""
|
||||
|
||||
#. type: SH
|
||||
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
|
||||
#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:494 en/lb_source.1:25
|
||||
#: en/lb_testroot.1:29 en/live-build.7:226
|
||||
#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
|
||||
#: en/lb_testroot.1:27 en/live-build.7:226
|
||||
#, no-wrap
|
||||
msgid "HOMEPAGE"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
|
||||
#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:496 en/lb_source.1:27
|
||||
#: en/lb_testroot.1:31 en/live-build.7:228
|
||||
#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
|
||||
#: en/lb_testroot.1:29 en/live-build.7:228
|
||||
msgid ""
|
||||
"More information about live-build and the Debian Live project can be found "
|
||||
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
|
||||
|
@ -136,16 +136,16 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
|
||||
#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:497 en/lb_source.1:28
|
||||
#: en/lb_testroot.1:32 en/live-build.7:229
|
||||
#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
|
||||
#: en/lb_testroot.1:30 en/live-build.7:229
|
||||
#, no-wrap
|
||||
msgid "BUGS"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
|
||||
#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:499 en/lb_source.1:30
|
||||
#: en/lb_testroot.1:34 en/live-build.7:231
|
||||
#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
|
||||
#: en/lb_testroot.1:32 en/live-build.7:231
|
||||
msgid ""
|
||||
"Bugs can be reported by submitting a bugreport for the live-build package in "
|
||||
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
|
||||
|
@ -155,16 +155,16 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
|
||||
#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:500 en/lb_source.1:31
|
||||
#: en/lb_testroot.1:35 en/live-build.7:232
|
||||
#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
|
||||
#: en/lb_testroot.1:33 en/live-build.7:232
|
||||
#, no-wrap
|
||||
msgid "AUTHOR"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
|
||||
#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:501 en/lb_source.1:32
|
||||
#: en/lb_testroot.1:36 en/live-build.7:233
|
||||
#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
|
||||
#: en/lb_testroot.1:34 en/live-build.7:233
|
||||
msgid ""
|
||||
"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
|
||||
"the Debian project."
|
||||
|
@ -188,24 +188,17 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. FIXME
|
||||
#. type: Plain text
|
||||
#: en/lb_testroot.1:14
|
||||
msgid ""
|
||||
"B<lb testroot> simply checks to see if you are root. If not, it exits with "
|
||||
"an error. Debian Live images must currently be built as real root."
|
||||
msgstr ""
|
||||
|
||||
#. FIXME
|
||||
#. type: Plain text
|
||||
#: en/lb_testroot.1:17
|
||||
#: en/lb_testroot.1:15
|
||||
msgid ""
|
||||
"Note: Support for using I<fakeroot>(1) and I<sudo>(8) internally in live-"
|
||||
"build itself is still experimental, however, calling a helper yourself with "
|
||||
"sudo is safe."
|
||||
"B<lb testroot> simply checks to see if you are root. If not, it exits with "
|
||||
"an error. Debian Live images must currently be built as real root (using "
|
||||
"sudo is fine too)."
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb_testroot.1:20
|
||||
#: en/lb_testroot.1:18
|
||||
msgid ""
|
||||
"B<lb testroot> has no specific options but understands all generic live-"
|
||||
"build options. See I<live-build>(7) for a complete list of all generic live-"
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -7,7 +7,7 @@
|
|||
msgid ""
|
||||
msgstr ""
|
||||
"Project-Id-Version: live-build VERSION\n"
|
||||
"POT-Creation-Date: 2013-02-18 11:28+0100\n"
|
||||
"POT-Creation-Date: 2013-02-18 13:55+0100\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"
|
||||
|
@ -66,7 +66,7 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:11 en/lb_binary.1:9 en/lb_bootstrap.1:9 en/lb_build.1:9
|
||||
#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:231 en/lb_source.1:9
|
||||
#: en/lb_chroot.1:9 en/lb_clean.1:9 en/lb_config.1:229 en/lb_source.1:9
|
||||
#: en/lb_testroot.1:9 en/live-build.7:11
|
||||
#, no-wrap
|
||||
msgid "DESCRIPTION"
|
||||
|
@ -74,61 +74,61 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:16 en/lb_binary.1:14 en/lb_bootstrap.1:14 en/lb_build.1:14
|
||||
#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:240 en/lb_source.1:14
|
||||
#: en/lb_testroot.1:18 en/live-build.7:20
|
||||
#: en/lb_chroot.1:14 en/lb_clean.1:16 en/lb_config.1:238 en/lb_source.1:14
|
||||
#: en/lb_testroot.1:16 en/live-build.7:20
|
||||
#, no-wrap
|
||||
msgid "OPTIONS"
|
||||
msgstr ""
|
||||
|
||||
#. type: SH
|
||||
#: en/lb.1:19 en/lb_binary.1:17 en/lb_bootstrap.1:17 en/lb_build.1:17
|
||||
#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:478 en/lb_source.1:17
|
||||
#: en/lb_testroot.1:21 en/live-build.7:215
|
||||
#: en/lb_chroot.1:17 en/lb_clean.1:38 en/lb_config.1:474 en/lb_source.1:17
|
||||
#: en/lb_testroot.1:19 en/live-build.7:215
|
||||
#, no-wrap
|
||||
msgid "FILES"
|
||||
msgstr ""
|
||||
|
||||
#. type: IP
|
||||
#: en/lb.1:20 en/lb_binary.1:18 en/lb_bootstrap.1:18 en/lb_chroot.1:18
|
||||
#: en/lb_source.1:18 en/lb_testroot.1:22
|
||||
#: en/lb_source.1:18 en/lb_testroot.1:20
|
||||
#, no-wrap
|
||||
msgid "B<none>"
|
||||
msgstr ""
|
||||
|
||||
#. type: SH
|
||||
#: en/lb.1:22 en/lb_binary.1:20 en/lb_bootstrap.1:20 en/lb_build.1:22
|
||||
#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:485 en/lb_source.1:20
|
||||
#: en/lb_testroot.1:24 en/live-build.7:219
|
||||
#: en/lb_chroot.1:20 en/lb_clean.1:43 en/lb_config.1:481 en/lb_source.1:20
|
||||
#: en/lb_testroot.1:22 en/live-build.7:219
|
||||
#, no-wrap
|
||||
msgid "SEE ALSO"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:24 en/lb_binary.1:22 en/lb_bootstrap.1:22 en/lb_build.1:24
|
||||
#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:487 en/lb_source.1:22
|
||||
#: en/lb_testroot.1:26
|
||||
#: en/lb_chroot.1:22 en/lb_clean.1:45 en/lb_config.1:483 en/lb_source.1:22
|
||||
#: en/lb_testroot.1:24
|
||||
msgid "I<live-build>(7)"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:26 en/lb_binary.1:24 en/lb_bootstrap.1:24 en/lb_build.1:26
|
||||
#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:493 en/lb_source.1:24
|
||||
#: en/lb_testroot.1:28 en/live-build.7:225
|
||||
#: en/lb_chroot.1:24 en/lb_clean.1:47 en/lb_config.1:489 en/lb_source.1:24
|
||||
#: en/lb_testroot.1:26 en/live-build.7:225
|
||||
msgid "This program is a part of live-build."
|
||||
msgstr ""
|
||||
|
||||
#. type: SH
|
||||
#: en/lb.1:27 en/lb_binary.1:25 en/lb_bootstrap.1:25 en/lb_build.1:27
|
||||
#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:494 en/lb_source.1:25
|
||||
#: en/lb_testroot.1:29 en/live-build.7:226
|
||||
#: en/lb_chroot.1:25 en/lb_clean.1:48 en/lb_config.1:490 en/lb_source.1:25
|
||||
#: en/lb_testroot.1:27 en/live-build.7:226
|
||||
#, no-wrap
|
||||
msgid "HOMEPAGE"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:29 en/lb_binary.1:27 en/lb_bootstrap.1:27 en/lb_build.1:29
|
||||
#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:496 en/lb_source.1:27
|
||||
#: en/lb_testroot.1:31 en/live-build.7:228
|
||||
#: en/lb_chroot.1:27 en/lb_clean.1:50 en/lb_config.1:492 en/lb_source.1:27
|
||||
#: en/lb_testroot.1:29 en/live-build.7:228
|
||||
msgid ""
|
||||
"More information about live-build and the Debian Live project can be found "
|
||||
"on the homepage at E<lt>I<http://live.debian.net/>E<gt> and in the manual at "
|
||||
|
@ -137,16 +137,16 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:30 en/lb_binary.1:28 en/lb_bootstrap.1:28 en/lb_build.1:30
|
||||
#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:497 en/lb_source.1:28
|
||||
#: en/lb_testroot.1:32 en/live-build.7:229
|
||||
#: en/lb_chroot.1:28 en/lb_clean.1:51 en/lb_config.1:493 en/lb_source.1:28
|
||||
#: en/lb_testroot.1:30 en/live-build.7:229
|
||||
#, no-wrap
|
||||
msgid "BUGS"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:32 en/lb_binary.1:30 en/lb_bootstrap.1:30 en/lb_build.1:32
|
||||
#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:499 en/lb_source.1:30
|
||||
#: en/lb_testroot.1:34 en/live-build.7:231
|
||||
#: en/lb_chroot.1:30 en/lb_clean.1:53 en/lb_config.1:495 en/lb_source.1:30
|
||||
#: en/lb_testroot.1:32 en/live-build.7:231
|
||||
msgid ""
|
||||
"Bugs can be reported by submitting a bugreport for the live-build package in "
|
||||
"the Debian Bug Tracking System at E<lt>I<http://bugs.debian.org/>E<gt> or by "
|
||||
|
@ -156,16 +156,16 @@ msgstr ""
|
|||
|
||||
#. type: SH
|
||||
#: en/lb.1:33 en/lb_binary.1:31 en/lb_bootstrap.1:31 en/lb_build.1:33
|
||||
#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:500 en/lb_source.1:31
|
||||
#: en/lb_testroot.1:35 en/live-build.7:232
|
||||
#: en/lb_chroot.1:31 en/lb_clean.1:54 en/lb_config.1:496 en/lb_source.1:31
|
||||
#: en/lb_testroot.1:33 en/live-build.7:232
|
||||
#, no-wrap
|
||||
msgid "AUTHOR"
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb.1:34 en/lb_binary.1:32 en/lb_bootstrap.1:32 en/lb_build.1:34
|
||||
#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:501 en/lb_source.1:32
|
||||
#: en/lb_testroot.1:36 en/live-build.7:233
|
||||
#: en/lb_chroot.1:32 en/lb_clean.1:55 en/lb_config.1:497 en/lb_source.1:32
|
||||
#: en/lb_testroot.1:34 en/live-build.7:233
|
||||
msgid ""
|
||||
"live-build was written by Daniel Baumann E<lt>I<daniel@debian.org>E<gt> for "
|
||||
"the Debian project."
|
||||
|
@ -189,24 +189,17 @@ msgid ""
|
|||
msgstr ""
|
||||
|
||||
#. FIXME
|
||||
#. type: Plain text
|
||||
#: en/lb_testroot.1:14
|
||||
msgid ""
|
||||
"B<lb testroot> simply checks to see if you are root. If not, it exits with "
|
||||
"an error. Debian Live images must currently be built as real root."
|
||||
msgstr ""
|
||||
|
||||
#. FIXME
|
||||
#. type: Plain text
|
||||
#: en/lb_testroot.1:17
|
||||
#: en/lb_testroot.1:15
|
||||
msgid ""
|
||||
"Note: Support for using I<fakeroot>(1) and I<sudo>(8) internally in live-"
|
||||
"build itself is still experimental, however, calling a helper yourself with "
|
||||
"sudo is safe."
|
||||
"B<lb testroot> simply checks to see if you are root. If not, it exits with "
|
||||
"an error. Debian Live images must currently be built as real root (using "
|
||||
"sudo is fine too)."
|
||||
msgstr ""
|
||||
|
||||
#. type: Plain text
|
||||
#: en/lb_testroot.1:20
|
||||
#: en/lb_testroot.1:18
|
||||
msgid ""
|
||||
"B<lb testroot> has no specific options but understands all generic live-"
|
||||
"build options. See I<live-build>(7) for a complete list of all generic live-"
|
||||
|
|
|
@ -41,31 +41,12 @@ Create_lockfile .lock
|
|||
# Normally, virtual filesystems are not mounted here, but people tend to be lazy
|
||||
if [ -f chroot/proc/version ]
|
||||
then
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
then
|
||||
umount chroot/proc
|
||||
else
|
||||
rm -rf chroot/proc
|
||||
mkdir -p chroot/proc
|
||||
fi
|
||||
umount chroot/proc
|
||||
fi
|
||||
|
||||
if [ -d chroot/sys/kernel ]
|
||||
then
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
then
|
||||
umount chroot/sys
|
||||
else
|
||||
rm -rf chroot/sys
|
||||
mkdir -p chroot/sys
|
||||
fi
|
||||
fi
|
||||
|
||||
# Copying /dev if using fakeroot
|
||||
if [ "${LB_USE_FAKEROOT}" = "true" ]
|
||||
then
|
||||
rm -rf chroot/dev
|
||||
find /dev | cpio -dmpu chroot
|
||||
umount chroot/sys
|
||||
fi
|
||||
|
||||
if [ "${LB_BUILD_WITH_CHROOT}" = "false" ]
|
||||
|
|
|
@ -72,12 +72,6 @@ then
|
|||
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --components=$(echo ${LIVE_IMAGE_ARCHIVE_AREAS} | sed -e 's| |,|g')"
|
||||
fi
|
||||
|
||||
case "${LB_USE_FAKEROOT}" in
|
||||
true)
|
||||
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --variant=fakechroot"
|
||||
;;
|
||||
esac
|
||||
|
||||
if [ "${_VERBOSE}" = "true" ]
|
||||
then
|
||||
DEBOOTSTRAP_OPTIONS="${DEBOOTSTRAP_OPTIONS} --verbose"
|
||||
|
|
|
@ -43,14 +43,11 @@ case "${1}" in
|
|||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
then
|
||||
# Creating mountpoint
|
||||
mkdir -p chroot/dev/pts
|
||||
# Creating mountpoint
|
||||
mkdir -p chroot/dev/pts
|
||||
|
||||
# Mounting /dev/pts
|
||||
mount devpts-live -t devpts chroot/dev/pts || true
|
||||
fi
|
||||
# Mounting /dev/pts
|
||||
mount devpts-live -t devpts chroot/dev/pts || true
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile .build/chroot_devpts
|
||||
|
@ -66,14 +63,11 @@ case "${1}" in
|
|||
Create_lockfile .lock
|
||||
|
||||
# Unmounting /dev/pts
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/*
|
||||
then
|
||||
if grep -qs "$(pwd)/chroot/dev/pts" /proc/mounts || Find_files chroot/dev/pts/*
|
||||
then
|
||||
umount chroot/dev/pts
|
||||
else
|
||||
umount -f chroot/dev/pts > /dev/null 2>&1 || true
|
||||
fi
|
||||
umount chroot/dev/pts
|
||||
else
|
||||
umount -f chroot/dev/pts > /dev/null 2>&1 || true
|
||||
fi
|
||||
|
||||
# Removing stage file
|
||||
|
|
|
@ -43,17 +43,11 @@ case "${1}" in
|
|||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
then
|
||||
# Creating mountpoint
|
||||
mkdir -p chroot/proc
|
||||
# Creating mountpoint
|
||||
mkdir -p chroot/proc
|
||||
|
||||
# Mounting /proc
|
||||
mount proc-live -t proc chroot/proc
|
||||
else
|
||||
rm -rf chroot/proc
|
||||
ln -s /proc chroot/
|
||||
fi
|
||||
# Mounting /proc
|
||||
mount proc-live -t proc chroot/proc
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile .build/chroot_proc
|
||||
|
@ -68,23 +62,16 @@ case "${1}" in
|
|||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
# Workaround binfmt-support /proc locking
|
||||
if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
|
||||
then
|
||||
# Workaround binfmt-support /proc locking
|
||||
if [ -e chroot/proc/sys/fs/binfmt_misc/status ]
|
||||
then
|
||||
umount chroot/proc/sys/fs/binfmt_misc
|
||||
fi
|
||||
umount chroot/proc/sys/fs/binfmt_misc
|
||||
fi
|
||||
|
||||
# Unmounting /proc
|
||||
#fuser -km chroot/proc
|
||||
if [ -e chroot/proc/version ]
|
||||
then
|
||||
umount chroot/proc
|
||||
fi
|
||||
else
|
||||
rm -rf chroot/proc
|
||||
mkdir -p chroot/proc
|
||||
# Unmounting /proc
|
||||
if [ -e chroot/proc/version ]
|
||||
then
|
||||
umount chroot/proc
|
||||
fi
|
||||
|
||||
# Removing stage file
|
||||
|
|
|
@ -45,17 +45,11 @@ case "${1}" in
|
|||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
then
|
||||
# Create mountpoint
|
||||
mkdir -p chroot/selinux
|
||||
# Create mountpoint
|
||||
mkdir -p chroot/selinux
|
||||
|
||||
# Mounting /selinux
|
||||
mount selinuxfs-live -t selinuxfs chroot/selinux
|
||||
else
|
||||
rm -rf chroot/selinux
|
||||
ln -s /selinux chroot/
|
||||
fi
|
||||
# Mounting /selinux
|
||||
mount selinuxfs-live -t selinuxfs chroot/selinux
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile .build/chroot_selinuxfs
|
||||
|
@ -71,20 +65,10 @@ case "${1}" in
|
|||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
# Unmounting /selinux
|
||||
if [ -e chroot/selinux/enforce ]
|
||||
then
|
||||
# Unmounting /selinux
|
||||
#fuser -km chroot/selinux
|
||||
if [ -e chroot/selinux/enforce ]
|
||||
then
|
||||
umount chroot/selinux
|
||||
fi
|
||||
else
|
||||
if [ -e chroot/selinux ]
|
||||
then
|
||||
rm -rf chroot/selinux
|
||||
mkdir -p chroot/selinux
|
||||
fi
|
||||
umount chroot/selinux
|
||||
fi
|
||||
|
||||
# Removing stage file
|
||||
|
|
|
@ -43,17 +43,11 @@ case "${1}" in
|
|||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
then
|
||||
# Create mountpoint
|
||||
mkdir -p chroot/sys
|
||||
# Create mountpoint
|
||||
mkdir -p chroot/sys
|
||||
|
||||
# Mounting /sys
|
||||
mount sysfs-live -t sysfs chroot/sys
|
||||
else
|
||||
rm -rf chroot/sys
|
||||
ln -s /sys chroot/
|
||||
fi
|
||||
# Mounting /sys
|
||||
mount sysfs-live -t sysfs chroot/sys
|
||||
|
||||
# Creating stage file
|
||||
Create_stagefile .build/chroot_sysfs
|
||||
|
@ -68,17 +62,10 @@ case "${1}" in
|
|||
# Creating lock file
|
||||
Create_lockfile .lock
|
||||
|
||||
if [ "${LB_USE_FAKEROOT}" != "true" ]
|
||||
# Unmounting /sys
|
||||
if [ -e chroot/sys/class ]
|
||||
then
|
||||
# Unmounting /sys
|
||||
#fuser -km chroot/sys
|
||||
if [ -e chroot/sys/class ]
|
||||
then
|
||||
umount chroot/sys
|
||||
fi
|
||||
else
|
||||
rm -rf chroot/sys
|
||||
mkdir -p chroot/sys
|
||||
umount chroot/sys
|
||||
fi
|
||||
|
||||
# Removing stage file
|
||||
|
|
|
@ -113,7 +113,6 @@ USAGE="${PROGRAM} [--apt apt|aptitude]\n\
|
|||
\t [--net-cow-server IP|HOSTNAME]\n\
|
||||
\t [--net-tarball true|false]\n\
|
||||
\t [--quiet]\n\
|
||||
\t [--use-fakeroot true|false]\n\
|
||||
\t [--archives ARCHIVE|\"ARCHIVES\"]\n\
|
||||
\t [--archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
|
||||
\t [--parent-archive-areas ARCHIVE_AREA|\"ARCHIVE_AREAS\"]\n\
|
||||
|
@ -142,7 +141,7 @@ Local_arguments ()
|
|||
LONG_OPTIONS="apt:,apt-ftp-proxy:,apt-http-proxy:,apt-options:,aptitude-options:,debootstrap-options:,cdebootstrap-options:,
|
||||
apt-pipeline:,apt-recommends:,apt-secure:,apt-source-archives:,bootstrap:,cache:,cache-indices:,cache-packages:,
|
||||
cache-stages:,debconf-frontend:,debconf-priority:,dump,
|
||||
initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,use-fakeroot:,tasksel:,
|
||||
initramfs:,initramfs-compression:,initsystem:,fdisk:,losetup:,mode:,system:,tasksel:,
|
||||
templates:,architectures:,clean,
|
||||
distribution:,parent-distribution:,parent-debian-installer-distribution:,parent-mirror-bootstrap:,parent-mirror-chroot:,parent-mirror-chroot-security:,parent-mirror-chroot-updates:,parent-mirror-chroot-backports:,parent-mirror-binary:,
|
||||
parent-mirror-binary-security:,parent-mirror-binary-updates:,parent-mirror-binary-backports:,parent-mirror-debian-installer:,
|
||||
|
@ -347,11 +346,6 @@ Local_arguments ()
|
|||
shift 2
|
||||
;;
|
||||
|
||||
--use-fakeroot)
|
||||
LB_USE_FAKEROOT="${2}"
|
||||
shift 2
|
||||
;;
|
||||
|
||||
--tasksel)
|
||||
LB_TASKSEL="${2}"
|
||||
shift 2
|
||||
|
@ -1047,10 +1041,6 @@ LB_MODE="${LB_MODE}"
|
|||
# (Default: ${LB_SYSTEM})
|
||||
LB_SYSTEM="${LB_SYSTEM}"
|
||||
|
||||
# \$LB_USE_FAKEROOT: use fakeroot/fakechroot
|
||||
# (Default: ${LB_USE_FAKEROOT})
|
||||
LB_USE_FAKEROOT="${LB_USE_FAKEROOT}"
|
||||
|
||||
# \$LB_TASKSEL: set tasksel program
|
||||
# (Default: ${LB_TASKSEL})
|
||||
LB_TASKSEL="${LB_TASKSEL}"
|
||||
|
|
Loading…
Reference in New Issue