Patch for (kernel) splashimages

[Olaf Mandel]

--=_0333f33a766bee3743e59e74ae9e0fe0
Content-Type: text/plain; charset="ISO-8859-1"
Content-Transfer-Encoding: 7bit

Hi,

the attached patch (against 0.95+cvs20040624-10) does three things to update-grub:

- It adds these lines to the menu.lst template:
### BEGIN AUTOMAGIC BOOTSPLASH OPTIONS
### END AUTOMAGIC BOOTSPLASH OPTIONS

- It adds the Default Option "sopt": Comparable to kopt, it contains kernel options. They are to be appended to the kernel-line:
kernel  <image> <kopt> <sopt>

- It fixes a small bug in searching splash.xpm.gz: the path was hardcoded

The idea behind this is to enable the bootsplash package to easily configure grub, when the options for bootsplash are changed. This is easier, if bootsplash does not have to edit "kopt", but can use a separate "sopt". The "automatic bootsplash options" are thought for snippets setting the text-color.

Background: Jaap Haitsma, who made http://debblue.debian.net/ started combining grub-splash, kernel bootsplash, gdm-theme and desktop background to a single, consistent theme. I like this idea very much, but at the moment, it is too difficult to set up all parts separately. So here is to putting the right hooks into grub.

This patch should not cause any problems or overhead for users that do not have / want kernel splash images. The default is to not add anything to the kernel-options.

Cheers,
Olaf Mandel
--=_0333f33a766bee3743e59e74ae9e0fe0
Content-Type: application/octet-stream
Content-Transfer-Encoding: base64
Content-Disposition: attachment; filename="patch.grub"

