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]
/
grml-debootstrap
diff --git
a/grml-debootstrap
b/grml-debootstrap
index
98e0e0e
..
dea48b7
100644
(file)
--- a/
grml-debootstrap
+++ b/
grml-debootstrap
@@
-4,7
+4,7
@@
# 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:
Fre Nov 03 21:35:09
CET 2006 [mika]
+# Latest change:
Mon Nov 06 15:57:52
CET 2006 [mika]
################################################################################
# http://www.debian.org/releases/stable/i386/apcs04.html.en
################################################################################
# http://www.debian.org/releases/stable/i386/apcs04.html.en
@@
-13,7
+13,7
@@
set -e # exit on any error
. /etc/grml/lsb-functions
. /etc/grml/script-functions
. /etc/grml/lsb-functions
. /etc/grml/script-functions
-VERSION='0.
1
'
+VERSION='0.
2
'
case $* in
-h*|--h*)
case $* in
-h*|--h*)
@@
-52,7
+52,7
@@
einfo "$0 - Please recheck configuration before execution:"
echo "
Target partition: $TARGET
Mount-point: $MNTPOINT
echo "
Target partition: $TARGET
Mount-point: $MNTPOINT
- Install grub to: $
MBR / $GROOT [if empty it
will not be installed]
+ Install grub to: $
GROOT / $GRUB [if empty grub
will not be installed]
Important! Continuing will delete all data from ${TARGET}!
"
Important! Continuing will delete all data from ${TARGET}!
"
@@
-104,6
+104,9
@@
einfo "Preparing chroot system"
# make sure we can access network [relevant for cdebootstrap]
[ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
# make sure we can access network [relevant for cdebootstrap]
[ -f "$MNTPOINT/etc/resolv.conf" ] || cp /etc/resolv.conf $MNTPOINT/etc/resolv.conf
+ # setup default locales
+ [ -n "$LOCALES" ] && cp /etc/debootstrap/locale.gen $MNTPOINT/etc/locale.gen
+
# copy any existing existing files to chroot
[ -d /etc/debootstrap/boot ] && cp -a /etc/debootstrap/boot/* $MNTPOINT/boot/
[ -d /etc/debootstrap/etc ] && cp -a /etc/debootstrap/etc/* $MNTPOINT/etc/
# copy any existing existing files to chroot
[ -d /etc/debootstrap/boot ] && cp -a /etc/debootstrap/boot/* $MNTPOINT/boot/
[ -d /etc/debootstrap/etc ] && cp -a /etc/debootstrap/etc/* $MNTPOINT/etc/
@@
-117,9
+120,18
@@
chroot $MNTPOINT /bin/chroot-script
eend $?
# einfo "Removing chroot-script"
eend $?
# einfo "Removing chroot-script"
-# rm -f $MNTPOINT/bin/chroot-script
+# rm -f $MNTPOINT/bin/chroot-script
+# rm -rf $MNTPOINT/etc/debootstrap/
# eend $?
# eend $?
+if [ -z "$GRUB" -o -z "$GROOT" ] ; then
+ echo "Notice: \$GRUB or \$GROOT not defined, will not install grub therefor."
+else
+ einfo "Installing grub on ${GRUB}:"
+ grub-install --root-directory="$MNTPOINT" "(${GRUB})"
+ eend $?
+fi
+
einfo "Unmount $MNTPOINT"
umount $MNTPOINT
eend $?
einfo "Unmount $MNTPOINT"
umount $MNTPOINT
eend $?