Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixes #593: Correct detection of machine type by checking size of /var/log/dmesg #594

Merged
merged 1 commit into from
Feb 20, 2019

Conversation

ncharles
Copy link
Contributor

No description provided.

@Wolvverine
Copy link
Contributor

What is the result of the dmesg command on these systems?

@ncharles
Copy link
Contributor Author

ncharles commented Oct 30, 2018

it does contain the expect output of dmesg

[    0.000000] Initializing cgroup subsys cpuset
[    0.000000] Initializing cgroup subsys cpu
[    0.000000] Initializing cgroup subsys cpuacct
[    0.000000] Linux version 3.16.0-5-amd64 (debian-kernel@lists.debian.org) (gcc version 4.8.4 (Debian 4.8.4-1) ) #1 SMP Debian 3.16.51-3+deb8u1 (2018-01-08)
[    0.000000] Command line: BOOT_IMAGE=boot/vmlinuz-3.16.0-5-amd64 initrd=boot/initrd.img-3.16.0-5-amd64 root=/dev/vda1 console=tty0 console=ttyS0,115200 ro quiet
[    0.000000] e820: BIOS-provided physical RAM map:
[    0.000000] BIOS-e820: [mem 0x0000000000000000-0x000000000009fbff] usable
[    0.000000] BIOS-e820: [mem 0x000000000009fc00-0x000000000009ffff] reserved
[    0.000000] BIOS-e820: [mem 0x00000000000f0000-0x00000000000fffff] reserved
[    0.000000] BIOS-e820: [mem 0x0000000000100000-0x000000007ffdbfff] usable
[    0.000000] BIOS-e820: [mem 0x000000007ffdc000-0x000000007fffffff] reserved
[    0.000000] BIOS-e820: [mem 0x00000000feffc000-0x00000000feffffff] reserved
[    0.000000] BIOS-e820: [mem 0x00000000fffc0000-0x00000000ffffffff] reserved
...
[    0.000000] Hypervisor detected: KVM
[    0.000000] Booting paravirtualized kernel on KVM
...
[    0.759597] systemd[1]: Detected virtualization 'kvm'.
...
[    0.933007] usb 1-1: Product: QEMU USB Tablet

@Wolvverine
Copy link
Contributor

Why not use dmesg output instead log file ?

@ncharles
Copy link
Contributor Author

I'm not sure i understand your question - this PR uses dmesg instead of log file if log is not correctly available.

@g-bougard g-bougard merged commit cca0075 into fusioninventory:2.4.x Feb 20, 2019
@g-bougard
Copy link
Contributor

Argh... I didn't notice you made it other obsolete 2.4.x branch.
I have to backport to develop.

@ncharles
Copy link
Contributor Author

what do you mean ? on which branch should it have been targeted?

@g-bougard
Copy link
Contributor

Branch named develop is the branch to target since 2.4.1 as announced last summer.
I cherry-picked in develop: 278bada

This pull request was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants