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.41.
[grml-debootstrap.git]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
1c63443
..
fb8562c
100755
(executable)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-1,9
+1,9
@@
-#!/bin/sh
-# Filename: grml-bootstrap
-# Purpose: wrapper around debootstrap for installing plain Debian via
g
rml
+#!/bin/
ba
sh
+# Filename: grml-
de
bootstrap
+# Purpose: wrapper around debootstrap for installing plain Debian via
G
rml
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
# Authors: grml-team (grml.org), (c) Michael Prokop <mika@grml.org>
# Bug-Reports: see http://grml.org/bugs/
-# License: This file is licensed under the GPL v2
.
+# License: This file is licensed under the GPL v2
+
################################################################################
# http://www.debian.org/releases/stable/i386/index.html.en
################################################################################
# http://www.debian.org/releases/stable/i386/index.html.en
@@
-11,7
+11,8
@@
set -e # exit on any error
# variables {{{
PN="$(basename $0)"
# variables {{{
PN="$(basename $0)"
-VERSION='0.39'
+VERSION="$(dpkg --list $PN 2>/dev/null| awk '/^i/ {print $3}')"
+VERSION="${VERSION:-unknown}"
MNTPOINT="/mnt/debootstrap.$$"
# inside the chroot system locales might not be available, so use minimum:
MNTPOINT="/mnt/debootstrap.$$"
# inside the chroot system locales might not be available, so use minimum:
@@
-81,7
+82,7
@@
Send bugreports to the grml-team: bugs (at) grml.org || http://grml.org/bugs/
"
}
"
}
-if [ "$1" = '-h' ] || [ "$1" = '-help' ] ; then
+if [ "$1" = '-h' ] || [ "$1" = '-help' ]
|| [ "$1" = "--help" ]
; then
usage
echo 'Please notice that this script requires root permissions!'
exit 0
usage
echo 'Please notice that this script requires root permissions!'
exit 0
@@
-90,7
+91,6
@@
fi
# make sure we have what we need {{{
check4progs debootstrap dialog || exit 1
# make sure we have what we need {{{
check4progs debootstrap dialog || exit 1
-check4root || exit 1
# }}}
# source main configuration file {{{
# }}}
# source main configuration file {{{
@@
-165,6
+165,13
@@
fi
}
# }}}
}
# }}}
+# check for root permissions {{{
+if ! check4root ; then
+ echo "For usage instructions please execute '$PN --help'."
+ exit 1
+fi
+# }}}
+
# source specified configuration file {{{
if [ -n "$CONFIGFILE" ] ; then
einfo "Reading specified config file $CONFIGFILE."
# source specified configuration file {{{
if [ -n "$CONFIGFILE" ] ; then
einfo "Reading specified config file $CONFIGFILE."
@@
-409,11
+416,17
@@
for i in $(cat $TMPFILE) ; do
NUM_PARTITIONS=$((${NUM_PARTITIONS}+1))
done
NUM_PARTITIONS=$((${NUM_PARTITIONS}+1))
done
+# force metadata version 0.90 for lenny so old grub can boot from this array.
+METADATA_VERSION=""
+if [ $RELEASE = "lenny" ]; then
+ METADATA_VERSION="-e0"
+fi
+
ERRORFILE=$(mktemp)
set +e
# TODO: better error handling?
yes | mdadm --create "${TARGET}" --level="${RAIDLEVEL}" \
ERRORFILE=$(mktemp)
set +e
# TODO: better error handling?
yes | mdadm --create "${TARGET}" --level="${RAIDLEVEL}" \
- --raid-devices="${NUM_PARTITIONS}" ${SELECTED_PARTITIONS} >/dev/null 2>$ERRORFILE
+ --raid-devices="${NUM_PARTITIONS}" ${
METADATA_VERSION} ${
SELECTED_PARTITIONS} >/dev/null 2>$ERRORFILE
RC=$?
set -e
RC=$?
set -e
@@
-522,14
+535,14
@@
interactive_mode()
{
welcome_dialog
{
welcome_dialog
+ prompt_for_release
+
prompt_for_swraid
prompt_for_target
prompt_for_bootmanager
prompt_for_swraid
prompt_for_target
prompt_for_bootmanager
- prompt_for_release
-
prompt_for_hostname
prompt_for_password
prompt_for_hostname
prompt_for_password