[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH] EFI: don't mistakenly delete a file we never installed
- To: Jan Beulich <jbeulich@xxxxxxxx>
- From: Bertrand Marquis <Bertrand.Marquis@xxxxxxx>
- Date: Tue, 26 Apr 2022 12:10:00 +0000
- Accept-language: en-GB, en-US
- Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none
- Arc-message-signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=oCKw1nkpsgceXVHb8Mi4DlC2gPqh+4l4lId6VzMWBRg=; b=ggHxmCGlf7ygPOkoApxW5+aAz872T+8+bo0PWg/GMXcood7DNm+Fu+RnWNiBVvx2il9AgZv6CA9tzObM6h7+wnMz1T6OA/Crn+NoRNuahgICDKDGPkaCZzkrMviE0KfvNQwjMqvIsDepTtUToaIyn+ebknvhcdcckWxafNtCcm1QO6h/ZHIQ+Pu6KRCfJFZkQlNjfJZ6SDkleh84F3Jda7d5ivoSwLplcX/a4Mjt+F9/HpoMlO5bPREv1/K5IZ+2HQC4qw1kA+UI1904JtSXnPzv+moYIza1B9KGPlZ5KtQVE9UCd09SDkYYEmwyY2vN195OOo/TD/ZFRlTVADuC/A==
- Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KPNR0prR1Hk6icDkPX7KiDEjxhlF+mlTLMiXskP07CGaU/tFw9zjGqA3A0GU4jhzSrhMDTF/cES0rvnlfk3dO11S28JGBBcA8lxvk6igdpRqtzu7tbl2hA1WHNfzyING8afk0TnRUxtqD9Gg01b5JaAKK7uXhXnkk+gn7e76VQ8WkDFXFE8U52EeihAS6bgrgg+ylGx4iFJXQZYoH1JH0FetbVJuxDfXQ1LuMstcfZLqkiPyvELRVR4SWkp9cjpSN0M3FIRyKYMrMLxyGMNt7FQ3+WHeaSQ0fFT/H89uMLIef/xhdpKCC2td9B9CEeU9FrvQpnpQMAj2VFdcZeRevA==
- Authentication-results-original: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
- Cc: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>, Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
- Delivery-date: Tue, 26 Apr 2022 12:10:21 +0000
- List-id: Xen developer discussion <xen-devel.lists.xenproject.org>
- Nodisclaimer: true
- Original-authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=arm.com;
- Thread-index: AQHYWJHnY72yQgrHIUiap4LuJb9TMa0CG/WA
- Thread-topic: [PATCH] EFI: don't mistakenly delete a file we never installed
Hi Jan,
> On 25 Apr 2022, at 11:47, Jan Beulich <jbeulich@xxxxxxxx> wrote:
>
> Just like for "install", make dealing with xen.efi on the EFI partition
> dependent upon mount point and vendor directory being known.
>
> Signed-off-by: Jan Beulich <jbeulich@xxxxxxxx>
Reviewed-by: Bertrand Marquis <bertrand.marquis@xxxxxxx>
Cheers
Bertrand
>
> --- a/xen/Makefile
> +++ b/xen/Makefile
> @@ -515,7 +515,9 @@ _uninstall:
> rm -f $(D)$(DEBUG_DIR)/$(T)-$(XEN_FULLVERSION).efi.map
> rm -f $(D)$(EFI_DIR)/$(T)-$(XEN_VERSION).efi
> rm -f $(D)$(EFI_DIR)/$(T).efi
> - rm -f
> $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi
> + if [ -n '$(EFI_MOUNTPOINT)' -a -n '$(EFI_VENDOR)' ]; then \
> + rm -f
> $(D)$(EFI_MOUNTPOINT)/efi/$(EFI_VENDOR)/$(T)-$(XEN_FULLVERSION).efi; \
> + fi
>
> .PHONY: _debug
> _debug:
>
>
|