Skip to content

Commit 1173d0e

Browse files
committed
xx
1 parent 3a4af9f commit 1173d0e

File tree

9 files changed

+39
-13
lines changed

9 files changed

+39
-13
lines changed

files/grub.cfg

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ insmod jpeg
1515
color_normal=light-gray/black
1616
color_highlight=white/light-gray
1717

18-
gfxmode=800x600
18+
gfxmode=auto
1919
if [ "$with_gfx" = 1 ] ; then
2020
insmod gfxterm
2121
insmod gfxboot
@@ -31,24 +31,24 @@ timeout=10
3131
menuentry 'Installation 0' --class opensuse --class gnu-linux --class gnu --class os {
3232
set gfxpayload=keep
3333
echo 'Loading kernel 0 ...'
34-
linuxefi /boot/x86_64/loader/linux splash=silent
34+
linux /boot/x86_64/loader/linux splash=silent
3535
echo 'Loading initrd 0 ...'
36-
initrdefi /boot/x86_64/loader/initrd
36+
initrd /boot/x86_64/loader/initrd
3737
}
3838

3939
menuentry 'Installation 1' --class opensuse --class gnu-linux --class gnu --class os {
4040
set gfxpayload=keep
4141
echo 'Loading kernel 1 ...'
42-
linuxefi /boot/x86_64/loader/linux splash=silent
42+
linux /boot/x86_64/loader/linux splash=silent
4343
echo 'Loading initrd 1 ...'
44-
initrdefi /boot/x86_64/loader/initrd
44+
initrd /boot/x86_64/loader/initrd
4545
}
4646

4747
menuentry 'Installation 2' --class opensuse --class gnu-linux --class gnu --class os {
4848
set gfxpayload=keep
4949
echo 'Loading kernel 2 ...'
50-
linuxefi /boot/x86_64/loader/linux splash=silent
50+
linux /boot/x86_64/loader/linux splash=silent
5151
echo 'Loading initrd 2 ...'
52-
initrdefi /boot/x86_64/loader/initrd
52+
initrd /boot/x86_64/loader/initrd
5353
}
5454

files/katze_1024.png

1.08 MB
Loading

files/katze_1280.png

1.61 MB
Loading

files/katze_1600.png

2.25 MB
Loading

files/katze_1920.png

2.33 MB
Loading

files/katze_3840.png

7.83 MB
Loading

files/main.gs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
key kEnter eq {
2626
edit .text
27-
/action 4 def
27+
/action 1 def
2828
} if
2929

3030
action
@@ -40,7 +40,7 @@
4040

4141
/title "ABC 12345ijklmn xyz # * % & § öäüß €" def
4242

43-
/katze [ getcanvas dim pop ] "katze_%04u.jpg" format readfile
43+
/katze [ getcanvas dim pop ] "katze_%04u.png" format readfile
4444
dup nil eq { console-font setfont 0 20 setpos 0xff0000 setcolor "Error: no backgound image" show return } if
4545
unpackimage def
4646

File renamed without changes.

patches/grub_diff

Lines changed: 30 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,32 @@
1-
#! /bin/bash
1+
#! /usr/bin/bash
22

3-
cd ~/g/.build.packages/BUILD
3+
dir=$(realpath ~/g/.build.packages/BUILD)
44

5-
diff -ru grub-2.06{.orig,}/include >/tmp/dif
6-
diff -ru -x Makefile.core.am -x Makefile.in -x ChangeLog grub-2.06{.orig,}/grub-core >>/tmp/dif
5+
grub=$(echo $dir/grub-2.??)
6+
7+
if [ ! -d "$grub" ] ; then
8+
echo "$dir: has no grub sub dir" >&2
9+
exit 1
10+
fi
11+
12+
if [ ! -d "$grub.orig" ] ; then
13+
echo "$dir: has no grub .orig sub dir" >&2
14+
exit 1
15+
fi
16+
17+
grub=${grub##*/}
18+
19+
(
20+
cd ~/g/.build.packages/BUILD
21+
diff -ru ${grub}{.orig,}/include >/tmp/dif
22+
diff -ru -x Makefile.core.am -x Makefile.in -x ChangeLog ${grub}{.orig,}/grub-core >>/tmp/dif
23+
)
24+
25+
if [ -d patches ] ; then
26+
file=patches/${grub}-$(date --iso-8601).diff
27+
fixudiff --strip 1 --git --sort /tmp/dif > "$file"
28+
echo "created patch: $file"
29+
else
30+
echo "patches: no such dir" >&2
31+
exit 1
32+
fi

0 commit comments

Comments
 (0)