Aren
/
NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Copy /etc.old back to /etc if it was saved, but we didn't actually 

install the ETC set.
This commit is contained in:
dsl 2003-07-18 09:46:11 +00:00
parent 6e575ea980
commit da36837548
2 changed files with 36 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
distrib/utils/sysinst/main.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: main.c,v 1.38 2003/07/09 20:02:35 dsl Exp $ */
/* $NetBSD: main.c,v 1.39 2003/07/18 09:46:11 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -337,9 +337,13 @@ cleanup(void)
time_t tloc;
(void)time(&tloc);
restore_etc();
unwind_mounts();
run_prog(0, NULL, "/sbin/umount /mnt2");
endwin();
if (logging) {
fprintf(logfp, "Log ended at: %s\n", asctime(localtime(&tloc)));
fflush(logfp);

37
distrib/utils/sysinst/upgrade.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: upgrade.c,v 1.37 2003/07/08 16:12:18 dsl Exp $ */
/* $NetBSD: upgrade.c,v 1.38 2003/07/18 09:46:11 dsl Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@ -48,11 +48,13 @@
/*
* local prototypes
*/
void check_prereqs (void);
int save_etc (void);
int merge_etc (void);
int save_X (void);
int merge_X (void);
void check_prereqs(void);
int save_etc(void);
int merge_etc(void);
int save_X(void);
int merge_X(void);
static int etc_saved;
/*
* Do the system upgrade.
@ -150,6 +152,8 @@ save_etc(void)
/* Move target /etc to /etc.old. Abort on error. */
mv_within_target_or_die("/etc", "/etc.old");
etc_saved = 1;
/* now make an /etc that should let the user reboot. */
make_target_dir("/etc");
@ -185,6 +189,27 @@ save_etc(void)
return 0;
}
/*
* Attempt to undo save_etc() if the install fails
*/
void
restore_etc(void)
{
const char *tp;
if (!etc_saved)
return;
if (sets_installed & SET_ETC)
return;
tp = target_prefix();
run_prog(0, NULL, "mv -f %s/etc.old/* %s/etc", tp, tp);
run_prog(0, NULL, "rmdir %s/etc.old", tp);
etc_saved = 0;
}
/*
* Save X symlink to X.old so it can be recovered later
*/