Most ports do not create /.profile /.termcap and /sysinst in the target

before extracting sets, so do not try to delete them after install. Now the '/.profile' from etc.tgz will actually be left after install Note: bebox, evppc, and sandpoint still have a md_copy_filesystem() which dumps a copy of the install filesystem into the target before extracting, so I've left them removing /.profile /.termcap and /sysinst after install.
2008-10-07 09:58:14 +00:00 · 2008-10-07 09:58:14 +00:00 · 8bf1bada05
parent 337b081fed
commit 8bf1bada05
37 changed files with 42 additions and 183 deletions
--- a/distrib/utils/sysinst/arch/acorn26/md.c
+++ b/distrib/utils/sysinst/arch/acorn26/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.21 2008/01/28 02:47:13 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.22 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -330,10 +330,6 @@ md_cleanup_install(void)
 {
 #ifndef DEBUG
 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 #endif
 }

--- a/distrib/utils/sysinst/arch/acorn32/md.c
+++ b/distrib/utils/sysinst/arch/acorn32/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.22 2008/01/28 02:47:13 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.23 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -330,10 +330,6 @@ md_cleanup_install(void)
 {
 #ifndef DEBUG
 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 #endif
 }

--- a/distrib/utils/sysinst/arch/alpha/md.c
+++ b/distrib/utils/sysinst/arch/alpha/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.44 2008/01/28 02:47:13 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.45 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -173,11 +173,8 @@ md_update(void)
 void
 md_cleanup_install(void)
 {
-	enable_rc_conf();

-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
+	enable_rc_conf();
 }

 int
--- a/distrib/utils/sysinst/arch/amiga/md.c
+++ b/distrib/utils/sysinst/arch/amiga/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.20 2008/01/28 02:47:13 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.21 2008/10/07 09:58:14 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -112,10 +112,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/arc/md.c
+++ b/distrib/utils/sysinst/arch/arc/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.30 2008/09/13 16:59:42 tsutsui Exp $	*/
+/*	$NetBSD: md.c,v 1.31 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -315,10 +315,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-	
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));

 	msg_display(MSG_howtoboot);
 	process_menu(MENU_ok, NULL);
--- a/distrib/utils/sysinst/arch/atari/md.c
+++ b/distrib/utils/sysinst/arch/atari/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.21 2008/01/28 02:47:13 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.22 2008/10/07 09:58:14 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -139,10 +139,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/bebox/md.c
+++ b/distrib/utils/sysinst/arch/bebox/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.50 2008/01/28 02:47:13 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.51 2008/10/07 09:58:14 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -148,6 +148,7 @@ md_cleanup_install(void)
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+	/* XXX - the above wipes /.profile from etc.tgz */
 }

 int
--- a/distrib/utils/sysinst/arch/cats/md.c
+++ b/distrib/utils/sysinst/arch/cats/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.19 2008/01/28 02:47:13 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.20 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -183,10 +183,6 @@ md_cleanup_install(void)
 {
 #ifndef DEBUG
 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 #endif
 }

--- a/distrib/utils/sysinst/arch/cobalt/md.c
+++ b/distrib/utils/sysinst/arch/cobalt/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.1 2008/02/02 09:14:32 tsutsui Exp $	*/
+/*	$NetBSD: md.c,v 1.2 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -333,10 +333,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-	
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/evbarm/md.c
+++ b/distrib/utils/sysinst/arch/evbarm/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.20 2008/01/28 02:47:14 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.21 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -156,10 +156,6 @@ md_cleanup_install(void)
 {
 #ifndef DEBUG
 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 #endif
 }

--- a/distrib/utils/sysinst/arch/evbmips/md.c
+++ b/distrib/utils/sysinst/arch/evbmips/md.c
@ -1,4 +1,4 @@
-/* $NetBSD: md.c,v 1.3 2008/01/28 02:47:14 rumble Exp $ */
+/* $NetBSD: md.c,v 1.4 2008/10/07 09:58:14 abs Exp $ */

 /*
 * Copyright 1997,2002 Piermont Information Systems Inc.
@ -60,30 +60,12 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
 md_copy_filesystem(void)
 {

-#if 0
-	if (target_already_root()) {
-		return 0;
-	}
-
-	/* Copy the instbin(s) to the disk */
-	run_program(RUN_DISPLAY | RUN_PROGRESS, 
-	    "pax -X -O -r -w -pe / %s", targetroot_mnt);
-
-	/* Copy next-stage install profile into target /.profile. */
-	if (cp_to_target ("/tmp/.hdprofile", "/.profile")!= 0)
-		return 1;
-	return cp_to_target ("/usr/share/misc/termcap", "/.termcap");
-#endif
 	return 0;
 }

