From dbfe7b10d78d8a71ee404af0d3952af48eeb4d1d Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 18 Feb 2013 13:56:07 +0100 Subject: Removing incomplete support for fakeroot. --- debian/control | 2 +- debian/live-build.bug-script | 2 +- functions/chroot.sh | 8 +- functions/defaults.sh | 3 - manpages/de/lb_config.de.1 | 6 - manpages/de/lb_testroot.de.1 | 9 +- manpages/en/lb_config.1 | 4 - manpages/en/lb_testroot.1 | 4 +- manpages/po/de/lb_config.1.po | 557 +++++++++++++++++------------------- manpages/po/de/lb_testroot.1.po | 67 ++--- manpages/pot/lb_config.1.pot | 557 +++++++++++++++++------------------- manpages/pot/lb_testroot.1.pot | 67 ++--- scripts/build/binary_chroot | 23 +- scripts/build/bootstrap_debootstrap | 6 - scripts/build/chroot_devpts | 22 +- scripts/build/chroot_proc | 41 +-- scripts/build/chroot_selinuxfs | 32 +-- scripts/build/chroot_sysfs | 29 +- scripts/build/config | 12 +- 19 files changed, 646 insertions(+), 805 deletions(-) diff --git a/debian/control b/debian/control index d057acef5..414b0418c 100644 --- a/debian/control +++ b/debian/control @@ -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 diff --git a/debian/live-build.bug-script b/debian/live-build.bug-script index a9f5a6f7f..4c2a21eeb 100644 --- a/debian/live-build.bug-script +++ b/debian/live-build.bug-script @@ -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}:" diff --git a/functions/chroot.sh b/functions/chroot.sh index 901bd82ff..75ffc053e 100755 --- a/functions/chroot.sh +++ b/functions/chroot.sh @@ -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 "${?}" } diff --git a/functions/defaults.sh b/functions/defaults.sh index 592e5a1fc..b7390c78d 100755 --- a/functions/defaults.sh +++ b/functions/defaults.sh @@ -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 () diff --git a/manpages/de/lb_config.de.1 b/manpages/de/lb_config.de.1 index e7163f428..07cd28834 100644 --- a/manpages/de/lb_config.de.1 +++ b/manpages/de/lb_config.de.1 @@ -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 diff --git a/manpages/de/lb_testroot.de.1 b/manpages/de/lb_testroot.de.1 index 873531f82..2826a7ff2 100644 --- a/manpages/de/lb_testroot.de.1 +++ b/manpages/de/lb_testroot.de.1 @@ -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 diff --git a/manpages/en/lb_config.1 b/manpages/en/lb_config.1 index f3d69bfe4..053edbd3c 100644 --- a/manpages/en/lb_config.1 +++ b/manpages/en/lb_config.1 @@ -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 diff --git a/manpages/en/lb_testroot.1 b/manpages/en/lb_testroot.1 index b75a84e62..dcc133b4d 100644 --- a/manpages/en/lb_testroot.1 +++ b/manpages/en/lb_testroot.1 @@ -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 diff --git a/manpages/po/de/lb_config.1.po b/manpages/po/de/lb_config.1.po index 649195455..0aa099466 100644 --- a/manpages/po/de/lb_config.1.po +++ b/manpages/po/de/lb_config.1.po @@ -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 \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,54 +73,54 @@ 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: 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(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 EIE and in the manual at " @@ -129,16 +129,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 EIE or by " @@ -148,16 +148,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 EIE for " "the Debian project." @@ -652,84 +652,79 @@ msgstr "" #. type: Plain text #: en/lb_config.1:201 -msgid " [B<--use-fakeroot> true|false]" -msgstr "" - -#. type: Plain text -#: en/lb_config.1:203 msgid " [B<--archives> I|I<\"ARCHIVES\">]" msgstr "" #. type: Plain text -#: en/lb_config.1:205 +#: en/lb_config.1:203 msgid " [B<--archive-areas> I|I<\"ARCHIVE_AREAS\">]" msgstr "" #. type: Plain text -#: en/lb_config.1:207 +#: en/lb_config.1:205 msgid "" " [B<--parent-archive-areas> I|I<\"PARENT_ARCHIVE_AREAS" "\">]" msgstr "" #. type: Plain text -#: en/lb_config.1:209 +#: en/lb_config.1:207 msgid " [B<--security> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:211 +#: en/lb_config.1:209 msgid " [B<--source> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:213 +#: en/lb_config.1:211 msgid " [-s|B<--source-images> iso|netboot|tar|hdd]" msgstr "" #. type: Plain text -#: en/lb_config.1:215 +#: en/lb_config.1:213 msgid " [B<--tasksel> apt|aptitude|tasksel]" msgstr "" #. type: Plain text -#: en/lb_config.1:217 +#: en/lb_config.1:215 msgid " [B<--templates> I]" msgstr "" #. type: Plain text -#: en/lb_config.1:219 +#: en/lb_config.1:217 msgid " [B<--hdd-size >I]" msgstr "" #. type: Plain text -#: en/lb_config.1:221 +#: en/lb_config.1:219 msgid " [B<--updates> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:223 +#: en/lb_config.1:221 msgid " [B<--backports> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:225 +#: en/lb_config.1:223 msgid " [B<--exposed-root> true|false]" msgstr "" #. type: Plain text -#: en/lb_config.1:227 +#: en/lb_config.1:225 msgid " [B<--verbose>]" msgstr "" #. FIXME #. type: Plain text -#: en/lb_config.1:230 +#: en/lb_config.1:228 msgid " [B<--win32-loader true|false]>" msgstr "" #. type: Plain text -#: en/lb_config.1:233 +#: en/lb_config.1:231 msgid "" "B is a high-level command (porcelain) of I(7), the " "Debian Live tool suite." @@ -737,7 +732,7 @@ msgstr "" #. FIXME #. type: Plain text -#: en/lb_config.1:236 +#: en/lb_config.1:234 msgid "" "B populates the configuration directory for live-build. By " "default, this directory is named 'config' and is created in the current " @@ -746,7 +741,7 @@ msgstr "" #. FIXME #. type: Plain text -#: en/lb_config.1:239 +#: en/lb_config.1:237 msgid "" "Note: Currently B tries to be smart and sets defaults for some " "options depending on the setting of other options (e.g. which linux packages " @@ -762,7 +757,7 @@ msgid "" msgstr "" #. type: Plain text -#: en/lb_config.1:242 +#: en/lb_config.1:240 msgid "" "In addition to its specific options B understands all generic " "live-build options. See I(7) for a complete list of all generic " @@ -771,26 +766,26 @@ msgstr "" #. FIXME #. type: IP -#: en/lb_config.1:244 +#: en/lb_config.1:242 #, no-wrap msgid "B<--apt> apt|aptitude" msgstr "" #. type: Plain text -#: en/lb_config.1:246 +#: en/lb_config.1:244 msgid "" "defines if apt-get or aptitude is used to install packages when building the " "image. The default is apt." msgstr "" #. type: IP -#: en/lb_config.1:246 +#: en/lb_config.1:244 #, no-wrap msgid "B<--apt-ftp-proxy> I" msgstr "" #. type: Plain text -#: en/lb_config.1:248 +#: en/lb_config.1:246 msgid "" "sets the ftp proxy to be used by apt. By default, this is empty. Note that " "this variable is only for the proxy that gets used by apt internally within " @@ -798,13 +793,13 @@ msgid "" msgstr "" #. type: IP -#: en/lb_config.1:248 +#: en/lb_config.1:246 #, no-wrap msgid "B<--apt-http-proxy> I" msgstr "" #. type: Plain text -#: en/lb_config.1:250 +#: en/lb_config.1:248 msgid "" "sets the http proxy to be used by apt. By default, this is empty. Note that " "this variable is only for the proxy that gets used by apt internally within " @@ -812,26 +807,26 @@ msgid "" msgstr "" #. type: IP -#: en/lb_config.1:250 +#: en/lb_config.1:248 #, no-wrap msgid "B<--apt-indices> true|false|none" msgstr "" #. type: Plain text -#: en/lb_config.1:252 +#: en/lb_config.1:250 msgid "" "defines if the resulting images should have apt indices or not and defaults " "to true. If set to none, no indices are included at all." msgstr "" #. type: IP -#: en/lb_config.1:252 +#: en/lb_config.1:250 #, no-wrap msgid "B<--apt-options> I