diff options
| author | Ryan Moeller <freqlabs@FreeBSD.org> | 2021-03-26 18:12:18 +0000 |
|---|---|---|
| committer | Ryan Moeller <freqlabs@FreeBSD.org> | 2021-03-29 13:34:12 +0000 |
| commit | 16443ffd4108bed3c290fee90d7337ba6877bb3e (patch) | |
| tree | 9dd03b9751cfeee0c3e3c371fc7f1148e3a7b04e | |
| parent | af68f5380642b3beb7be25cdacd73848f9c680e3 (diff) | |
| download | src-16443ffd4108bed3c290fee90d7337ba6877bb3e.tar.gz src-16443ffd4108bed3c290fee90d7337ba6877bb3e.zip | |
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
(cherry picked from commit b07b7aec6534052d60cffe010c0426a7ab986d85)
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/partedit.c | 14 | ||||
| -rw-r--r-- | usr.sbin/bsdinstall/partedit/partedit.h | 2 |
2 files changed, 1 insertions, 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 e989decc2359..1dccc653aea1 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; |