From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id A26D915802F for ; Fri, 31 Mar 2023 13:28:51 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80632E07FA; Fri, 31 Mar 2023 13:28:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 53039E07FA for ; Fri, 31 Mar 2023 13:28:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3F976340FB5 for ; Fri, 31 Mar 2023 13:28:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 0559EA0C for ; Fri, 31 Mar 2023 13:28:47 +0000 (UTC) From: "Ben Kohler" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ben Kohler" Message-ID: <1680269257.1dfba7ee041d6b1e6a8a7af58f28728a8912a1ab.bkohler@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: targets/support/ X-VCS-Repository: proj/catalyst X-VCS-Files: targets/support/livecdfs-update.sh X-VCS-Directories: targets/support/ X-VCS-Committer: bkohler X-VCS-Committer-Name: Ben Kohler X-VCS-Revision: 1dfba7ee041d6b1e6a8a7af58f28728a8912a1ab X-VCS-Branch: master Date: Fri, 31 Mar 2023 13:28:47 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 42ca3167-a101-4c05-8a72-0ae2dd627976 X-Archives-Hash: 4238f9b5ed91f82453fd0cdc457b40fa commit: 1dfba7ee041d6b1e6a8a7af58f28728a8912a1ab Author: Ben Kohler gentoo org> AuthorDate: Wed Mar 29 18:37:43 2023 +0000 Commit: Ben Kohler gentoo org> CommitDate: Fri Mar 31 13:27:37 2023 +0000 URL: https://gitweb.gentoo.org/proj/catalyst.git/commit/?id=1dfba7ee livecdfs-update.sh: remove code obsoleted by sys-apps/hwids package Signed-off-by: Ben Kohler gentoo.org> targets/support/livecdfs-update.sh | 24 ------------------------ 1 file changed, 24 deletions(-) diff --git a/targets/support/livecdfs-update.sh b/targets/support/livecdfs-update.sh index 1be4baea..a2ac26c8 100755 --- a/targets/support/livecdfs-update.sh +++ b/targets/support/livecdfs-update.sh @@ -101,30 +101,6 @@ alias ll='ls -l' alias grep='grep --color=auto' EOF -# Make sure we have the latest pci,usb and hotplug ids. Older versions of -# pciutils and usbutils used /sbin, where newer versions use /usr/sbin. -[ -x /sbin/update-pciids ] && /sbin/update-pciids -[ -x /sbin/update-usbids ] && /sbin/update-usbids -[ -x /usr/sbin/update-pciids ] && /usr/sbin/update-pciids -[ -x /usr/sbin/update-usbids ] && /usr/sbin/update-usbids -if [ -d /usr/share/hwdata ] -then - # If we have uncompressed pci and usb ids files, symlink them. - [ -f /usr/share/misc/pci.ids ] && [ -f /usr/share/hwdata/pci.ids ] && \ - rm -f /usr/share/hwdata/pci.ids && ln -s /usr/share/misc/pci.ids \ - /usr/share/hwdata/pci.ids - [ -f /usr/share/misc/usb.ids ] && [ -f /usr/share/hwdata/usb.ids ] && \ - rm -f /usr/share/hwdata/usb.ids && ln -s /usr/share/misc/usb.ids \ - /usr/share/hwdata/usb.ids - # If we have compressed pci and usb files, we download our own copies. - [ -f /usr/share/misc/pci.ids.gz ] && [ -f /usr/share/hwdata/pci.ids ] && \ - rm -f /usr/share/hwdata/pci.ids && wget -O /usr/share/hwdata/pci.ids \ - http://pciids.sourceforge.net/v2.2/pci.ids - [ -f /usr/share/misc/usb.ids.gz ] && [ -f /usr/share/hwdata/usb.ids ] && \ - rm -f /usr/share/hwdata/usb.ids && wget -O /usr/share/hwdata/usb.ids \ - http://www.linux-usb.org/usb.ids -fi - # Tweak the MOTD for Gentoo releases case ${clst_livecd_type} in gentoo-release-universal)