diff options
author | Bill Nottingham <notting@redhat.com> | 2006-01-12 16:10:31 +0000 |
---|---|---|
committer | Bill Nottingham <notting@redhat.com> | 2006-01-12 16:10:31 +0000 |
commit | 78c8dbff1a6a2dd63d948ae82942b5c8dc6500ae (patch) | |
tree | e8eb5ad84335e6169bd7d1232fd452730c873e5a | |
parent | fdce640fc5588dcc0a7995521a89ba1b7e0c92a1 (diff) | |
download | initscripts-78c8dbff1a6a2dd63d948ae82942b5c8dc6500ae.tar.gz initscripts-78c8dbff1a6a2dd63d948ae82942b5c8dc6500ae.tar.xz initscripts-78c8dbff1a6a2dd63d948ae82942b5c8dc6500ae.zip |
add changelog
-rw-r--r-- | initscripts.spec | 3 | ||||
-rw-r--r-- | src/redhat-support-check.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/initscripts.spec b/initscripts.spec index 9bd5638c..24a0dd27 100644 --- a/initscripts.spec +++ b/initscripts.spec @@ -207,6 +207,9 @@ rm -rf $RPM_BUILD_ROOT %ghost %attr(0664,root,utmp) /var/run/utmp %changelog +* Thu Jan 12 2006 Bill Nottingham <notting@redhat.com> +- ignore sysfs but not /sys<otherstuff> (#177612, <bnocera@redhat.com>) + * Thu Dec 15 2005 Bill Nottingham <notting@redhat.com> 7.93.24.EL-1 - correct fix for #172804 diff --git a/src/redhat-support-check.c b/src/redhat-support-check.c index dd5bc162..db80227c 100644 --- a/src/redhat-support-check.c +++ b/src/redhat-support-check.c @@ -67,7 +67,7 @@ unsigned int get_num_cpus() { int ncpus = sysconf(_SC_NPROCESSORS_ONLN); #if defined(__i386__) || defined(__x86_64__) - u_int32_t eax = 0, ebx = 0, ecx = 0, edx = 0; + u_int32_t eax = 0, ebx = 1, ecx = 0, edx = 0; cpuid(0, &eax, &ebx, &ecx, &edx); if (ebx == 0x756e6547) { /* Intel */ |