summaryrefslogtreecommitdiff
path: root/src/core/libs/lib-ui-interactive.sh
diff options
context:
space:
mode:
authorDieter Plaetinck <dieter@plaetinck.be>2011-08-03 18:49:13 +0200
committerDieter Plaetinck <dieter@plaetinck.be>2011-08-03 18:49:13 +0200
commit3708f751e3b3d2f4a2cd852d2da31d26eb93feac (patch)
tree085639f7fc4d85f148b1ec38e3aa9328c28e60e1 /src/core/libs/lib-ui-interactive.sh
parent1146b9e13b0db8d8d4c0d52c155a64b56eb37a78 (diff)
parent9eeb6d3ad98a52c25684ca022a659b29153ede9f (diff)
Merge branch 'master' into develop
Diffstat (limited to 'src/core/libs/lib-ui-interactive.sh')
-rw-r--r--src/core/libs/lib-ui-interactive.sh8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 05dd234..1ae4d6f 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -1087,14 +1087,14 @@ generate_grub_menulst() {
# (0) Arch Linux
title Arch Linux
root $grubdev
-kernel $subdir/vmlinuz26 $kernel_parameters
-initrd $subdir/kernel26.img
+kernel $subdir/vmlinuz-linux $kernel_parameters
+initrd $subdir/initramfs-linux.img
# (1) Arch Linux
title Arch Linux Fallback
root $grubdev
-kernel $subdir/vmlinuz26 $kernel_parameters
-initrd $subdir/kernel26-fallback.img
+kernel $subdir/vmlinuz-linux $kernel_parameters
+initrd $subdir/initramfs-linux-fallback.img
# (2) Windows
#title Windows