summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorDave Reisner <dreisner@archlinux.org>2011-07-24 16:12:31 -0400
committerDave Reisner <dreisner@archlinux.org>2011-08-02 08:23:04 -0400
commite39b5f055011a12890988b768b0329990c79f964 (patch)
treede55044e1619055b307b04574b451276ea89f0d1 /src
parent43a6e277b5b73a6141f2b222d0b826f1d37013d6 (diff)
fix references to kernel26.img and vmlinuz26
Signed-off-by: Dave Reisner <dreisner@archlinux.org>
Diffstat (limited to 'src')
-rw-r--r--src/core/libs/lib-software.sh2
-rw-r--r--src/core/libs/lib-ui-interactive.sh8
2 files changed, 5 insertions, 5 deletions
diff --git a/src/core/libs/lib-software.sh b/src/core/libs/lib-software.sh
index bb84621..d93cfad 100644
--- a/src/core/libs/lib-software.sh
+++ b/src/core/libs/lib-software.sh
@@ -8,7 +8,7 @@ target_run_mkinitcpio()
{
target_special_fs on
- run_controlled mkinitcpio "chroot $var_TARGET_DIR /sbin/mkinitcpio -p kernel26" $TMP_MKINITCPIO_LOG "Rebuilding initcpio images ..."
+ run_controlled mkinitcpio "chroot $var_TARGET_DIR /sbin/mkinitcpio -p linux" $TMP_MKINITCPIO_LOG "Rebuilding initcpio images ..."
target_special_fs off
diff --git a/src/core/libs/lib-ui-interactive.sh b/src/core/libs/lib-ui-interactive.sh
index 8281bc0..93f89d6 100644
--- a/src/core/libs/lib-ui-interactive.sh
+++ b/src/core/libs/lib-ui-interactive.sh
@@ -1073,14 +1073,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