LS0tIC9zYmluL3VwZGF0ZS1ncnViCTIwMDQtMTAtMTQgMDM6Mjk6NTMuMDAwMDAwMDAwICswMjAw
CisrKyB1cGRhdGUtZ3J1YgkyMDA0LTEwLTIyIDIxOjEzOjMwLjAwMDAwMDAwMCArMDIwMApAQCAt
MjMwLDYgKzIzMCwxMCBAQAogIyBEZWZhdWx0IGtlcm5lbCBvcHRpb25zLCBvdmVyaWRkZW4gYnkg
dGhlIGtvcHQgc3RhdGVtZW50IGluIHRoZSBtZW51ZmlsZS4KIGtvcHQ9InJvb3Q9JHJvb3RfZGV2
aWNlIHJvIgogCisjIERlZmF1bHQgYm9vdHNwbGFzaCBvcHRpb25zIHRvIHRoZSBrZXJuZWwsIG92
ZXJyaWRkZW4gYnkgdGhlIHNvcHQgc3RhdGVtZW50CisjIGluIHRoZSBtZW51ZmlsZS4KK3NvcHQ9
IiIKKwogIyBEcml2ZShpbiBHUlVCIHRlcm1zKSB3aGVyZSB0aGUga2VybmVsIGlzIGxvY2F0ZWQu
IE92ZXJyaWRkZW4gYnkgdGhlCiAjIGtvcHQgc3RhdGVtZW50IGluIG1lbnVmaWxlLgogIyBpZiB3
ZSBkb24ndCBoYXZlIGEgZGV2aWNlLm1hcCB0aGVuIHdlIGNhbid0IHVzZSB0aGUgY29udmVydCBm
dW5jdGlvbi4KQEAgLTI4Miw3ICsyODYsNyBAQAogIyAobm9ybWFsbHkgdGhlIGZpcnN0IGVudHJ5
IGRlZmluZWQpLgogdGltZW91dAkJNQogCi0jIFByZXR0eSBjb2xvdXJzCisjIFByZXR0eSBjb2xv
dXJzIChtYXkgYmUgb3ZlcndyaXR0ZW4gYnkgYm9vdHNwbGFzaCBiZWxvdykKIGNvbG9yIGN5YW4v
Ymx1ZSB3aGl0ZS9ibHVlCiAKICMjIHBhc3N3b3JkIFsnLS1tZDUnXSBwYXNzd2QKQEAgLTI5Myw2
ICsyOTcsOSBAQAogIyAgICAgIHBhc3N3b3JkIC0tbWQ1IFwkMVwkZ0xoVTAvXCRhVzc4a0hLMVFm
VjNQMmIyem5Vb2UvCiAjIHBhc3N3b3JkIHRvcHNlY3JldAogCisjIyMgQkVHSU4gQVVUT01BR0lD
IEJPT1RTUExBU0ggT1BUSU9OUworIyMjIEVORCBBVVRPTUFHSUMgQk9PVFNQTEFTSCBPUFRJT05T
CisKICMKICMgZXhhbXBsZXMKICMKQEAgLTQ4MywyMyArNDkwLDM0IEBACiB7CiAJa2VybmVsX3Zl
cnNpb249JDEKIAotCXZlcnNpb249JChlY2hvICRrZXJuZWxfdmVyc2lvbiB8IHNlZCAncy8uKlwo
WzAtOV1cK1wpXC5cKFswLTldXCtcKVwuXChbMC05XVwrXCkuKi9cMV9cMl9cMy8nKQorCWZ1bGx2
ZXJzaW9uPSQoZWNobyAka2VybmVsX3ZlcnNpb24gfCBzZWQgJ3MvLipcKFswLTldXCtcKVwuXChb
MC05XVwrXClcLlwoWzAtOV1cK1wpLiovXDFfXDJfXDMvJykKIAlpZiBbIC1uICIkdmVyc2lvbiIg
XSA7IHRoZW4KKwkJdmVyc2lvbj0kZnVsbHZlcnNpb24KIAkJd2hpbGUgWyAtbiAiJHZlcnNpb24i
IF0gOyBkbwotCQkJY3VycmVudE9wdD0iJChldmFsICJlY2hvIFwka29wdF8kdmVyc2lvbiIpIgot
CQkJaWYgWyAtbiAiJGN1cnJlbnRPcHQiIF0gOyB0aGVuCisJCQljdXJyZW50S29wdD0iJChldmFs
ICJlY2hvIFwka29wdF8kdmVyc2lvbiIpIgorCQkJaWYgWyAtbiAiJGN1cnJlbnRLb3B0IiBdIDsg
dGhlbgorCQkJCWJyZWFrCisJCQlmaQorCQkJdmVyc2lvbj0kKGVjaG8gJHZlcnNpb24gfCBzZWQg
J3MvX1w/WzAtOV0qJC8vJykKKwkJZG9uZQorCQl2ZXJzaW9uPSRmdWxsdmVyc2lvbgorCQl3aGls
ZSBbIC1uICIkdmVyc2lvbiIgXSA7IGRvCisJCQljdXJyZW50U29wdD0iJChldmFsICJlY2hvIFwk
c29wdF8kdmVyc2lvbiIpIgorCQkJaWYgWyAtbiAiJGN1cnJlbnRTb3B0IiBdIDsgdGhlbgogCQkJ
CWJyZWFrCiAJCQlmaQogCQkJdmVyc2lvbj0kKGVjaG8gJHZlcnNpb24gfCBzZWQgJ3MvX1w/WzAt
OV0qJC8vJykKIAkJZG9uZQotCiAJZmkKIAotCWlmIFsgLXogIiRjdXJyZW50T3B0IiBdIDsgdGhl
bgotCQkJY3VycmVudE9wdD0ka29wdAorCWlmIFsgLXogIiRjdXJyZW50S29wdCIgXSA7IHRoZW4K
KwkJCWN1cnJlbnRLb3B0PSRrb3B0CisJZmkKKwlpZiBbIC16ICIkY3VycmVudFNvcHQiIF0gOyB0
aGVuCisJCQljdXJyZW50U29wdD0kc29wdAogCWZpCiAKLQllY2hvICRjdXJyZW50T3B0CisJZWNo
byAkY3VycmVudEtvcHQgJGN1cnJlbnRTb3B0CiB9CiAKIHdyaXRlX2tlcm5lbF9lbnRyeSgpCkBA
IC01NzUsNiArNTkzLDEzIEBACiBldmFsICQoRXh0cmFjdE1lbnVPcHRzICJcKGtvcHRfWzAtOV1c
KF9bMC05XVx7MSwyXH1cKF9bMC05XVx7MSwyXH1cKVw/XClcP1wpIikKIEN1c3RvbUtvcHRzPSQo
R2V0TWVudU9wdHMgIlwoa29wdF9bMC05XVwoX1swLTldXHsxLDJcfVwoX1swLTldXHsxLDJcfVwp
XD9cKVw/XCkiKQogCisjIEV4dHJhY3QgdGhlIGJvb3RzcGxhc2ggb3B0aW9ucyB0byB1c2UKK3Nv
cHQ9JChHZXRNZW51T3B0ICJzb3B0IiAiJHNvcHQiKQorCisjIEV4dHJhY3QgYm9vdHNwbGFzaCBv
cHRpb25zIGZvciBzcGVjaWZpYyBrZXJuZWxzCitldmFsICQoRXh0cmFjdE1lbnVPcHRzICJcKHNv
cHRfWzAtOV1cKF9bMC05XVx7MSwyXH1cKF9bMC05XVx7MSwyXH1cKVw/XClcP1wpIikKK0N1c3Rv
bVNvcHRzPSQoR2V0TWVudU9wdHMgIlwoc29wdF9bMC05XVwoX1swLTldXHsxLDJcfVwoX1swLTld
XHsxLDJcfVwpXD9cKVw/XCkiKQorCiAjIEV4dHJhY3QgdGhlIGdydWIgcm9vdAogZ3J1Yl9yb290
X2RldmljZT0kKEdldE1lbnVPcHQgImdyb290IiAiJGdydWJfcm9vdF9kZXZpY2UiKQogCkBAIC02
MTEsNiArNjM2LDE3IEBACiBmaQogZWNobyA+PiAkYnVmZmVyCiAKK2VjaG8gIiMjIGRlZmF1bHQg
Ym9vdHNwbGFzaCBvcHRpb25zIiA+PiAkYnVmZmVyCitlY2hvICIjIyBkZWZhdWx0IGJvb3RzcGxh
c2ggb3B0aW9ucyBmb3IgYXV0b21hZ2ljIGJvb3Qgb3B0aW9ucyIgPj4gJGJ1ZmZlcgorZWNobyAi
IyMgSWYgeW91IHdhbnQgc3BlY2lhbCBvcHRpb25zIGZvciBzcGVjaWZpdiBrZXJuZWxzIHVzZSBz
b3B0X3hfeV96IiA+PiAkYnVmZmVyCitlY2hvICIjIyB3aGVyZSB4LnkueiBpcyBrZXJuZWwgdmVy
c2lvbi4gTWlub3IgdmVyc2lvbnMgY2FuIGJlIG9taXR0ZWQuIiA+PiAkYnVmZmVyCitlY2hvICIj
IyBlLmcuIHNvcHQ9c3BsYXNoPXNpbGVudCB2Z2E9NzkxIiA+PiAkYnVmZmVyCitlY2hvICIjIHNv
cHQ9JHNvcHQiID4+ICRidWZmZXIKK2lmIFsgLW4gIiRDdXN0b21Tb3B0cyIgXSA7IHRoZW4KKyAg
ICBlY2hvICIkQ3VzdG9tU29wdHMiID4+ICRidWZmZXIKK2ZpCitlY2hvID4+ICRidWZmZXIKKwog
ZWNobyAiIyMgZGVmYXVsdCBncnViIHJvb3QgZGV2aWNlIiA+PiAkYnVmZmVyCiBlY2hvICIjIyBl
LmcuIGdyb290PShoZDAsMCkiID4+ICRidWZmZXIKIGVjaG8gIiMgZ3Jvb3Q9JGdydWJfcm9vdF9k
ZXZpY2UiID4+ICRidWZmZXIKQEAgLTY1Miw4ICs2ODgsOCBAQAogZWNobyA+PiAkYnVmZmVyCiAK
IGVjaG8gLW4gIlNlYXJjaGluZyBmb3Igc3BsYXNoIGltYWdlLi4uICIKLWlmIFsgLWYgL2Jvb3Qv
Z3J1Yi9zcGxhc2gueHBtLmd6IF07IHRoZW4KLSAgICAgICBlY2hvICJmb3VuZDogL2Jvb3QvZ3J1
Yi9zcGxhc2gueHBtLmd6IC4iCitpZiBbIC1mICR7Z3J1Yl9kaXJ9L3NwbGFzaC54cG0uZ3ogXTsg
dGhlbgorICAgICAgIGVjaG8gImZvdW5kOiAke2dydWJfZGlyfS9zcGxhc2gueHBtLmd6IC4iCiAg
ICAgICAgZWNobyAic3BsYXNoaW1hZ2U9JHtncnViX3Jvb3RfZGV2aWNlfSR7Z3J1Yl9kaXJ9L3Nw
bGFzaC54cG0uZ3oiID4+ICRidWZmZXIKICAgICAgICBlY2hvID4+ICRidWZmZXIKIGVsc2UKLS0t
IC0JMjAwNC0xMC0yMiAyMTozNDowNi4wMDAwMDAwMDAgKzAyMDAKKysrIHVwZGF0ZS1ncnViLjgJ
MjAwNC0xMC0yMiAyMTozMDo0MC4wMDAwMDAwMDAgKzAyMDAKQEAgLTMzLDYgKzMzLDEwIEBACiAu
YnIgCiBFdmVyeXRoaW5nIGFmdGVyICJrb3B0PSIgaXMgcGFzc2VkIHRvIHRoZSBrZXJuZWwgYXMg
cGFyYW1ldGVycy4gU2VlIGJvb3RwYXJhbSg3KSBmb3IgbW9yZSBpbmZvcm1hdGlvbi4KIAorIyBz
b3B0PXNwbGFzaD1zaWxlbnQgdmdhPTc5MQorLmJyCitJZiB5b3Ugd2FudCB0byB1c2UgdGhlIGJv
b3RzcGxhc2ggcGFja2FnZSwgaXQgd2lsbCBwbGFjZSBpdHMgb3B0aW9ucyBoZXJlLiBUaGUgY29u
dGVudHMgaXMgYXBwZW5kZWQgdG8ga29wdHMuIExlYXZlIGVtcHR5LCBpZiB5b3UgZG9uJ3QgbmVl
ZCB0aGlzLgorCiBUaGlzIGlzIHRoZSBncnViIGRldmljZSBmcm9tIHdoaWNoIGdydWIgbG9hZHMg
dGhlIGtlcm5lbDoKIC5iciAKICMgZ3Jvb3Q9KGhkMCwxKQo=
--=_0333f33a766bee3743e59e74ae9e0fe0--