From 926bba0152b30ad75265e8890d2c74a8b62474c8 Mon Sep 17 00:00:00 2001 From: Jan Lindemann Date: Mon, 19 Sep 2016 13:12:40 +0000 Subject: [PATCH] integrate-distro.sh: Underscores in kernel version become dashes in RPM executables Signed-off-by: Jan Lindemann --- scripts/integrate-distro.sh | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh index 74e17fc0..8b9ff1a2 100644 --- a/scripts/integrate-distro.sh +++ b/scripts/integrate-distro.sh @@ -297,6 +297,8 @@ esac umask 0022 +kernel_files_version=${kernel_version/_/-} + unused_pkgs=" sysvinit-systemd kernel @@ -1014,14 +1016,14 @@ setup_boot_loader_net() |umask 0022 |/sbin/mkinitrd \\ | -B \\ - | -k /boot/vmlinuz-$kernel_version \\ - | -i /boot/initrd-netboot-$kernel_version \\ - | -M /boot/System.map-$kernel_version \\ + | -k /boot/vmlinuz-$kernel_files_version \\ + | -i /boot/initrd-netboot-$kernel_files_version \\ + | -M /boot/System.map-$kernel_files_version \\ | -m "$initrd_modules" \\ | -d jan://blub/dings - |ln -sf initrd-netboot-$kernel_version /boot/initrd-netboot + |ln -sf initrd-netboot-$kernel_files_version /boot/initrd-netboot |ln -sf memtest.bin /boot/memtest - |chmod 644 /boot/initrd-netboot-$kernel_version + |chmod 644 /boot/initrd-netboot-$kernel_files_version EOT chmod 755 $root$mkinitrd_sh @@ -1201,7 +1203,7 @@ cmd_install() [ "$install_dev" ] && setup_boot_loader_local setup_boot_loader_net - run_chroot ln -sf vmlinuz-${kernel_version/_/-} /boot/vmlinuz + run_chroot ln -sf vmlinuz-$kernel_files_version /boot/vmlinuz insserv_all