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 3D6D715802F for ; Wed, 29 Mar 2023 19:31:15 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0402E2BC021; Wed, 29 Mar 2023 19:31:13 +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 B1B942BC021 for ; Wed, 29 Mar 2023 19:31:12 +0000 (UTC) From: Ben Kohler To: gentoo-catalyst@lists.gentoo.org Subject: [gentoo-catalyst] [PATCH 03/10] livecdfs-update.sh: remove code obsoleted by sys-apps/hwids package Date: Wed, 29 Mar 2023 14:30:53 -0500 Message-Id: <20230329193100.2976079-3-bkohler@gentoo.org> X-Mailer: git-send-email 2.40.0 In-Reply-To: <20230329193100.2976079-1-bkohler@gentoo.org> References: <20230329193100.2976079-1-bkohler@gentoo.org> Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-catalyst@lists.gentoo.org Reply-to: gentoo-catalyst@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Archives-Salt: 746d62de-10e5-4759-8bb1-2657757d74c9 X-Archives-Hash: a54bb573971f92c54ab3df1c2000c881 Signed-off-by: Ben Kohler --- 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) -- 2.40.0