[debian-edu-commits] debian-edu/ 01/01: Drop debian-edu-hwsetup, we are going to use isenkram-cli instead. (See #839724)

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to branch master
in repository debian-edu-config.

commit a242258ad1f26042a145ff6f4ec5f89ca257fa78
Author: Holger Levsen <holger at layer-acht.org>
Date:   Tue Oct 4 12:22:31 2016 +0200

    Drop debian-edu-hwsetup, we are going to use isenkram-cli instead. (See #839724)
---
 Makefile                |  1 -
 cf/cf.apt               |  4 ---
 debian/changelog        |  4 +--
 sbin/debian-edu-hwsetup | 96 -------------------------------------------------
 4 files changed, 2 insertions(+), 103 deletions(-)

diff --git a/Makefile b/Makefile
index 416df06..91a5a65 100644
--- a/Makefile
+++ b/Makefile
@@ -7,7 +7,6 @@ PROGS = \
 
 SPROGS = cfengine-debian-edu \
 	debian-edu-fsautoresize \
-	debian-edu-hwsetup \
 	debian-edu-ltsp \
 	debian-edu-nscd-netgroup-cache \
 	debian-edu-pxeinstall \
diff --git a/cf/cf.apt b/cf/cf.apt
index 182e8a3..b577981 100644
--- a/cf/cf.apt
+++ b/cf/cf.apt
@@ -18,8 +18,4 @@ editfiles:
       AppendIfNoSuchLine "deb http://httpredir.debian.org/debian stretch main contrib non-free"
     }
 
-shellcommands:
 
-  debian::
-
-    "/usr/sbin/debian-edu-hwsetup"
diff --git a/debian/changelog b/debian/changelog
index 37b1802..2ce957d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,7 @@
 debian-edu-config (1.913) UNRELEASED; urgency=medium
 
-  * Makefile: add back debian-edu-hwsetup which was accidently removed in
-    84e06a5d.
+  * Drop debian-edu-hwsetup, we are going to use isenkram-cli instead.
+    (See #839724)
   * Add .gitignore file to be able to ignore .nobackup.
 
  -- Holger Levsen <holger at debian.org>  Sat, 01 Oct 2016 15:11:32 +0200
diff --git a/sbin/debian-edu-hwsetup b/sbin/debian-edu-hwsetup
deleted file mode 100755
index 53e9720..0000000
--- a/sbin/debian-edu-hwsetup
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/sh
-#
-# Executed during installation to implement hardware specific workarounds.
-
-set -e
-
-if [ -t 1 ] ; then
-    MANUAL_RUN=true
-else
-    MANUAL_RUN=false
-fi
-
-info() {
-    echo "info: $@" 1>&2
-}
-
-append_if_missing() {
-    file="$1"
-    string="$2"
-    if [ -f "$file" ] && grep -q "$string" "$file" ; then
-        :
-    else
-        (
-            if [ -f "$file" ] ; then cat "$file" ; fi
-	    echo "$string"
-        ) > "$file.new" && mv "$file.new" "$file"
-    fi
-}
-
-add_nonfree_pkg() {
-    pkg="$1"
-    codename=$(debian-edu-current-codename)
-
-    info "Installing non-free package $pkg from $codename."
-    if ! LC_ALL=C apt-cache show $binpkg 2>&1 | \
-               grep -q 'E: No packages found' ; then
-	echo deb http://httpredir.debian.org/debian $codename non-free \
-	    > /etc/apt/sources.list.d/$pkg.list
-	chmod a+r /etc/apt/sources.list.d/$pkg.list
-	apt-get -qq update
-    fi
-    apt-get -qq install -y $pkg
-}
-
-acpi_backlight_vendor() {
-    append_if_missing /etc/default/grub \
-	'GRUB_CMDLINE_LINUX_DEFAULT="$GRUB_CMDLINE_LINUX_DEFAULT acpi_backlight=vendor"'
-    chmod a+r /etc/default/grub
-    update-grub
-}
-
-i915_invert_brightness() {
-    append_if_missing /etc/modprobe.d/i915.conf \
-        "options i915 invert_brightness=1"
-    chmod a+r /etc/modprobe.d/i915.conf
-    update-initramfs -u -k all
-}
-
-info "looking for PCI device specific overrides"
-for modaliasfile in /sys/bus/pci/devices/*/modalias; do
-    modalias="$(cat $modaliasfile)"
-    case "$modalias" in
-        # Workaround for BTS report #710938 (Packard Bell EasyNote LV)
-        # See http://www.linlap.com/packard_bell_easynote_lv
-        pci:v00008086d00000156sv00001025sd00000688bc*)
-            acpi_backlight_vendor
-            ;;
-
-        # Workaround for BTS report #714154 (Acer Aspire V3-771G model
-        # VA70)
-        pci:v00008086d00000166sv00001025sd00000686bc*)
-            i915_invert_brightness
-            ;;
-    esac
-done
-
-info "looking for DMI manufacturer and product specific overrides"
-manufacturer=$(dmidecode -s system-manufacturer)
-productname=$(dmidecode -s system-product-name)
-
-case "$manufacturer" in
-    'Hewlett-Packard')
-	case "$productname" in 
-    	    'HP 2133')
-		# Avoid white on white console.  See
-		# http://wiki.debian.org/InstallingDebianOn/HP/HP2133
-		# http://morethan.org/mini-note/xorg-mini.html
-		append_if_missing /etc/default/acpi-support \
-		    'SAVE_VBE_STATE=false'
-		;;
-	esac
-	;;
-esac
-
-# Autodetect firmware packages and install them
-isenkram-autoinstall-firmware

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git