Skip to content

Commit 07ca6d5

Browse files
committed
update templates/boot/grub/ to grub version 1.98+20100617-1, extend grub.cfg, update scripts/create-grub-dir.sh
scripts/create-grub-dir.sh needs to be adjusted for current grub version because grub-mkimage is in another package and requires a new option (--format). grub.cfg now insmods part_gpt and part_msdos by default, otherwise accessing partitions using "set root (hd0,..." isn't possible. Also added support for ${kernelopts}, suggested by Alexander 'Leo' Bergolth, see http://lists.mur.at/pipermail/grml/2010-June/004822.html templates/boot/grub/ has been updated to grub version 1.98+20100617-1. Signed-off-by: Michael Prokop <mika@grml.org>
1 parent 8ad9d2a commit 07ca6d5

129 files changed

Lines changed: 219 additions & 164 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

debian/overrides.grml-live

Lines changed: 21 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,14 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
1919
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cat.mod
2020
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/chain.mod
2121
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/charset.mod
22+
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cmostest.mod
2223
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cmp.mod
2324
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/configfile.mod
2425
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cpio.mod
2526
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cpuid.mod
2627
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/crc.mod
2728
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/crypto.mod
29+
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cs5536.mod
2830
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/datehook.mod
2931
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/date.mod
3032
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/datetime.mod
@@ -77,6 +79,7 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
7779
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hexdump.mod
7880
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hfs.mod
7981
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hfsplus.mod
82+
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/iorw.mod
8083
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/iso9660.mod
8184
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/jfs.mod
8285
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/jpeg.mod
@@ -98,16 +101,19 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
98101
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/msdospart.mod
99102
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/multiboot2.mod
100103
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/multiboot.mod
104+
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/nilfs2.mod
101105
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/normal.mod
102106
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
103107
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ntfs.mod
104108
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/ohci.mod
105109
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_acorn.mod
106110
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_amiga.mod
107111
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_apple.mod
112+
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_bsd.mod
108113
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_gpt.mod
109114
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_msdos.mod
110115
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_sun.mod
116+
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/part_sunpc.mod
111117
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/parttool.mod
112118
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/password.mod
113119
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/password_pbkdf2.mod
@@ -123,6 +129,7 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
123129
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/raid.mod
124130
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/read.mod
125131
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/reboot.mod
132+
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/regexp.mod
126133
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/reiserfs.mod
127134
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/relocator.mod
128135
grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/scsi.mod
@@ -185,12 +192,14 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
185192
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cat.mod
186193
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/chain.mod
187194
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/charset.mod
195+
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmostest.mod
188196
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmp.mod
189197
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/configfile.mod
190198
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpio.mod
191199
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpuid.mod
192200
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/crc.mod
193201
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/crypto.mod
202+
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cs5536.mod
194203
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/datehook.mod
195204
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/date.mod
196205
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/datetime.mod
@@ -243,6 +252,7 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
243252
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hexdump.mod
244253
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfs.mod
245254
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfsplus.mod
255+
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/iorw.mod
246256
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/iso9660.mod
247257
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/jfs.mod
248258
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/jpeg.mod
@@ -264,16 +274,19 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
264274
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/msdospart.mod
265275
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot2.mod
266276
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot.mod
277+
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/nilfs2.mod
267278
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/normal.mod
268279
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
269280
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfs.mod
270281
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/ohci.mod
271282
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_acorn.mod
272283
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_amiga.mod
273284
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_apple.mod
285+
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_bsd.mod
274286
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_gpt.mod
275287
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_msdos.mod
276288
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sun.mod
289+
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sunpc.mod
277290
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/parttool.mod
278291
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/password.mod
279292
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/password_pbkdf2.mod
@@ -289,6 +302,7 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
289302
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid.mod
290303
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/read.mod
291304
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/reboot.mod
305+
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/regexp.mod
292306
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/reiserfs.mod
293307
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/relocator.mod
294308
grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/scsi.mod
@@ -358,12 +372,14 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
358372
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cat.mod
359373
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/chain.mod
360374
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/charset.mod
375+
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmostest.mod
361376
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmp.mod
362377
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/configfile.mod
363378
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpio.mod
364379
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cpuid.mod
365380
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/crc.mod
366381
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/crypto.mod
382+
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cs5536.mod
367383
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/datehook.mod
368384
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/date.mod
369385
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/datetime.mod
@@ -414,6 +430,7 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
414430
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hexdump.mod
415431
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfs.mod
416432
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hfsplus.mod
433+
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/iorw.mod
417434
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/iso9660.mod
418435
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/jfs.mod
419436
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/jpeg.mod
@@ -435,16 +452,19 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
435452
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/msdospart.mod
436453
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot2.mod
437454
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/multiboot.mod
455+
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/nilfs2.mod
438456
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/normal.mod
439457
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfscomp.mod
440458
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ntfs.mod
441459
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/ohci.mod
442460
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_acorn.mod
443461
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_amiga.mod
444462
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_apple.mod
463+
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_bsd.mod
445464
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_gpt.mod
446465
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_msdos.mod
447466
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sun.mod
467+
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/part_sunpc.mod
448468
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/parttool.mod
449469
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/password.mod
450470
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/password_pbkdf2.mod
@@ -460,6 +480,7 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
460480
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/raid.mod
461481
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/read.mod
462482
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/reboot.mod
483+
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/regexp.mod
463484
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/reiserfs.mod
464485
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/relocator.mod
465486
grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/scsi.mod

