projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
disable filesystem check by default
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
21f4e05
..
62f24f8
100755
(executable)
--- a/
chroot-script
+++ b/
chroot-script
@@
-6,8
+6,6
@@
# License: This file is licensed under the GPL v2.
################################################################################
# License: This file is licensed under the GPL v2.
################################################################################
-set -e # exit on any error
-
. /etc/debootstrap/config || exit 1
. /etc/debootstrap/variables || exit 1
. /etc/debootstrap/config || exit 1
. /etc/debootstrap/variables || exit 1
@@
-20,7
+18,7
@@
if [ -x /usr/bin/aptitude ] ; then
APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
APTUPDATE='aptitude update'
else
APTINSTALL="aptitude -y --without-recommends install $DPKG_OPTIONS"
APTUPDATE='aptitude update'
else
- APTINSTALL="apt-get --force-yes -y install $DPKG_OPTIONS"
+ APTINSTALL="apt-get --force-yes -y
--no-install-recommends
install $DPKG_OPTIONS"
APTUPDATE='apt-get update'
fi
APTUPDATE='apt-get update'
fi
@@
-55,17
+53,36
@@
askpass() {
# define chroot mirror {{{
chrootmirror() {
# define chroot mirror {{{
chrootmirror() {
- [ -n "$KEEP_SRC_LIST" ] && return
- [ -z "$COMPONENTS" ] && COMPONENTS='main contrib non-free'
+ if [ -n "$KEEP_SRC_LIST" ] ; then
+ echo "KEEP_SRC_LIST has been set, skipping chrootmirror stage."
+ return
+ fi
+
+ if [ -z "$COMPONENTS" ] ; then
+ COMPONENTS='main contrib non-free'
+ fi
+ echo "Using repository components $COMPONENTS"
if [ -n "$ISO" ] ; then
if [ -n "$ISO" ] ; then
- echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
- [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
+ echo "Adjusting sources.list for ISO (${ISO})."
+ echo "deb $ISO $RELEASE $COMPONENTS" > /etc/apt/sources.list
+ echo "Adding mirror entry (${MIRROR}) to sources.list."
+ [ -n "$MIRROR" ] && echo "deb $MIRROR $RELEASE $COMPONENTS" >> /etc/apt/sources.list || true
else
if [ -n "$MIRROR" ] ; then
else
if [ -n "$MIRROR" ] ; then
- echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
+ echo "Adjusting sources.list for mirror (${MIRROR})."
+ echo "deb $MIRROR $RELEASE $COMPONENTS" > /etc/apt/sources.list
fi
fi
fi
fi
+
+ # add security.debian.org:
+ case "$RELEASE" in
+ unstable|sid) ;; # no security pool available
+ *)
+ echo "Adding security.debian.org to sources.list."
+ echo "deb http://security.debian.org ${RELEASE}/updates $COMPONENTS" >> /etc/apt/sources.list
+ ;;
+ esac
}
# }}}
}
# }}}
@@
-75,7
+92,6
@@
grmlrepos() {
# user might have provided their own apt sources.list
if ! grep -q grml /etc/apt/sources.list.d/grml.list 2>/dev/null ; then
cat >> /etc/apt/sources.list.d/grml.list << EOF
# user might have provided their own apt sources.list
if ! grep -q grml /etc/apt/sources.list.d/grml.list 2>/dev/null ; then
cat >> /etc/apt/sources.list.d/grml.list << EOF
-
# grml: stable repository:
deb http://deb.grml.org/ grml-stable main
deb-src http://deb.grml.org/ grml-stable main
# grml: stable repository:
deb http://deb.grml.org/ grml-stable main
deb-src http://deb.grml.org/ grml-stable main
@@
-83,7
+99,6
@@
grmlrepos() {
# grml: testing/development repository:
deb http://deb.grml.org/ grml-testing main
deb-src http://deb.grml.org/ grml-testing main
# grml: testing/development repository:
deb http://deb.grml.org/ grml-testing main
deb-src http://deb.grml.org/ grml-testing main
-
EOF
fi
EOF
fi
@@
-97,7
+112,7
@@
EOF
# why it's necessary, sometimes we get an error even though it works [mika]
fi
# why it's necessary, sometimes we get an error even though it works [mika]
fi
- # make sure we install packages from
g
rml's pool only if not available
+ # make sure we install packages from
G
rml's pool only if not available
# from Debian!
if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then
cat >> /etc/apt/preferences << EOF
# from Debian!
if ! grep -q grml /etc/apt/preferences 2>/dev/null ; then
cat >> /etc/apt/preferences << EOF
@@
-165,7
+180,7
@@
packages() {
if [ "$PACKAGES" = 'yes' ] ; then
if ! [ -r /etc/debootstrap/packages ] ; then
if [ "$PACKAGES" = 'yes' ] ; then
if ! [ -r /etc/debootstrap/packages ] ; then
- echo "Error: /etc/debootstrap/packages
not found, exiting."
+ echo "Error: /etc/debootstrap/packages
(inside chroot) not found, exiting." >&2
exit 1
else
$APTUPDATE
exit 1
else
$APTUPDATE
@@
-202,7
+217,7
@@
kernel() {
if [ -n "$KERNEL" ] ; then
$APTUPDATE
# note: install busybox to be able to debug initramfs
if [ -n "$KERNEL" ] ; then
$APTUPDATE
# note: install busybox to be able to debug initramfs
- KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox"
+ KERNELPACKAGES="linux-image-$KERNEL linux-headers-$KERNEL busybox
firmware-linux
"
DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
fi
}
DEBIAN_FRONTEND=$DEBIAN_FRONTEND $APTINSTALL $KERNELPACKAGES
fi
}
@@
-212,9
+227,10
@@
kernel() {
reconfigure() {
if [ -n "$RECONFIGURE" ] ; then
for package in $RECONFIGURE ; do
reconfigure() {
if [ -n "$RECONFIGURE" ] ; then
for package in $RECONFIGURE ; do
- dpkg --list $package 1>/dev/null 2>/dev/null && \
- DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \
- echo "Warning: $package does not exist, can not reconfigure it."
+ if dpkg --list $package >/dev/null 2>&1 | grep -q '^ii' ; then
+ DEBIAN_FRONTEND=$DEBIAN_FRONTEND dpkg-reconfigure $package || \
+ echo "Warning: $package does not exist, can not reconfigure it."
+ fi
done
fi
}
done
fi
}
@@
-223,6
+239,11
@@
reconfigure() {
# set password of user root {{{
passwords()
{
# set password of user root {{{
passwords()
{
+ if [ -n "$NOPASSWORD" ] ; then
+ echo "Skip setting root password as requested."
+ return 0
+ fi
+
echo "Activating shadow passwords."
shadowconfig on
echo "Activating shadow passwords."
shadowconfig on
@@
-231,7
+252,6
@@
passwords()
CHPASSWD_OPTION='-m'
fi
CHPASSWD_OPTION='-m'
fi
-
if [ -n "$ROOTPASSWORD" ] ; then
echo root:"$ROOTPASSWORD" | chpasswd $CHPASSWD_OPTION
export ROOTPASSWORD=''
if [ -n "$ROOTPASSWORD" ] ; then
echo root:"$ROOTPASSWORD" | chpasswd $CHPASSWD_OPTION
export ROOTPASSWORD=''