Commit 8dce702b
3
plików
+89
dodanych
-86
usuniętych
@@ -1,6 +1,6 @@
1 1 pkgname: grub
2 2 pkgver: '2.14'
3 -pkgrel: '4'
3 +pkgrel: '5'
4 4 pkgdesc: The GRUB package contains the GRand Unified Bootloader.
5 5 url: 'https://www.gnu.org/software/grub/'
6 6 arch: x86_64
@@ -101,6 +101,9 @@ build: |
101 101 ${PKGDIR}/boot/grub/grub.cfg.exemple
102 102
103 103 install -Dm644 ../grub ${PKGDIR}/etc/default/grub
104 + # CRLF w /etc/default/grub wywala grub-mkconfig („line 2: $'\r': command not found”),
105 + # a wtedy po aktualizacji jadra menu GRUB nie dostaje nowego wpisu. Normalizuj.
106 + sed -i "s/\r$//" ${PKGDIR}/etc/default/grub ${PKGDIR}/boot/grub/grub.cfg.exemple
104 107 install -Dm644 ../paganlinux-grub.png \
105 108 ${PKGDIR}/usr/share/grub/splash.png
106 109 package: |
@@ -1,54 +1,54 @@
1 -# GRUB boot loader configuration
2 -
3 -GRUB_DEFAULT=0
4 -GRUB_TIMEOUT=5
5 -GRUB_DISTRIBUTOR="PaganOS"
6 -GRUB_CMDLINE_LINUX_DEFAULT="quiet verbose=no"
7 -GRUB_CMDLINE_LINUX="init=/sbin/init"
8 -
9 -# Preload both GPT and MBR modules so that they are not missed
10 -GRUB_PRELOAD_MODULES="part_gpt part_msdos"
11 -
12 -# Uncomment to enable booting from LUKS encrypted devices
13 -#GRUB_ENABLE_CRYPTODISK=y
14 -
15 -# Set to 'countdown' or 'hidden' to change timeout behavior,
16 -# press ESC key to display menu.
17 -GRUB_TIMEOUT_STYLE=menu
18 -
19 -# Uncomment to use basic console
20 -GRUB_TERMINAL_INPUT=console
21 -
22 -# Uncomment to disable graphical terminal
23 -#GRUB_TERMINAL_OUTPUT=console
24 -
25 -# The resolution used on graphical terminal
26 -# note that you can use only modes which your graphic card supports via VBE
27 -# you can see them in real GRUB with the command `vbeinfo'
28 -GRUB_GFXMODE=auto
29 -
30 -# Uncomment to allow the kernel use the same resolution used by grub
31 -GRUB_GFXPAYLOAD_LINUX=keep
32 -
33 -# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
34 -# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
35 -#GRUB_DISABLE_LINUX_UUID=true
36 -
37 -# Uncomment to disable generation of recovery mode menu entries
38 -GRUB_DISABLE_RECOVERY=true
39 -
40 -# Uncomment and set to the desired menu colors. Used by normal and wallpaper
41 -# modes only. Entries specified as foreground/background.
42 -#GRUB_COLOR_NORMAL="light-blue/black"
43 -#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
44 -
45 -# Uncomment one of them for the gfx desired, a image background or a gfxtheme
46 -GRUB_BACKGROUND="/boot/grub/splash.png"
47 -#GRUB_THEME="/path/to/gfxtheme"
48 -
49 -# Uncomment to get a beep at GRUB start
50 -#GRUB_INIT_TUNE="480 440 1"
51 -
52 -# Uncomment to make GRUB remember the last selection. This requires
53 -# setting 'GRUB_DEFAULT=saved' above.
54 -#GRUB_SAVEDEFAULT="true"
1 +# GRUB boot loader configuration
2 +
3 +GRUB_DEFAULT=0
4 +GRUB_TIMEOUT=5
5 +GRUB_DISTRIBUTOR="PaganOS"
6 +GRUB_CMDLINE_LINUX_DEFAULT="quiet verbose=no"
7 +GRUB_CMDLINE_LINUX="init=/sbin/init"
8 +
9 +# Preload both GPT and MBR modules so that they are not missed
10 +GRUB_PRELOAD_MODULES="part_gpt part_msdos"
11 +
12 +# Uncomment to enable booting from LUKS encrypted devices
13 +#GRUB_ENABLE_CRYPTODISK=y
14 +
15 +# Set to 'countdown' or 'hidden' to change timeout behavior,
16 +# press ESC key to display menu.
17 +GRUB_TIMEOUT_STYLE=menu
18 +
19 +# Uncomment to use basic console
20 +GRUB_TERMINAL_INPUT=console
21 +
22 +# Uncomment to disable graphical terminal
23 +#GRUB_TERMINAL_OUTPUT=console
24 +
25 +# The resolution used on graphical terminal
26 +# note that you can use only modes which your graphic card supports via VBE
27 +# you can see them in real GRUB with the command `vbeinfo'
28 +GRUB_GFXMODE=auto
29 +
30 +# Uncomment to allow the kernel use the same resolution used by grub
31 +GRUB_GFXPAYLOAD_LINUX=keep
32 +
33 +# Uncomment if you want GRUB to pass to the Linux kernel the old parameter
34 +# format "root=/dev/xxx" instead of "root=/dev/disk/by-uuid/xxx"
35 +#GRUB_DISABLE_LINUX_UUID=true
36 +
37 +# Uncomment to disable generation of recovery mode menu entries
38 +GRUB_DISABLE_RECOVERY=true
39 +
40 +# Uncomment and set to the desired menu colors. Used by normal and wallpaper
41 +# modes only. Entries specified as foreground/background.
42 +#GRUB_COLOR_NORMAL="light-blue/black"
43 +#GRUB_COLOR_HIGHLIGHT="light-cyan/blue"
44 +
45 +# Uncomment one of them for the gfx desired, a image background or a gfxtheme
46 +GRUB_BACKGROUND="/boot/grub/splash.png"
47 +#GRUB_THEME="/path/to/gfxtheme"
48 +
49 +# Uncomment to get a beep at GRUB start
50 +#GRUB_INIT_TUNE="480 440 1"
51 +
52 +# Uncomment to make GRUB remember the last selection. This requires
53 +# setting 'GRUB_DEFAULT=saved' above.
54 +#GRUB_SAVEDEFAULT="true"
@@ -1,31 +1,31 @@
1 -# Config file for GRUB2 - The GNU GRand Unified Bootloader
2 -# /boot/grub/grub.cfg
3 -
4 -# DEVICE NAME CONVERSIONS
5 -#
6 -# Linux Grub
7 -# -------------------------
8 -# /dev/fd0 (fd0)
9 -# /dev/sda (hd0)
10 -# /dev/sdb2 (hd1,2)
11 -# /dev/sda3 (hd0,3)
12 -#
13 -
14 -# Timeout for menu
15 -set timeout=5
16 -
17 -# Set default boot entry as Entry 0
18 -set default=0
19 -
20 -# (0) Pagan Linux
21 -menuentry "Pagan Linux " {
22 -set root=(hd0,1)
23 -linux /boot/kernel root=/dev/sda1 ro
24 -initrd /boot/initrd
25 -}
26 -
27 -## (1) Windows
28 -#menuentry "Windows" {
29 -#set root=(hd0,3)
30 -#chainloader +1
31 -#}
1 +# Config file for GRUB2 - The GNU GRand Unified Bootloader
2 +# /boot/grub/grub.cfg
3 +
4 +# DEVICE NAME CONVERSIONS
5 +#
6 +# Linux Grub
7 +# -------------------------
8 +# /dev/fd0 (fd0)
9 +# /dev/sda (hd0)
10 +# /dev/sdb2 (hd1,2)
11 +# /dev/sda3 (hd0,3)
12 +#
13 +
14 +# Timeout for menu
15 +set timeout=5
16 +
17 +# Set default boot entry as Entry 0
18 +set default=0
19 +
20 +# (0) Pagan Linux
21 +menuentry "Pagan Linux " {
22 +set root=(hd0,1)
23 +linux /boot/kernel root=/dev/sda1 ro
24 +initrd /boot/initrd
25 +}
26 +
27 +## (1) Windows
28 +#menuentry "Windows" {
29 +#set root=(hd0,3)
30 +#chainloader +1
31 +#}