From: Michael Prokop <mika@grml.org>
Date: Wed, 6 Sep 2023 16:20:50 +0000 (+0200)
Subject: Drop deprecated GRMLBASE/93-update-usbids (update-usbids is gone)
X-Git-Tag: v0.46.0~5
X-Git-Url: http://git.grml.org/?p=grml-live.git;a=commitdiff_plain;h=f0c9feee3e66db7a923eaad30d2bf65f07d51bc9

Drop deprecated GRMLBASE/93-update-usbids (update-usbids is gone)

update-usbids is no longer available since usbutils v008,
quoting from https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=805330:

| version 008, usbutils doesn't use usb.ids anymore. Instead
| it uses the udev hardware database. usb.ids is now provided by the
| package with the same name, but it doesn't provide any script to update
| it.

Given that usbutils v1:010-3 is available in Debian oldoldstable AKA
buster, there's no point in further shipping our 93-update-usbids
script any longer.
---

diff --git a/debian/grml-live.maintscript b/debian/grml-live.maintscript
index 8e029f0..c00535e 100644
--- a/debian/grml-live.maintscript
+++ b/debian/grml-live.maintscript
@@ -5,3 +5,4 @@ rm_conffile /etc/grml/fai/config/files/etc/lsb-base-logging.sh/GRMLBASE 0.42.3~
 rm_conffile /etc/grml/fai/config/files/etc/systemd/system/serial-getty@ttyS0.service.d/override.conf/GRMLBASE 0.33.2~
 rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/36-cpufrequtils 0.33.0~
 rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/40-deborphan 0.35.0~
+rm_conffile /etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids 0.45.0~
diff --git a/etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids b/etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids
deleted file mode 100755
index d2972d3..0000000
--- a/etc/grml/fai/config/scripts/GRMLBASE/93-update-usbids
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/bin/bash
-# Filename:      ${GRML_FAI_CONFIG}/config/scripts/GRMLBASE/93-update-usbids
-# Purpose:       update pciids
-# Authors:       (c) Michael Prokop <mika@grml.org>
-# Bug-Reports:   see http://grml.org/bugs/
-# License:       This file is licensed under the GPL v2.
-################################################################################
-
-if ifclass NO_ONLINE ; then
-  echo "Ignoring script 93-update-usbids as NO_ONLINE is set."
-  exit 0
-fi
-
-set -u
-set -e
-
-[ -x $target/usr/bin/timeout ] && TIMEOUT="10" || TIMEOUT=""
-
-if ! [ -x "${target}/usr/sbin/update-usbids" ] && ! [ -x "${target}/usr/bin/update-usbids" ] ; then
-  echo "Warning: update-usbids not installed (neither /usr/sbin/update-usbids nor /usr/bin/update-usbids exists)"
-  exit 0
-fi
-
-echo "Updating USB-IDs"
-if [ -n "$TIMEOUT" ] ; then
-   $ROOTCMD timeout $TIMEOUT update-usbids
-else
-   $ROOTCMD update-usbids
-fi
-
-## END OF FILE #################################################################
-# vim:ft=sh expandtab ai tw=80 tabstop=4 shiftwidth=2