git: b07b7aec6534 - main - bsdinstall: Drop vestigial bsdinstall-esps cleanup

[Ryan Moeller]

The branch main has been updated by freqlabs:

URL: https://cgit.FreeBSD.org/src/commit/?id=b07b7aec6534052d60cffe010c0426a7ab986d85

commit b07b7aec6534052d60cffe010c0426a7ab986d85
Author:     Ryan Moeller <freqlabs at FreeBSD.org>
AuthorDate: 2021-03-26 18:12:18 +0000
Commit:     Ryan Moeller <freqlabs at FreeBSD.org>
CommitDate: 2021-03-26 18:12:18 +0000

    bsdinstall: Drop vestigial bsdinstall-esps cleanup
    
    This is not needed after 0b7472b3d8d2f1e90fade5236b44fd98d8e396c2.
    
    MFC after:      3 days
    Sponsored by:   iXsystems, Inc.
    Reviewed by:    imp
    Differential Revision:  https://reviews.freebsd.org/D29325
---
 usr.sbin/bsdinstall/partedit/partedit.c | 14 +-------------
 usr.sbin/bsdinstall/partedit/partedit.h |  2 --
 2 files changed, 1 insertion(+), 15 deletions(-)

diff --git a/usr.sbin/bsdinstall/partedit/partedit.c b/usr.sbin/bsdinstall/partedit/partedit.c
index 6d045428dd32..84f7ef032ba9 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.c
+++ b/usr.sbin/bsdinstall/partedit/partedit.c
@@ -45,7 +45,6 @@
 #include "partedit.h"
 
 struct pmetadata_head part_metadata;
-int tmpdfd;
 static int sade_mode = 0;
 
 static int apply_changes(struct gmesh *mesh);
@@ -69,8 +68,6 @@ sigint_handler(int sig)
 
 	end_dialog();
 
-	close(tmpdfd);
-
 	exit(1);
 }
 
@@ -78,7 +75,7 @@ int
 main(int argc, const char **argv)
 {
 	struct partition_metadata *md;
-	const char *progname, *prompt, *tmpdir;
+	const char *progname, *prompt;
 	struct partedit_item *items = NULL;
 	struct gmesh mesh;
 	int i, op, nitems, nscroll;
@@ -90,14 +87,6 @@ main(int argc, const char **argv)
 
 	TAILQ_INIT(&part_metadata);
 
-	tmpdir = getenv("TMPDIR");
-	if (tmpdir == NULL)
-		tmpdir = "/tmp";
-	tmpdfd = open(tmpdir, O_DIRECTORY);
-	if (tmpdfd < 0)
-		err(EX_OSERR, "%s", tmpdir);
-	unlinkat(tmpdfd, "bsdinstall-esps", 0);
-
 	init_fstab_metadata();
 
 	init_dialog(stdin, stdout);
@@ -233,7 +222,6 @@ main(int argc, const char **argv)
 	geom_deletetree(&mesh);
 	free(items);
 	end_dialog();
-	close(tmpdfd);
 
 	return (error);
 }
diff --git a/usr.sbin/bsdinstall/partedit/partedit.h b/usr.sbin/bsdinstall/partedit/partedit.h
index 20d2047c1408..5c0405922d21 100644
--- a/usr.sbin/bsdinstall/partedit/partedit.h
+++ b/usr.sbin/bsdinstall/partedit/partedit.h
@@ -39,8 +39,6 @@ struct gprovider;
 struct gmesh;
 struct ggeom;
 
-extern int tmpdfd;
-
 TAILQ_HEAD(pmetadata_head, partition_metadata);
 extern struct pmetadata_head part_metadata;