--- a/distrib/utils/sysinst/arch/evbppc/md.c
+++ b/distrib/utils/sysinst/arch/evbppc/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.26 2008/01/28 02:47:14 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.27 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997,2002 Piermont Information Systems Inc.
@ -152,6 +152,7 @@ md_cleanup_install(void)
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+	/* XXX - the above wipes /.profile from etc.tgz */
 }

 int
--- a/distrib/utils/sysinst/arch/ews4800mips/md.c
+++ b/distrib/utils/sysinst/arch/ews4800mips/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.5 2008/01/28 02:47:14 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.6 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -186,10 +186,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/hp300/md.c
+++ b/distrib/utils/sysinst/arch/hp300/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.25 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.26 2008/10/07 09:58:14 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -230,9 +230,6 @@ md_cleanup_install(void)
 #ifdef notyet			/* sed is too large for ramdisk */
 	enable_rc_conf();
 #endif
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/hp700/md.c
+++ b/distrib/utils/sysinst/arch/hp700/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.6 2008/02/02 06:11:23 itohy Exp $	*/
+/*	$NetBSD: md.c,v 1.7 2008/10/07 09:58:14 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -192,10 +192,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/hpcarm/md.c
+++ b/distrib/utils/sysinst/arch/hpcarm/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.4 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.5 2008/10/07 09:58:14 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -134,10 +134,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/hpcmips/md.c
+++ b/distrib/utils/sysinst/arch/hpcmips/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.42 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.43 2008/10/07 09:58:15 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -133,10 +133,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/i386/md.c
+++ b/distrib/utils/sysinst/arch/i386/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.118 2008/01/28 02:47:14 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.119 2008/10/07 09:58:15 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -485,9 +485,6 @@ md_cleanup_install(void)
 			    "sed -an -e '/^ttyE[1-9]/s/off/on/;"
 			    "H;$!d;g;w /etc/ttys' /etc/ttys");

-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/landisk/md.c
+++ b/distrib/utils/sysinst/arch/landisk/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.1 2008/04/14 17:24:56 skrll Exp $	*/
+/*	$NetBSD: md.c,v 1.2 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997,2002 Piermont Information Systems Inc.
@ -60,10 +60,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/mac68k/md.c
+++ b/distrib/utils/sysinst/arch/mac68k/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.52 2008/05/24 21:42:52 hauke Exp $ */
+/*	$NetBSD: md.c,v 1.53 2008/10/07 09:58:15 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -1133,10 +1133,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/macppc/md.c
+++ b/distrib/utils/sysinst/arch/macppc/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.39 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.40 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -175,12 +175,8 @@ md_update(void)
 void
 md_cleanup_install(void)
 {
-  
-	enable_rc_conf();

-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
+	enable_rc_conf();
 }

 int
--- a/distrib/utils/sysinst/arch/mipsco/md.c
+++ b/distrib/utils/sysinst/arch/mipsco/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.14 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.15 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -203,10 +203,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/mvme68k/md.c
+++ b/distrib/utils/sysinst/arch/mvme68k/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.20 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.21 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -230,9 +230,6 @@ md_cleanup_install(void)
 #ifdef notyet			/* sed is too large for ramdisk */
 	enable_rc_conf();
 #endif
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/news68k/md.c
+++ b/distrib/utils/sysinst/arch/news68k/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.28 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.29 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -199,10 +199,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/newsmips/md.c
+++ b/distrib/utils/sysinst/arch/newsmips/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.16 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.17 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -195,10 +195,6 @@ md_cleanup_install()
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/ofppc/md.c
+++ b/distrib/utils/sysinst/arch/ofppc/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.3 2008/01/28 02:47:15 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.4 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -450,10 +450,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/playstation2/md.c
+++ b/distrib/utils/sysinst/arch/playstation2/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.21 2008/01/28 02:47:16 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.22 2008/10/07 09:58:15 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -137,10 +137,6 @@ md_cleanup_install()
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/pmax/md.c
+++ b/distrib/utils/sysinst/arch/pmax/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.60 2008/01/28 02:47:16 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.61 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -202,10 +202,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/prep/md.c
+++ b/distrib/utils/sysinst/arch/prep/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.28 2008/01/28 02:47:16 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.29 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -216,10 +216,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 	
 	run_program(0, "rm -f %s", target_expand("/.bootimage"));
 }
--- a/distrib/utils/sysinst/arch/sandpoint/md.c
+++ b/distrib/utils/sysinst/arch/sandpoint/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.27 2008/01/28 02:47:16 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.28 2008/10/07 09:58:15 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -152,6 +152,7 @@ md_cleanup_install(void)
 	run_program(0, "rm -f %s", target_expand("/sysinst"));
 	run_program(0, "rm -f %s", target_expand("/.termcap"));
 	run_program(0, "rm -f %s", target_expand("/.profile"));
+	/* XXX - the above wipes /.profile from etc.tgz */
 }

 int
--- a/distrib/utils/sysinst/arch/sgimips/md.c
+++ b/distrib/utils/sysinst/arch/sgimips/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.23 2008/01/28 02:47:16 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.24 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -178,10 +178,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 	
 	if (strstr(instsys.version, "(GENERIC32_IP12)"))
 		run_program(0, "/usr/mdec/sgivol -f -w netbsd %s %s",
--- a/distrib/utils/sysinst/arch/shark/md.c
+++ b/distrib/utils/sysinst/arch/shark/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.22 2008/01/28 02:47:16 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.23 2008/10/07 09:58:15 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -197,9 +197,6 @@ md_cleanup_install(void)
 		    "sed -an -e '/^screen/s/^/#/;/^mux/s/^/#/;"
 		    "H;$!d;g;w /etc/wscons.conf' /etc/wscons.conf");

-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 #endif
 }

--- a/distrib/utils/sysinst/arch/sparc/md.c
+++ b/distrib/utils/sysinst/arch/sparc/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.46 2008/01/28 02:47:17 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.47 2008/10/07 09:58:16 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -190,10 +190,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/sparc64/md.c
+++ b/distrib/utils/sysinst/arch/sparc64/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.22 2008/01/28 02:47:17 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.23 2008/10/07 09:58:16 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -188,10 +188,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/vax/md.c
+++ b/distrib/utils/sysinst/arch/vax/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.32 2008/01/28 02:47:17 rumble Exp $	*/
+/*	$NetBSD: md.c,v 1.33 2008/10/07 09:58:16 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -187,10 +187,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/x68k/md.c
+++ b/distrib/utils/sysinst/arch/x68k/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.35 2008/01/28 02:47:17 rumble Exp $ */
+/*	$NetBSD: md.c,v 1.36 2008/10/07 09:58:16 abs Exp $ */

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -321,9 +321,6 @@ md_cleanup_install(void)
 #ifdef notyet			/* sed is too large for ramdisk */
 	enable_rc_conf();
 #endif
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int
--- a/distrib/utils/sysinst/arch/zaurus/md.c
+++ b/distrib/utils/sysinst/arch/zaurus/md.c
@ -1,4 +1,4 @@
-/*	$NetBSD: md.c,v 1.2 2008/04/10 15:45:29 nonaka Exp $	*/
+/*	$NetBSD: md.c,v 1.3 2008/10/07 09:58:16 abs Exp $	*/

 /*
 * Copyright 1997 Piermont Information Systems Inc.
@ -144,10 +144,6 @@ md_cleanup_install(void)
 {

 	enable_rc_conf();
-
-	run_program(0, "rm -f %s", target_expand("/sysinst"));
-	run_program(0, "rm -f %s", target_expand("/.termcap"));
-	run_program(0, "rm -f %s", target_expand("/.profile"));
 }

 int