talexander
/
freebsd_amp_hwpstate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust for new location and name of kernel. 

PR:		21423
Reported by:	Makoto MATSUSHITA <matusita@jp.FreeBSD.org>
This commit is contained in:
Jordan K. Hubbard 2000-09-29 07:47:19 +00:00
parent c43d7a219b
commit a1aa3a40fd
3 changed files with 51 additions and 99 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
release/sysinstall/install.c
View File

@ -738,41 +738,25 @@ installFixupBin(dialogMenuItem *self)
/* All of this is done only as init, just to be safe */
if (RunningAsInit) {
/* Fix up kernel first */
if (!file_readable("/kernel")) {
char *generic_kernel = "/kernel.GENERIC";
if (file_readable(generic_kernel)) {
if (vsystem("cp -p %s /kernel", generic_kernel)) {
msgConfirm("Unable to copy /kernel into place!");
return DITEM_FAILURE;
}
#ifndef __alpha__
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}
}
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
fprintf(fp, "# -- sysinstall generated deltas -- #\n");
if (!kstat)
fprintf(fp, "userconfig_script_load=\"YES\"\n");
if (!OnVTY)
fprintf(fp, "console=\"comconsole\"\n");
fclose(fp);
}
#endif
}
else {
msgConfirm("Can't find a kernel image to link to on the root file system!\n"
"You're going to have a hard time getting this system to\n"
"boot from the hard disk, I'm afraid!");
return DITEM_FAILURE;
#ifdef __i386__
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Unable to save boot -c changes to new kernel,\n"
"please see the debug screen (ALT-F2) for details.");
}
}
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
if (!kstat || !OnVTY)
fprintf(fp, "# -- sysinstall generated deltas -- #\n");
if (!kstat)
fprintf(fp, "userconfig_script_load=\"YES\"\n");
if (!OnVTY)
fprintf(fp, "console=\"comconsole\"\n");
fclose(fp);
}
#endif
/* BOGON #1: Resurrect /dev after bin distribution screws it up */
dialog_clear_norefresh();
msgNotify("Remaking all devices.. Please wait!");

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

@ -738,41 +738,25 @@ installFixupBin(dialogMenuItem *self)
/* All of this is done only as init, just to be safe */
if (RunningAsInit) {
/* Fix up kernel first */
if (!file_readable("/kernel")) {
char *generic_kernel = "/kernel.GENERIC";
if (file_readable(generic_kernel)) {
if (vsystem("cp -p %s /kernel", generic_kernel)) {
msgConfirm("Unable to copy /kernel into place!");
return DITEM_FAILURE;
}
#ifndef __alpha__
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}
}
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
fprintf(fp, "# -- sysinstall generated deltas -- #\n");
if (!kstat)
fprintf(fp, "userconfig_script_load=\"YES\"\n");
if (!OnVTY)
fprintf(fp, "console=\"comconsole\"\n");
fclose(fp);
}
#endif
}
else {
msgConfirm("Can't find a kernel image to link to on the root file system!\n"
"You're going to have a hard time getting this system to\n"
"boot from the hard disk, I'm afraid!");
return DITEM_FAILURE;
#ifdef __i386__
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Unable to save boot -c changes to new kernel,\n"
"please see the debug screen (ALT-F2) for details.");
}
}
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
if (!kstat || !OnVTY)
fprintf(fp, "# -- sysinstall generated deltas -- #\n");
if (!kstat)
fprintf(fp, "userconfig_script_load=\"YES\"\n");
if (!OnVTY)
fprintf(fp, "console=\"comconsole\"\n");
fclose(fp);
}
#endif
/* BOGON #1: Resurrect /dev after bin distribution screws it up */
dialog_clear_norefresh();
msgNotify("Remaking all devices.. Please wait!");

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

@ -738,41 +738,25 @@ installFixupBin(dialogMenuItem *self)
/* All of this is done only as init, just to be safe */
if (RunningAsInit) {
/* Fix up kernel first */
if (!file_readable("/kernel")) {
char *generic_kernel = "/kernel.GENERIC";
if (file_readable(generic_kernel)) {
if (vsystem("cp -p %s /kernel", generic_kernel)) {
msgConfirm("Unable to copy /kernel into place!");
return DITEM_FAILURE;
}
#ifndef __alpha__
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Kernel copied OK, but unable to save boot -c changes\n"
"to it. See the debug screen (ALT-F2) for details.");
}
}
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
fprintf(fp, "# -- sysinstall generated deltas -- #\n");
if (!kstat)
fprintf(fp, "userconfig_script_load=\"YES\"\n");
if (!OnVTY)
fprintf(fp, "console=\"comconsole\"\n");
fclose(fp);
}
#endif
}
else {
msgConfirm("Can't find a kernel image to link to on the root file system!\n"
"You're going to have a hard time getting this system to\n"
"boot from the hard disk, I'm afraid!");
return DITEM_FAILURE;
#ifdef __i386__
/* Snapshot any boot -c changes back to the new kernel */
cp = variable_get(VAR_KGET);
if (cp && (*cp == 'Y' || *cp == 'y')) {
if ((kstat = kget("/boot/kernel.conf")) != NULL) {
msgConfirm("Unable to save boot -c changes to new kernel,\n"
"please see the debug screen (ALT-F2) for details.");
}
}
if ((fp = fopen("/boot/loader.conf", "a")) != NULL) {
if (!kstat || !OnVTY)
fprintf(fp, "# -- sysinstall generated deltas -- #\n");
if (!kstat)
fprintf(fp, "userconfig_script_load=\"YES\"\n");
if (!OnVTY)
fprintf(fp, "console=\"comconsole\"\n");
fclose(fp);
}
#endif
/* BOGON #1: Resurrect /dev after bin distribution screws it up */
dialog_clear_norefresh();
msgNotify("Remaking all devices.. Please wait!");