projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Release new version 0.87
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
accef96
..
9b04baa
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-2,7
+2,7
@@
# Filename: grml-debootstrap
# Purpose: wrapper around debootstrap for installing plain Debian via Grml
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Filename: grml-debootstrap
# Purpose: wrapper around debootstrap for installing plain Debian via Grml
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
-# Bug-Reports: see http://grml.org/bugs/
+# Bug-Reports: see http
s
://grml.org/bugs/
# License: This file is licensed under the GPL v2+
################################################################################
# License: This file is licensed under the GPL v2+
################################################################################
@@
-169,7
+169,7
@@
Other options:
-V, --version Show summary of options and exit.
Usage examples can be found in the grml-debootstrap manpage.
-V, --version Show summary of options and exit.
Usage examples can be found in the grml-debootstrap manpage.
-Send bugreports to the grml-team: bugs (at) grml.org || http://grml.org/bugs/
+Send bugreports to the grml-team: bugs (at) grml.org || http
s
://grml.org/bugs/
"
}
"
}
@@
-266,7
+266,7
@@
cleanup() {
# ugly, but make sure we really don't leave anything (/proc /proc and
# /dev /dev are intended, trying to work around timing issues, see #657023)
# ugly, but make sure we really don't leave anything (/proc /proc and
# /dev /dev are intended, trying to work around timing issues, see #657023)
- for ARG in /sys /proc /proc /dev/pts /dev/pts /dev /dev ; do
+ for ARG in /
run/udev /
sys /proc /proc /dev/pts /dev/pts /dev /dev ; do
[ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1
umount "$MNTPOINT"/$ARG >/dev/null 2>&1
done
[ -x "$MNTPOINT"/bin/umount ] && chroot "$MNTPOINT" umount $ARG >/dev/null 2>&1
umount "$MNTPOINT"/$ARG >/dev/null 2>&1
done
@@
-335,7
+335,7
@@
stage() {
# }}}
# make sure we have what we need {{{
# }}}
# make sure we have what we need {{{
-check4progs
debootstrap
|| bailout 1
+check4progs
"${DEBOOTSTRAP}"
|| bailout 1
# }}}
# source main configuration file {{{
# }}}
# source main configuration file {{{
@@
-588,6
+588,12
@@
if [ "$_opt_grub" ] && [ "$_opt_vmfile" ] ; then
bailout 1
fi
bailout 1
fi
+if [ -n "$ISO" ] && [[ "$DEBOOTSTRAP" =~ mmdebstrap$ ]] ; then
+ eerror "The ISO option is incompatible with usage of mmdebstrap for bootstrapping."
+ eerror "Either drop the --iso ... option or use plain debootstrap instead."
+ eend 1
+ bailout 1
+fi
if [ "$DEBUG" = "true" ] ; then
set -x
if [ "$DEBUG" = "true" ] ; then
set -x
@@
-1685,7
+1691,7
@@
preparechroot() {
cp $VERBOSE -a -L "${CONFFILES}"/extrapackages/ "${MNTPOINT}"/etc/debootstrap/
cp $VERBOSE -a -L "${CONFFILES}"/extrapackages/ "${MNTPOINT}"/etc/debootstrap/
- # make sure we can access network [relevant for cdebootstrap]
+ # make sure we can access network [relevant for cdebootstrap
/mmdebstrap
]
[ -f "${MNTPOINT}"/etc/resolv.conf ] || cp $VERBOSE /etc/resolv.conf "${MNTPOINT}"/etc/resolv.conf
# setup default locales
[ -f "${MNTPOINT}"/etc/resolv.conf ] || cp $VERBOSE /etc/resolv.conf "${MNTPOINT}"/etc/resolv.conf
# setup default locales
@@
-1742,6
+1748,13
@@
iface eth0 inet dhcp
cp /etc/network/interfaces.examples "$MNTPOINT/etc/network/interfaces.examples"
fi
cp /etc/network/interfaces.examples "$MNTPOINT/etc/network/interfaces.examples"
fi
+ if [ -d /run/udev ] ; then
+ einfo "Setting up bind-mount /run/udev"
+ mkdir -p "${MNTPOINT}"/run/udev
+ mount --bind /run/udev "${MNTPOINT}"/run/udev
+ eend $?
+ fi
+
eend 0
}
# }}}
eend 0
}
# }}}
@@
-1866,6
+1879,12
@@
umount_chroot() {
fi
if grep -q "$MNTPOINT" /proc/mounts ; then
fi
if grep -q "$MNTPOINT" /proc/mounts ; then
+ if mountpoint "${MNTPOINT}"/run/udev &>/dev/null ; then
+ einfo "Unmounting bind-mount /run/udev"
+ umount "${MNTPOINT}"/run/udev
+ eend $?
+ fi
+
if [ -n "$PARTITION" ] ; then
einfo "Unmount $MNTPOINT"
umount "$MNTPOINT"
if [ -n "$PARTITION" ] ; then
einfo "Unmount $MNTPOINT"
umount "$MNTPOINT"