Fix detection of the ck-generic- kernel variants

[rnestler]

Fixes #136

[rnestler]

@Sacro Can you test this and verify that it works for you?

[Sacro]

I'l need to reboot into the CK kernel, it's currently broken for -zen too though!

Kernel
 installed: 6.4.6.zen1-1 (since 26 hours ago)
 running:   6.4.6.zen1.1-zen

[rnestler]

I'l need to reboot into the CK kernel, it's currently broken for -zen too though!

Why? The output looks sane, doesn't it? Or what is your current uname -r and pacman -Q linux-zen output?

Edit: Maybe we should improve the wording a bit? I'll definitely add a few log messages were one can see which package was detected etc. We need to do quite some normalization of the uname -r output and the package version to be able to compare them.

[Sacro]

Oh sorry, yes it does look sane, Just that running has -zen suffixed, that threw me.

[rnestler]

Oh sorry, yes it does look sane, Just that running has -zen suffixed, that threw me.

Yeah that's the confusing thing: uname -r will report something like 6.4.6.zen1.1-zen (with some dots replaced by -) which then means it's the linux-zen package with the version 6.4.6.zen1-1 (again some . are actually - and vice versa).

So in the code we normalize these before comparing them, but the output is the original package version, but a normalized uname -r output. Definitely confusing 😉

I added some more info messages in #138 which should help debug these issues. Just set RUST_LOG=info to see them:

$ RUST_LOG=info target/debug/reboot-arch-btw
[2023-07-27T08:26:59Z INFO  reboot_arch_btw::kernel] uname -r output: 6.4.4-arch1-1
[2023-07-27T08:26:59Z INFO  reboot_arch_btw::kernel] Detected kernel package: linux
[2023-07-27T08:26:59Z INFO  reboot_arch_btw::kernel] kernel package version: 6.4.6.arch1-1
Kernel
 installed: 6.4.6.arch1-1 (since 53 minutes ago)
 running:   6.4.4.arch1.1
[2023-07-27T08:26:59Z INFO  reboot_arch_btw::critical_packages_check] Checking systemd
systemd updated 2 days ago
Reboot arch btw

[Sacro]

[2023-07-27T10:09:05Z INFO  reboot_arch_btw::kernel] uname -r output: 6.4.6-zen1-1-zen
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::kernel] Detected kernel package: linux-zen
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::kernel] kernel package version: 6.4.6.zen1-1
Kernel
 installed: 6.4.6.zen1-1 (since 1 days ago)
 running:   6.4.6.zen1.1-zen
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::critical_packages_check] Checking systemd
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::critical_packages_check] Checking linux-firmware
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::critical_packages_check] Checking amd-ucode
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::critical_packages_check] Checking intel-ucode
[2023-07-27T10:09:05Z WARN  reboot_arch_btw::critical_packages_check] Failed to get package info for intel-ucode
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::critical_packages_check] Checking xorg-server
[2023-07-27T10:09:05Z INFO  reboot_arch_btw::critical_packages_check] Checking xorg-xwayland

[rnestler]

Thanks looks nice. If you find time to test it with CK kernel it would be appreciated. But if not, I'd just merge it and you could still reopen the issue if problems persist 🙂

[rnestler]

(Regarding [2023-07-27T10:09:05Z WARN reboot_arch_btw::critical_packages_check] Failed to get package info for intel-ucode: You could explicitly pass --reboot-packages with a list of packages you want to have checked.)

[Sacro]

Yeah, I've rebooted for you, though I have OS lockups on 6.4.3 for some reason.

[2023-07-27T12:20:23Z INFO  reboot_arch_btw::kernel] uname -r output: 6.4.3-1-ck-generic-v3
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::kernel] Detected kernel package: linux-ck-generic-v3
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::kernel] kernel package version: 6.4.3-1
Kernel
 installed: 6.4.3-1 (since 14 days ago)
 running:   6.4.3.1-ck-generic-v3
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::critical_packages_check] Checking systemd
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::critical_packages_check] Checking linux-firmware
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::critical_packages_check] Checking amd-ucode
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::critical_packages_check] Checking intel-ucode
[2023-07-27T12:20:23Z WARN  reboot_arch_btw::critical_packages_check] Failed to get package info for intel-ucode
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::critical_packages_check] Checking xorg-server
[2023-07-27T12:20:23Z INFO  reboot_arch_btw::critical_packages_check] Checking xorg-xwayland

[rnestler]

Nice! Seems to work as expected 🎉

Thanks for testing!