[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[PATCH] EFI: don't mistakenly delete a file we never installed


  • To: "xen-devel@xxxxxxxxxxxxxxxxxxxx" <xen-devel@xxxxxxxxxxxxxxxxxxxx>
  • From: Jan Beulich <jbeulich@xxxxxxxx>
  • Date: Mon, 25 Apr 2022 12:47:18 +0200
  • Arc-authentication-results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=suse.com; dmarc=pass action=none header.from=suse.com; dkim=pass header.d=suse.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=gSHZrWWi42V/brh4EXJTJNbSe9aBFjvHmxN0fNwYBR4=; b=LKM3ZAo7p+3+02rZ4Kkrz0k1fzf3oaU5edF2fJp8b8I1VUZwwWRSi+3bOgl7PjPRDFWy3bRMlsdV+Eu0RdY0vaxHmCXH545y1PcRwxGLKOqafELNvLwLubXtdx5O2+n3qDrznTQueWXB6b031GPBxSoY35LWR8aJhL101G9u24SJ06cx7daJjSKnLQjc46aYrFMtdiPzPhrRh9pVd7dk6GcFimmkd6Vt8HiZ03dZiIZuimXgr8Udt/JT166nvqf2QYV5U55+qUS1i00mqfwN9L445I0aSht5cd6xGx1Rjh0u//fgCYBAn0eZqLlNjHELhJc2y17X/goB5lUR9/n3ig==
  • Arc-seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=gwkCsvwCqPq6Yp5f2zzM2NxLnB8q6/4V+aIqIlhwqTN4R4Xt3HrfiFaHenKEGtnrgS8WUNqF62xIZ3Cd9lg90x94Qlf8ArQb4rlqUNuv7ynN6DuPRCEV9pNzcefmKTR4r0KPfjW8MUaypS2qOQhSKjSaFCG64S8wlqSZYJ4a4EIcZz+WlAyd3/oqVNKcWr20wwfFP5CMt3A0boeA8dwU4hpcaah4U+cSxeOfQ1k5nfhKLGCQkso6uZPAZTzhH1JOQkTsao1RzwhgW5l43jwrB2KQ83VTd5uVX3VFvGUf5LuFvjjzCbYBTtzTQ+CPrxcxjRhSKIc3mNRC4R1lztx7ZA==
  • Authentication-results: dkim=none (message not signed) header.d=none;dmarc=none action=none header.from=suse.com;
  • Cc: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>, George Dunlap <george.dunlap@xxxxxxxxxx>, Julien Grall <julien@xxxxxxx>, Stefano Stabellini <sstabellini@xxxxxxxxxx>, Wei Liu <wl@xxxxxxx>
  • Delivery-date: Mon, 25 Apr 2022 10:47:28 +0000
  • List-id: Xen developer discussion <xen-devel.lists.xenproject.org>

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>

--- 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:




 


Rackspace

Lists.xenproject.org is hosted with RackSpace, monitoring our
servers 24x7x365 and backed by RackSpace's Fanatical Support®.