From 4e88b7a5a0432e9b7f0e09bf25e20c2d623d21a1 Mon Sep 17 00:00:00 2001 From: Christian Hofstaedtler Date: Tue, 15 Nov 2011 17:06:55 +0100 Subject: [PATCH 1/1] Remove spurious laptop-detect dependency --- autoconfig.functions | 2 +- debian/control | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/autoconfig.functions b/autoconfig.functions index a0846d9..c5fa8df 100755 --- a/autoconfig.functions +++ b/autoconfig.functions @@ -966,7 +966,7 @@ else einfo "Detecting CPU: `awk -F: '/^processor/{printf " Processor"$2" is"};/^model name/{printf $2};/^vendor_id/{printf vendor};/^cpu MHz/{printf " %dMHz",int($2)};/^cache size/{printf ","$2" Cache"};/^$/{print ""}' /proc/cpuinfo 2>>$DEBUG` " ; eend 0 fi -# Virtual Box supports ACPI and laptop-detect would return with '0', so check for it: +# no cpufreq setup inside VirtualBox if [ -r /proc/acpi/battery/BAT0/info ] && grep -q 'OEM info:.*innotek' /proc/acpi/battery/BAT0/info ; then einfo 'Virtual Box detected, skipping cpufreq setup.' ; eend 0 return 0 diff --git a/debian/control b/debian/control index 92d6258..25d0d30 100644 --- a/debian/control +++ b/debian/control @@ -15,7 +15,7 @@ Package: grml-autoconfig Architecture: all Conflicts: grml-etc (<= 0.4-7), grml-saveconfig Replaces: grml-saveconfig -Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, laptop-detect, udev (>= 0.080-1), zsh, gpm, rsyslog | system-log-daemon, kbd | console-utilities, console-terminus, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync, grml-network (>= 0.3.7) +Depends: ${shlibs:Depends}, ${misc:Depends}, acpid | apmd, udev (>= 0.080-1), zsh, gpm, rsyslog | system-log-daemon, kbd | console-utilities, console-terminus, grml-rebuildfstab (>= 0.3-1), grml-etc-core (>= 0.1-3), grml-scripts (>= 0.8-14), gawk, rungetty, rsync, grml-network (>= 0.3.7) Recommends: acpi-support, hwinfo, alsa-utils, mdadm, aumix, locales, grml2hd, grml-debootstrap (>= 0.7) Description: main bootup process of a Grml (based) system grml-autoconfig is the main part of the bootup process of the -- 2.1.4