Commit 44d770b6 authored by Daniel Baumann's avatar Daniel Baumann
Browse files

Adding upstream version 4.0~a12.

parent dbbcbe6f
4.0~a11-1
4.0~a12-1
The grub splash for Debian Live was made by Daniel Baumann <daniel@debian.org>
based on the original work of Mark Riedesel.
The contribution of Daniel is hereby placed in the public domain (no rights
reserved).
---------------
http://dugnet.com/klown/pics/klowner_debboot.png
by Mark Riedesel, license same as open use logo
To create klowner.rle:
1. convert klowner.png klowner.bmp
2. bmptoppm < klowner.bmp | ppmtolss16 #FBFDFA=7 > klowner.rle
(FBFDFA is the color used for the inside of the "n" in Debian.)
---------------
Debian Open Use Logo License
Copyright (c) 1999 Software in the Public Interest
This logo or a modified version may be used by anyone to refer to the Debian
project, but does not indicate endorsement by the project.
Note: we would appreciate that you make the image a link to
http://www.debian.org/ if you use it on a web page.
......@@ -26,13 +26,7 @@ Chroot ()
fi
done
if [ "${LB_USE_FAKEROOT}" != "true" ]
then
${LB_ROOT_COMMAND} ${_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
${LB_ROOT_COMMAND} ${_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 "${?}"
}
......@@ -130,7 +130,7 @@ Set_defaults ()
;;
ubuntu)
LB_DISTRIBUTION="${LB_DISTRIBUTION:-precise}"
LB_DISTRIBUTION="${LB_DISTRIBUTION:-quantal}"
LB_DERIVATIVE="false"
;;
......@@ -322,19 +322,6 @@ Set_defaults ()
fi
fi
if [ "$(id -u)" = "0" ]
then
# If we are root, disable root command
LB_ROOT_COMMAND=""
else
if [ -x /usr/bin/sudo ]
then
# FIXME: this is false until considered safe
#LB_ROOT_COMMAND="sudo"
LB_ROOT_COMMAND=""
fi
fi
if [ "${LIVE_IMAGE_ARCHITECTURE}" = "i386" ] && [ "${CURRENT_IMAGE_ARCHITECTURE}" = "amd64" ]
then
# Use linux32 when building amd64 images on i386
......@@ -707,7 +694,7 @@ Set_defaults ()
;;
*)
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-686-pae 486}"
LB_LINUX_FLAVOURS="${LB_LINUX_FLAVOURS:-486}"
;;
esac
;;
......@@ -1141,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 ()
......
......@@ -23,7 +23,7 @@ Lodetach ()
# a race condition. We call 'udevadm settle' to help avoid this.
if [ -x "$(which udevadm 2>/dev/null)" ]
then
${LB_ROOT_COMMAND} udevadm settle
udevadm settle
fi
# Loop back devices aren't the most reliable when it comes to writes.
......@@ -31,7 +31,7 @@ Lodetach ()
sync
sleep 1
${LB_ROOT_COMMAND} ${LB_LOSETUP} -d "${DEVICE}" || Lodetach "${DEVICE}" "$(expr ${ATTEMPT} + 1)"
${LB_LOSETUP} -d "${DEVICE}" || Lodetach "${DEVICE}" "$(expr ${ATTEMPT} + 1)"
}
Losetup ()
......@@ -40,7 +40,7 @@ Losetup ()
FILE="${2}"
PARTITION="${3:-1}"
${LB_ROOT_COMMAND} ${LB_LOSETUP} --read-only "${DEVICE}" "${FILE}"
${LB_LOSETUP} --read-only "${DEVICE}" "${FILE}"
FDISK_OUT="$(${LB_FDISK} -l -u ${DEVICE} 2>&1)"
Lodetach "${DEVICE}"
......@@ -50,14 +50,14 @@ Losetup ()
then
Echo_message "Mounting %s with offset 0" "${DEVICE}"
${LB_ROOT_COMMAND} ${LB_LOSETUP} "${DEVICE}" "${FILE}"
${LB_LOSETUP} "${DEVICE}" "${FILE}"
else
SECTORS="$(echo "$FDISK_OUT" | sed -ne "s|^$LOOPDEVICE[ *]*\([0-9]*\).*|\1|p")"
OFFSET="$(expr ${SECTORS} '*' 512)"
Echo_message "Mounting %s with offset %s" "${DEVICE}" "${OFFSET}"
${LB_ROOT_COMMAND} ${LB_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
${LB_LOSETUP} -o "${OFFSET}" "${DEVICE}" "${FILE}"
fi
}
......
......@@ -23,3 +23,4 @@ RELEASE_lucid="10.04" # LTS: 2015-04-01
RELEASE_oneiric="11.10" # 2013-04-01
RELEASE_precise="12.04" # LTS: 2017-04-01
RELEASE_quantal="12.10" # 2014-04-01
RELEASE_raring="13.04" # 2014-10-01
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb\fP \- wrapper for live\-build programs
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb binary\fP \- Complete the binary stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb bootstrap\fP \- Complete the bootstrap stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb build\fP \- Complete the bootstrap, chroot, binary, and source stages
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb chroot\fP \- Complete the chroot stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb clean\fP \- Clean build directory
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb config\fP \- Create config directory
......@@ -201,10 +201,6 @@
[\fB\-\-net\-tarball\fP true|false]
.br
[\fB\-\-quiet\fP]
.br
[\fB\-\-root\-command\fP sudo]
.br
[\fB\-\-use\-fakeroot\fP true|false]
.br
[\fB\-\-archives\fP \fIARCHIVE\fP|\fI"ARCHIVES"\fP]
.br
......@@ -672,14 +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\-\-root\-command\fP sudo" 4
controls if live\-build should use sudo internally to build the live
image. Note that this is not well tested and that you should, when relying
on sudo, call the individual live\-build command with sudo itself.
.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
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb source\fP \- Complete the source stage
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 1 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 1 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlb testroot\fP \- Ensure that a system is built as root
......@@ -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
......
......@@ -3,7 +3,7 @@
.\" This file was generated with po4a. Translate the source file.
.\"
.\"*******************************************************************
.TH LIVE\-BUILD 7 15.02.2013 4.0~a11\-1 "Debian Live Project"
.TH LIVE\-BUILD 7 18.02.2013 4.0~a12\-1 "Debian Live Project"
.SH NAME
\fBlive\-build\fP \- the Debian Live tool suite
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment