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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 69B971396D1 for ; Mon, 4 Sep 2017 05:54:37 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 984F3E0C5F; Mon, 4 Sep 2017 05:54:36 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 692AEE0C5F for ; Mon, 4 Sep 2017 05:54:36 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B774B341686 for ; Mon, 4 Sep 2017 05:54:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BC8298D57 for ; Mon, 4 Sep 2017 05:54:32 +0000 (UTC) From: "Robin H. Johnson" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Robin H. Johnson" Message-ID: <1504504361.3a005bbaea41cf1e87e6a256bbf9e53cd26584a9.robbat2@gentoo> Subject: [gentoo-commits] proj/genkernel:master commit in: defaults/ X-VCS-Repository: proj/genkernel X-VCS-Files: defaults/initrd.scripts X-VCS-Directories: defaults/ X-VCS-Committer: robbat2 X-VCS-Committer-Name: Robin H. Johnson X-VCS-Revision: 3a005bbaea41cf1e87e6a256bbf9e53cd26584a9 X-VCS-Branch: master Date: Mon, 4 Sep 2017 05:54:32 +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-Archives-Salt: 648773bc-54ee-4ce8-a2f6-57e18970ce35 X-Archives-Hash: 4dcf821664cc4d36a40bfac732f9d18e commit: 3a005bbaea41cf1e87e6a256bbf9e53cd26584a9 Author: Robin H. Johnson gentoo org> AuthorDate: Mon Sep 4 05:52:41 2017 +0000 Commit: Robin H. Johnson gentoo org> CommitDate: Mon Sep 4 05:52:41 2017 +0000 URL: https://gitweb.gentoo.org/proj/genkernel.git/commit/?id=3a005bba initrd.scripts: fix cdupdate.sh path check This has been broken since the v3.4.52 release, more than 2 years ago. Looks like cdupdate.sh gets very little use. Fixes: https://bugs.gentoo.org/show_bug.cgi?id=593866 Signed-off-by: Robin H. Johnson gentoo.org> defaults/initrd.scripts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/defaults/initrd.scripts b/defaults/initrd.scripts index efc6421..ee9aeb5 100644 --- a/defaults/initrd.scripts +++ b/defaults/initrd.scripts @@ -1410,10 +1410,14 @@ verbose_kmsg() { cdupdate() { if [ "${CDROOT}" = '1' ] then - if [ -x /${CDROOT_PATH}/cdupdate.sh ] + cdupdate_path='' + for p in /${NEW_ROOT}/${CDROOT_PATH}/ /${CDROOT_PATH}/ ; do + [ -x "${p}/cdupdate.sh" ] && cdupdate_path="${p}/cdupdate.sh" && break + done + if [ -n "${cdupdate_path}" ] then - good_msg "Running cdupdate.sh" - ${CDROOT_PATH}/cdupdate.sh + good_msg "Running cdupdate.sh ($cdupdate_path)" + ${cdupdate_path} if [ "$?" != '0' ] then bad_msg "Executing cdupdate.sh failed!"