projects
/
grml-debootstrap.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
use /lib/grub/i386-pc/ for sarge
[grml-debootstrap.git]
/
chroot-script
diff --git
a/chroot-script
b/chroot-script
index
3b2ec68
..
7f2669a
100644
(file)
--- a/
chroot-script
+++ b/
chroot-script
@@
-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 23:
30:04
CET 2006 [mika]
+# Latest change: Fre Nov 03 23:
42:36
CET 2006 [mika]
################################################################################
set -e # exit on any error
################################################################################
set -e # exit on any error
@@
-14,7
+14,7
@@
set -e # exit on any error
[ -r /proc/1 ] || mount -t proc none /proc
if [ -n "$CHROOTMIRROR" ] ; then
[ -r /proc/1 ] || mount -t proc none /proc
if [ -n "$CHROOTMIRROR" ] ; then
- echo "deb $CHROOTMIRROR $RELEASE main contrib non-free" /etc/apt/sources.list
+ echo "deb $CHROOTMIRROR $RELEASE main contrib non-free"
>
/etc/apt/sources.list
fi
if ! [ -r /etc/kernel-img.conf ] ; then
fi
if ! [ -r /etc/kernel-img.conf ] ; then
@@
-46,7
+46,7
@@
fi
# sarge specific stuff
if [ "$RELEASE" = 'sarge' ] ; then
# sarge specific stuff
if [ "$RELEASE" = 'sarge' ] ; then
- sed -i "s
/ROOT=probe/ROOT=$TARGET
" /etc/mkinitrd/mkinitrd.conf
+ sed -i "s
#ROOT=probe#ROOT=$TARGET#
" /etc/mkinitrd/mkinitrd.conf
fi
if [ -n "$KERNEL" ] ; then
fi
if [ -n "$KERNEL" ] ; then
@@
-131,6
+131,10
@@
KERNELVER=${KERNELIMG#/boot/vmlinuz-}
# generate initrd
if [ -n "$INITRD" ] ; then
# generate initrd
if [ -n "$INITRD" ] ; then
+ if [ "$RELEASE" = 'sarge' ] ; then
+ einfo "Release sarge detected, will not create an initrd."
+ return 0
+ fi
echo "Generating initrd."
update-initramfs -c -t -k $KERNELVER
if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
echo "Generating initrd."
update-initramfs -c -t -k $KERNELVER
if [ -f "/boot/initrd.img-$KERNELVER" ] ; then
@@
-144,7
+148,12
@@
if [ -n "$GROOT" ] ; then
# copy stage-files to /boot/grub/
[ -d /boot/grub/ ] || mkdir /boot/grub
# copy stage-files to /boot/grub/
[ -d /boot/grub/ ] || mkdir /boot/grub
- cp /usr/lib/grub/i386-pc/* /boot/grub/
+ if [ -d /usr/lib/grub/i386-pc/ ] ; then
+ cp /usr/lib/grub/i386-pc/* /boot/grub/
+ else
+ # sarge ships grub files in another directory
+ cp /lib/grub/i386-pc/* /boot/grub/
+ fi
# finally install grub
update-grub -y
# finally install grub
update-grub -y