Received: by 2002:a05:6a10:9848:0:0:0:0 with SMTP id x8csp802769pxf; Wed, 7 Apr 2021 11:57:18 -0700 (PDT) X-Google-Smtp-Source: ABdhPJz8UdZHo5Tf/sZVXzOuQB6CbBbkqaqk8EAGNi60aPzKtJBkfhvcQKbiyAZK3rfSw87lNign X-Received: by 2002:a05:6638:d0d:: with SMTP id q13mr4887827jaj.141.1617821837972; Wed, 07 Apr 2021 11:57:17 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1617821837; cv=none; d=google.com; s=arc-20160816; b=hF8J660RhAjPoZxRKUDZKkW+wKZzyL5PyGjGEZ9FHbphp4pZ23P54evHIV5ypqHe/U jSyP4FQdKn6KA4f9pCg7KBTGyFoR4Jzqot7MdVCFnNOuZ/7isCEby2Li2mQ+eYSLXH4v 6v2VrB+q7iKnhvRszmTVCsw0Y2dpG87JaxsDb0ka3f91WNLaoeklzjLST7xv1JvB08/v QaE5eIDEmlqrk8ct6z8b/T/lOR3SFiCWdaqjXH1CAfr226s+ZuDwWfNc+ycUQKylrdAj aTolIQn0VrxooAUWTvyYEY0nPdRMzxtkCSxZ6do7acnq0BfTtdAmRm1TEcA5sz8v78Ab z8LQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=aDg6HJHBNrhN9VWWQSumC4v8ocHizVzg5KERenMWywE=; b=njNIQK708ktYeoXnXb7p2rpAn36LU62ouT+rW7bNKwp+2YISPqz8j+1Ez7QetTqJsk OqPFA3inm6b3abThkLfbNkQlelVqiloIeFtvieKjejHBXds6/tmWD6Zs15zqN6glUuGc syQDl42RPrWSo10lSeG9WZRrlhi6fWJxzTYZ9zNvongELG2ik8Dl+7cZ8PTrIJKPBx6M 8jkOgv1q9Qx/qURymp2xs1/nhaILyPt8wj+2a1vcUipV4c8VfSTTCTfd5qMeGQ0IOe90 62wevbfcKY8lBXsaNcT6s4whv0HTl0zmkfi9hNDKnk9VL6p6MoNaasDvrofPbIIyc5ys MD5w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DSc+53E7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f9si8651194ila.60.2021.04.07.11.57.05; Wed, 07 Apr 2021 11:57:17 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=DSc+53E7; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S243388AbhDGFgE (ORCPT + 99 others); Wed, 7 Apr 2021 01:36:04 -0400 Received: from mail.kernel.org ([198.145.29.99]:39072 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1348808AbhDGFfm (ORCPT ); Wed, 7 Apr 2021 01:35:42 -0400 Received: by mail.kernel.org (Postfix) with ESMTPSA id 9ADAC613AF; Wed, 7 Apr 2021 05:35:32 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1617773733; bh=gLoJ516uqKiucx6WRY0TlVov1Wwhx5YWTL7Jb2S9rMc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=DSc+53E7iJBo9rRyDlEgQM3yAP3O80Tk4OWDSXGQhLyjnioXJA7+cKZNbaBDvdtRt U8F3ywI3N9PlJiAJvANFVNQkEo33HExlJvQQQcEtZsz2DPc5JQZ5EtzP0brNA6IcUx /kJLcf6M47uvVpWJDIlihbVjO6pxB27rk4bE/Eh0= From: Greg Kroah-Hartman To: Masahiro Yamada , Michal Marek Cc: linux-kbuild@vger.kernel.org, linux-arch@vger.kernel.org, linux-kernel@vger.kernel.org, Greg Kroah-Hartman Subject: [PATCH 05/20] kbuild: scripts/install.sh: prepare for arch-specific bootloaders Date: Wed, 7 Apr 2021 07:34:04 +0200 Message-Id: <20210407053419.449796-6-gregkh@linuxfoundation.org> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210407053419.449796-1-gregkh@linuxfoundation.org> References: <20210407053419.449796-1-gregkh@linuxfoundation.org> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Despite the last release of LILO being in 2015, it seems that it is still the default x86 bootloader and wants to be called to "install" the new kernel image when it has been replaced on the disk. To allow arch-specific programs like this to be called in future changes, move the logic to an arch-specific test now. Signed-off-by: Greg Kroah-Hartman --- scripts/install.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/install.sh b/scripts/install.sh index 92d0d2ade414..2adcb993efa2 100644 --- a/scripts/install.sh +++ b/scripts/install.sh @@ -54,10 +54,15 @@ install "$2" "$4"/vmlinuz install "$3" "$4"/System.map sync -if [ -x /sbin/lilo ]; then - /sbin/lilo -elif [ -x /etc/lilo/install ]; then - /etc/lilo/install -else - echo "Cannot find LILO." -fi +# Some architectures like to call specific bootloader "helper" programs: +case "${ARCH}" in + x86) + if [ -x /sbin/lilo ]; then + /sbin/lilo + elif [ -x /etc/lilo/install ]; then + /etc/lilo/install + else + echo "Cannot find LILO." + fi + ;; +esac -- 2.31.1