projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Updated TODO
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
ee6fbb0
..
81fc132
100644
(file)
--- a/
chroot-script
+++ b/
chroot-script
@@
-4,12
+4,13
@@
# 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.
# 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.
-# Latest change: D
ie Apr 10 11:11:02
CEST 2007 [mika]
+# Latest change: D
on Apr 12 11:55:23
CEST 2007 [mika]
################################################################################
set -e # exit on any error
################################################################################
set -e # exit on any error
-. /etc/debootstrap/config || exit 1
+. /etc/debootstrap/config || exit 1
+. /etc/debootstrap/variables || exit 1
[ -r /proc/1 ] || mount -t proc none /proc
[ -r /proc/1 ] || mount -t proc none /proc
@@
-23,7
+24,7
@@
fi
# helper functions {{{
stage() {
if grep -q done "$STAGES/$1" 2>/dev/null ; then
# helper functions {{{
stage() {
if grep -q done "$STAGES/$1" 2>/dev/null ; then
- e
warn "Notice: stage $1 has been executed already, skipping execution therefore." ; eend 0
+ e
cho " * Notice: stage $1 has been executed already, skipping execution therefore."
return 1
else
echo "$2" > "$STAGES/$1"
return 1
else
echo "$2" > "$STAGES/$1"
@@
-95,6
+96,15
@@
mkinitrd() {
# install kernel packages {{{
kernel() {
# install kernel packages {{{
kernel() {
+ # do not override $KERNEL if set via config file
+ if [ -z "$KERNEL" ] ; then
+ if [ "$ARCH" = 'i386' ] ; then
+ KERNEL='2.6-686'
+ elif [ "$ARCH" = 'amd64' ] ; then
+ KERNEL='2.6-amd64'
+ fi
+ fi
+
if [ -n "$KERNEL" ] ; then
apt-get update
if [ "$RELEASE" = 'sarge' ] ; then
if [ -n "$KERNEL" ] ; then
apt-get update
if [ "$RELEASE" = 'sarge' ] ; then