Browse Source

* Change laptop-detect from a dependency to a recommendation. It will be

installed by d-i on specific architectures.
* Change desktop test to avoid testing twice if dmidecode is executable.
tags/2.72
Otavio Salvador 13 years ago
parent
commit
19f802bd46
4 changed files with 12 additions and 4 deletions
  1. +5
    -0
      debian/changelog
  2. +2
    -1
      debian/control
  3. +3
    -2
      tests/desktop
  4. +2
    -1
      tests/laptop

+ 5
- 0
debian/changelog View File

@@ -20,6 +20,11 @@ tasksel (2.72) UNRELEASED; urgency=low
* Switch grome-desktop from gnome-btdownload to transmission-gtk.
Closes: #463844

[ Otavio Salvador ]
* Change laptop-detect from a dependency to a recommendation. It will be
installed by d-i on specific architectures.
* Change desktop test to avoid testing twice if dmidecode is executable.

-- Bart Cornelis (cobaco) <cobaco@linux.be> Sat, 12 Jan 2008 18:00:12 +0100

tasksel (2.71) unstable; urgency=low


+ 2
- 1
debian/control View File

@@ -17,7 +17,8 @@ Description: Tool for selecting tasks for installation on Debian systems

Package: tasksel-data
Architecture: all
Depends: tasksel, laptop-detect
Depends: tasksel
Recommends: laptop-detect
Conflicts: tasksel (<< 2.67)
Description: Official tasks used for installation of Debian systems
This package contains data about the standard tasks available on a Debian


+ 3
- 2
tests/desktop View File

@@ -69,7 +69,8 @@ enough_disk () {
}

desktop_hardware () {
if laptop-detect; then
if which laptop-detect >/dev/null && \
laptop-detect; then
# Nearly always appropriate to include a desktop.
return 0
else
@@ -82,7 +83,7 @@ desktop_hardware () {
}

rack_hardware () {
if [ -x "`which dmidecode 2>/dev/null`" ] && \
if which dmidecode >/dev/null && \
dmidecode | grep -q 'Type: Rack Mount Chassis'; then
return 0
fi


+ 2
- 1
tests/laptop View File

@@ -2,7 +2,8 @@
# Causes a task to be selected if the machine appears to be a laptop.

if [ "$NEW_INSTALL" ]; then
if laptop-detect; then
if which laptop-detect >/dev/null && \
laptop-detect; then
exit 2 # mark for install
else
exit 3 # do not mark for install


Loading…
Cancel
Save