d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

DTRT in the restart case

Browse Source
This commit is contained in:
jkh 2001-10-12 07:36:34 +00:00
parent fa0b537235
commit a05a408d14
10 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
usr.sbin/sade/globals.c
View File

@ -47,6 +47,7 @@ Boolean RunningAsInit; /* Are we running as init? */
Boolean DialogActive; /* Is libdialog initialized? */
Boolean ColorDisplay; /* Are we on a color display? */
Boolean OnVTY; /* Are we on a VTY? */
Boolean Restarting; /* Are we restarting sysinstall? */
Variable *VarHead; /* The head of the variable chain */
Device *mediaDevice; /* Where we're installing from */
int BootMgr; /* Which boot manager we're using */
@ -63,6 +64,7 @@ globalsInit(void)
DebugFD = -1;
ColorDisplay = FALSE;
Fake = FALSE;
Restarting = FALSE;
OnVTY = FALSE;
DialogActive = FALSE;
VarHead = NULL;

2
usr.sbin/sade/install.c
View File

@ -225,7 +225,7 @@ installInitial(void)
return DITEM_FAILURE;
}
if (chroot("/mnt") == -1) {
if (!Restarting && chroot("/mnt") == -1) {
msgConfirm("installInitial: Unable to chroot to %s - this is bad!",
"/mnt");
return DITEM_FAILURE;

4
usr.sbin/sade/main.c
View File

@ -91,6 +91,8 @@ main(int argc, char **argv)
Fake = TRUE;
msgConfirm("I'll be just faking it from here on out, OK?");
}
if (argc > 1 && !strcmp(argv[1], "-restart"))
Restarting = TRUE;
/* Try to preserve our scroll-back buffer */
if (OnVTY) {
@ -129,7 +131,7 @@ main(int argc, char **argv)
if (!strstr(argv[0], "sysinstall"))
start_arg = 0;
else if (Fake)
else if (Fake || Restarting)
start_arg = 2;
else
start_arg = 1;

1
usr.sbin/sade/sade.h
View File

@ -346,6 +346,7 @@ typedef struct _devPriv {
extern jmp_buf BailOut; /* Used to get the heck out */
extern int DebugFD; /* Where diagnostic output goes */
extern Boolean Fake; /* Don't actually modify anything - testing */
extern Boolean Restarting; /* Are we restarting sysinstall? */
extern Boolean SystemWasInstalled; /* Did we install it? */
extern Boolean RunningAsInit; /* Are we running stand-alone? */
extern Boolean DialogActive; /* Is the dialog() stuff up? */

2
usr.sbin/sade/system.c
View File

@ -63,7 +63,7 @@ intr_restart(dialogMenuItem *self)
fdmax = getdtablesize();
for (fd = 3; fd < fdmax; fd++)
close(fd);
ret = execl(StartName, StartName, (char *)NULL);
ret = execl(StartName, StartName, "-restart", (char *)NULL);
msgDebug("execl failed (%s)\n", strerror(errno));
/* NOTREACHED */
return -1;

2
usr.sbin/sysinstall/globals.c
View File

@ -47,6 +47,7 @@ Boolean RunningAsInit; /* Are we running as init? */
Boolean DialogActive; /* Is libdialog initialized? */
Boolean ColorDisplay; /* Are we on a color display? */
Boolean OnVTY; /* Are we on a VTY? */
Boolean Restarting; /* Are we restarting sysinstall? */
Variable *VarHead; /* The head of the variable chain */
Device *mediaDevice; /* Where we're installing from */
int BootMgr; /* Which boot manager we're using */
@ -63,6 +64,7 @@ globalsInit(void)
DebugFD = -1;
ColorDisplay = FALSE;
Fake = FALSE;
Restarting = FALSE;
OnVTY = FALSE;
DialogActive = FALSE;
VarHead = NULL;

2
usr.sbin/sysinstall/install.c
View File

@ -225,7 +225,7 @@ installInitial(void)
return DITEM_FAILURE;
}
if (chroot("/mnt") == -1) {
if (!Restarting && chroot("/mnt") == -1) {
msgConfirm("installInitial: Unable to chroot to %s - this is bad!",
"/mnt");
return DITEM_FAILURE;

4
usr.sbin/sysinstall/main.c
View File

@ -91,6 +91,8 @@ main(int argc, char **argv)
Fake = TRUE;
msgConfirm("I'll be just faking it from here on out, OK?");
}
if (argc > 1 && !strcmp(argv[1], "-restart"))
Restarting = TRUE;
/* Try to preserve our scroll-back buffer */
if (OnVTY) {
@ -129,7 +131,7 @@ main(int argc, char **argv)
if (!strstr(argv[0], "sysinstall"))
start_arg = 0;
else if (Fake)
else if (Fake || Restarting)
start_arg = 2;
else
start_arg = 1;

1
usr.sbin/sysinstall/sysinstall.h
View File

@ -346,6 +346,7 @@ typedef struct _devPriv {
extern jmp_buf BailOut; /* Used to get the heck out */
extern int DebugFD; /* Where diagnostic output goes */
extern Boolean Fake; /* Don't actually modify anything - testing */
extern Boolean Restarting; /* Are we restarting sysinstall? */
extern Boolean SystemWasInstalled; /* Did we install it? */
extern Boolean RunningAsInit; /* Are we running stand-alone? */
extern Boolean DialogActive; /* Is the dialog() stuff up? */

2
usr.sbin/sysinstall/system.c
View File

@ -63,7 +63,7 @@ intr_restart(dialogMenuItem *self)
fdmax = getdtablesize();
for (fd = 3; fd < fdmax; fd++)
close(fd);
ret = execl(StartName, StartName, (char *)NULL);
ret = execl(StartName, StartName, "-restart", (char *)NULL);
msgDebug("execl failed (%s)\n", strerror(errno));
/* NOTREACHED */
return -1;