From 7a335673ead3928e4b6ae901460ae31c393eabb9 Mon Sep 17 00:00:00 2001
From: Jan Lindemann <jan@janware.com>
Date: Sun, 22 Jan 2017 17:00:26 +0000
Subject: [PATCH] integrate-distro.sh: Detect kernel version (rather than
 configuring it)

Signed-off-by: Jan Lindemann <jan@janware.com>
---
 scripts/integrate-distro.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

diff --git a/scripts/integrate-distro.sh b/scripts/integrate-distro.sh
index 6c4a0909..cd3049ba 100644
--- a/scripts/integrate-distro.sh
+++ b/scripts/integrate-distro.sh
@@ -294,7 +294,7 @@ tumbleweed)
 	#kernel_version=4.8.0_rc6_jux+-1
 	#rpm_kernel_version=4.8.0_rc6_jux+-1
 	kernel_version=4.8.0-swm+
-	rpm_kernel_version=4.8.0_swm+-79
+	#rpm_kernel_version=4.8.0_swm+-79
 	;;
 esac
 
@@ -709,7 +709,11 @@ _run_chroot()
 run_chroot()
 {
 	local cmd="LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root"
-	echo == running $cmd "$@"
+	if [ "$1" = -q ]; then
+		shift
+	else
+		echo == running $cmd "$@"
+	fi
 	#eval $cmd "$@" || {
 	#LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root "$@" || {
 	LANG=POSIX SSH_AUTH_SOCK=$ssh_auth_sock chroot $root "$@" || {
@@ -1178,14 +1182,14 @@ setup_boot_loader_net()
 	|umask 0022
 	|/sbin/mkinitrd \\
 	|	-B \\
-	|	-k /boot/vmlinuz-$kernel_files_version \\
-	|	-i /boot/initrd-netboot-$kernel_files_version \\
-	|	-M /boot/System.map-$kernel_files_version \\
+	|	-k /boot/vmlinuz-$kernel_version \\
+	|	-i /boot/initrd-netboot-$kernel_version \\
+	|	-M /boot/System.map-$kernel_version \\
 	|	-m "$modules" \\
 	|	-d jan://blub/dings
-	|ln -sf initrd-netboot-$kernel_files_version /boot/initrd-netboot
+	|ln -sf initrd-netboot-$kernel_version /boot/initrd-netboot
 	|ln -sf memtest.bin /boot/memtest
-	|chmod 644 /boot/initrd-netboot-$kernel_files_version
+	|chmod 644 /boot/initrd-netboot-$kernel_version
 EOT
 	chmod 755 $root$mkinitrd_sh
 
@@ -1339,6 +1343,7 @@ cmd_install()
 
 	# run_chroot zypper $zypper_global_opts -t srcpackage --download-only `pkgs payload`
 	#kernel_version=`readlink -f $root/boot/vmlinuz 2>/dev/null | xargs basename | sed 's/vmlinuz-//'`
+	kernel_version=`run_chroot -q rpm -q kernel | sort -V | sed 's/_/-/g; s/\.\(i386\|x86_64\)$//; s/-[^.-]\+$//; s/^kernel-//'`
 
 	if have_cfg_file_section repos.after-install; then
 		run_chroot zypper mr --all --disable
@@ -1374,7 +1379,7 @@ cmd_install()
 
 	[ "$install_dev" ] && setup_boot_loader_local
 	setup_boot_loader_net
-	run_chroot ln -sf vmlinuz-$kernel_files_version /boot/vmlinuz
+	run_chroot ln -sf vmlinuz-$kernel_version /boot/vmlinuz
 
 	insserv_all