scripts/create-grub-dir.sh

Lines changed: 26 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,18 @@
66
# License: This file is licensed under the GPL v2 or any later version.
77
# Latest change: Thu Mar 11 14:25:15 CET 2010 [mika]
88
################################################################################
9+
# This script is very hackish due to the way the grub directory has to be
10+
# generated. :-/ The script is meant to be executed on a Debian system that
11+
# matches the grub version, otherwise the execution of grub-mkimage *might* fail.
12+
# So if you want to use a recent Grub version make sure you execute this script
13+
# on an up2date Debian/unstable system.
14+
################################################################################
915

1016
set -e
1117

1218
if [ -z "$1" ] ; then
13-
echo "Usage: $0 <grub_package.deb>">&2
14-
echo "Usage example: $0 grub-pc_1.98-1_i386.deb">&2
19+
echo "Usage: $0 <grub-version>">&2
20+
echo "Usage example: $0 1.98-1">&2
1521
exit 1
1622
fi
1723

@@ -23,25 +29,36 @@ fi
2329
GRUB="$1"
2430
oldpwd=$(pwd)
2531

26-
if ! [ -f "$GRUB" ] ; then
27-
wget http://ftp.de.debian.org/debian/pool/main/g/grub2/"$GRUB"
32+
ARCH=$(dpkg --print-architecture)
33+
34+
if ! [ -f "grub-pc_${GRUB}_${ARCH}.deb" ] || ! [ -f "grub-common_${GRUB}_${ARCH}.deb" ] ; then
35+
wget http://cdn.debian.net/debian/pool/main/g/grub2/grub-pc_"${GRUB}"_${ARCH}.deb
36+
wget http://cdn.debian.net/debian/pool/main/g/grub2/grub-common_"${GRUB}"_${ARCH}.deb
2837
fi
2938

30-
if ! [ -f "$GRUB" ] ; then
31-
echo "Error reading $GRUB - exiting.">&2
39+
if ! [ -f "grub-pc_${GRUB}_${ARCH}.deb" ] || ! [ -f "grub-common_${GRUB}_${ARCH}.deb" ] ; then
40+
echo "Error reading grub files version $GRUB - exiting.">&2
3241
exit 1
3342
fi
3443

3544
GRUBDIR=$(mktemp -d)
45+
echo "Using temporary directory $GRUBDIR"
3646
cd "$GRUBDIR"
3747

3848
mkdir -p grub
3949

40-
ar x "${oldpwd}"/"$GRUB"
50+
ar x "${oldpwd}"/"grub-pc_${GRUB}_${ARCH}.deb"
51+
tar xzf data.tar.gz
52+
ar x "${oldpwd}"/"grub-common_${GRUB}_${ARCH}.deb"
4153
tar xzf data.tar.gz
42-
./usr/bin/grub-mkimage -d usr/lib/grub/i386-pc -o core.img biosdisk iso9660
4354

44-
for a in usr/lib/grub/i386-pc/{*.mod,efiemu??.o,command.lst,moddep.lst,fs.lst,handler.lst,parttool.lst}; do \
55+
if ./usr/bin/grub-mkimage --help | grep -q -- --format ; then
56+
./usr/bin/grub-mkimage -d usr/lib/grub/*-pc -o core.img biosdisk iso9660 --format=i386-pc
57+
else
58+
./usr/bin/grub-mkimage -d usr/lib/grub/*-pc -o core.img biosdisk iso9660
59+
fi
60+
61+
for a in usr/lib/grub/*-pc/{*.mod,efiemu??.o,command.lst,moddep.lst,fs.lst,handler.lst,parttool.lst}; do \
4562
[[ -e $a ]] && cp $a grub/
4663
done
4764

0 Bytes
Binary file not shown.

templates/boot/grub/acpi.mod

-80 Bytes
Binary file not shown.

templates/boot/grub/affs.mod

8 Bytes
Binary file not shown.

templates/boot/grub/afs.mod

52 Bytes
Binary file not shown.

templates/boot/grub/afs_be.mod

52 Bytes
Binary file not shown.
-40 Bytes
Binary file not shown.

templates/boot/grub/ata.mod

-40 Bytes
Binary file not shown.

templates/boot/grub/ata_pthru.mod

-40 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)