X-Git-Url: https://git.grml.org/?a=blobdiff_plain;f=debian%2Foverrides.grml-live;h=8a86196a699d46b05cb39c69e65bcc668f9ebbc1;hb=a671278f36a508309ceec812c4db0a6fac64a3fa;hp=43af9380c1fc9bffddf646cb7371d278b641c48f;hpb=07ca6d51e817df41a480c6b6c183c40510acb97b;p=grml-live.git

diff --git a/debian/overrides.grml-live b/debian/overrides.grml-live
index 43af938..8a86196 100644
--- a/debian/overrides.grml-live
+++ b/debian/overrides.grml-live
@@ -18,7 +18,6 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/bufio.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cat.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/chain.mod
-grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/charset.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cmostest.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/cmp.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/configfile.mod
@@ -42,9 +41,7 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/extcmd.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/fat.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/font.mod
-grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/fs_file.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/fshelp.mod
-grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/fs_uuid.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/functional_test.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_arcfour.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gcry_blowfish.mod
@@ -71,7 +68,6 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gptsync.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/gzio.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/halt.mod
-grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/handler.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hashsum.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hdparm.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/hello.mod
@@ -141,7 +137,6 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/setjmp.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/setpci.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/sfs.mod
-grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/sh.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/sleep.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/tar.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/terminal.mod
@@ -163,6 +158,8 @@ grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vbetest.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vga.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/vga_text.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/video_bochs.mod
+grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/video_cirrus.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/video_fb.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/video.mod
 grml-live: arch-dependent-file-in-usr-share ./usr/share/grml-live/templates/boot/grub/videotest.mod
@@ -191,7 +188,6 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/bufio.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cat.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/chain.mod
-grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/charset.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmostest.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmp.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/configfile.mod
@@ -215,9 +211,7 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/extcmd.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/fat.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/font.mod
-grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/fs_file.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/fshelp.mod
-grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/fs_uuid.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/functional_test.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_arcfour.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_blowfish.mod
@@ -244,7 +238,6 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gptsync.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/gzio.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/halt.mod
-grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/handler.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hashsum.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hdparm.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/hello.mod
@@ -314,7 +307,6 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/setjmp.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/setpci.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/sfs.mod
-grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/sh.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/sleep.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/tar.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/terminal.mod
@@ -336,6 +328,8 @@ grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-l
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbetest.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga_text.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/video_bochs.mod
+grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/video_cirrus.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/video_fb.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/video.mod
 grml-live: arch-independent-package-contains-binary-or-object ./usr/share/grml-live/templates/boot/grub/videotest.mod
@@ -350,6 +344,7 @@ grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/
 grml-live: executable-not-elf-or-script ./usr/share/grml-live/templates/windows/autostart/autorun.pif
 grml-live: extra-license-file usr/share/grml-live/templates/GRML/LICENSE.txt
 grml-live: script-not-executable ./usr/share/grml-live/scripts/bootgrub.mksh
+grml-live: script-not-executable ./usr/share/grml-live/scripts/bootilnx.mksh
 grml-live: unknown-section grml
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/915resolution.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/acpi.mod
@@ -371,7 +366,6 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/bufio.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cat.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/chain.mod
-grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/charset.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmostest.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/cmp.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/configfile.mod
@@ -393,9 +387,7 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/extcmd.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/fat.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/font.mod
-grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/fs_file.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/fshelp.mod
-grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/fs_uuid.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/functional_test.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_arcfour.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gcry_blowfish.mod
@@ -422,7 +414,6 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gptsync.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/gzio.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/halt.mod
-grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/handler.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hashsum.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hdparm.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/hello.mod
@@ -492,7 +483,6 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/setjmp.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/setpci.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/sfs.mod
-grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/sh.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/sleep.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/tar.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/terminal.mod
@@ -514,6 +504,8 @@ grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vbetest.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/vga_text.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/video_bochs.mod
+grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/video_cirrus.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/video_fb.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/video.mod
 grml-live: unstripped-binary-or-object ./usr/share/grml-live/templates/boot/grub/videotest.mod