diff options
| -rw-r--r-- | release/sysinstall/install.c | 9 | ||||
| -rw-r--r-- | release/sysinstall/menus.c | 4 | ||||
| -rw-r--r-- | release/sysinstall/system.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sade/install.c | 9 | ||||
| -rw-r--r-- | usr.sbin/sade/menus.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sade/system.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/install.c | 9 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/menus.c | 4 | ||||
| -rw-r--r-- | usr.sbin/sysinstall/system.c | 4 |
9 files changed, 21 insertions, 30 deletions
diff --git a/release/sysinstall/install.c b/release/sysinstall/install.c index 3584156..db96afc 100644 --- a/release/sysinstall/install.c +++ b/release/sysinstall/install.c @@ -48,6 +48,7 @@ #undef MSDOSFS #include <sys/stat.h> #include <unistd.h> +#include <ufs/ufs/ufsmount.h> static void create_termcap(void); static void fixit_common(void); @@ -446,8 +447,6 @@ installExpress(dialogMenuItem *self) /* Give user the option of one last configuration spree */ installConfigure(); } - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); return i | DITEM_RESTORE; } @@ -601,9 +600,6 @@ installNovice(dialogMenuItem *self) /* Give user the option of one last configuration spree */ installConfigure(); - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); - return DITEM_LEAVE_MENU | DITEM_RESTORE; } @@ -617,9 +613,6 @@ installCustomCommit(dialogMenuItem *self) if (DITEM_STATUS(i) == DITEM_SUCCESS) { /* Give user the option of one last configuration spree */ installConfigure(); - - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); return i; } else diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c index 67bdcf0..0d5d424 100644 --- a/release/sysinstall/menus.c +++ b/release/sysinstall/menus.c @@ -359,8 +359,8 @@ DMenu MenuMouse = { "somewhat. Once you've selected one of the below, you can specify\n" "/dev/mouse as your mouse device when running the XFree86 configuration\n" "utility (see Configuration menu). Please note that for PS/2 mice,\n" - "a kernel recompile is also required! See the handbook for more details\n" - "on building a kernel.", + "you need to enable the psm driver in the kernel configuration menu\n" + "when installing for the first time.", "For more information, visit the Documentation menu", NULL, { { "COM1", "Serial mouse on COM1", whichMouse, dmenuSystemCommand, NULL, diff --git a/release/sysinstall/system.c b/release/sysinstall/system.c index 354f805..bb2f4c3 100644 --- a/release/sysinstall/system.c +++ b/release/sysinstall/system.c @@ -118,6 +118,10 @@ systemShutdown(int status) if (status >=0 && mediaDevice) mediaDevice->shutdown(mediaDevice); + /* write out any changes to sysconfig .. */ + if (!status) + configSysconfig("/etc/sysconfig"); + /* Shut down the dialog library */ if (DialogActive) { end_dialog(); diff --git a/usr.sbin/sade/install.c b/usr.sbin/sade/install.c index 3584156..db96afc 100644 --- a/usr.sbin/sade/install.c +++ b/usr.sbin/sade/install.c @@ -48,6 +48,7 @@ #undef MSDOSFS #include <sys/stat.h> #include <unistd.h> +#include <ufs/ufs/ufsmount.h> static void create_termcap(void); static void fixit_common(void); @@ -446,8 +447,6 @@ installExpress(dialogMenuItem *self) /* Give user the option of one last configuration spree */ installConfigure(); } - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); return i | DITEM_RESTORE; } @@ -601,9 +600,6 @@ installNovice(dialogMenuItem *self) /* Give user the option of one last configuration spree */ installConfigure(); - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); - return DITEM_LEAVE_MENU | DITEM_RESTORE; } @@ -617,9 +613,6 @@ installCustomCommit(dialogMenuItem *self) if (DITEM_STATUS(i) == DITEM_SUCCESS) { /* Give user the option of one last configuration spree */ installConfigure(); - - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); return i; } else diff --git a/usr.sbin/sade/menus.c b/usr.sbin/sade/menus.c index 67bdcf0..0d5d424 100644 --- a/usr.sbin/sade/menus.c +++ b/usr.sbin/sade/menus.c @@ -359,8 +359,8 @@ DMenu MenuMouse = { "somewhat. Once you've selected one of the below, you can specify\n" "/dev/mouse as your mouse device when running the XFree86 configuration\n" "utility (see Configuration menu). Please note that for PS/2 mice,\n" - "a kernel recompile is also required! See the handbook for more details\n" - "on building a kernel.", + "you need to enable the psm driver in the kernel configuration menu\n" + "when installing for the first time.", "For more information, visit the Documentation menu", NULL, { { "COM1", "Serial mouse on COM1", whichMouse, dmenuSystemCommand, NULL, diff --git a/usr.sbin/sade/system.c b/usr.sbin/sade/system.c index 354f805..bb2f4c3 100644 --- a/usr.sbin/sade/system.c +++ b/usr.sbin/sade/system.c @@ -118,6 +118,10 @@ systemShutdown(int status) if (status >=0 && mediaDevice) mediaDevice->shutdown(mediaDevice); + /* write out any changes to sysconfig .. */ + if (!status) + configSysconfig("/etc/sysconfig"); + /* Shut down the dialog library */ if (DialogActive) { end_dialog(); diff --git a/usr.sbin/sysinstall/install.c b/usr.sbin/sysinstall/install.c index 3584156..db96afc 100644 --- a/usr.sbin/sysinstall/install.c +++ b/usr.sbin/sysinstall/install.c @@ -48,6 +48,7 @@ #undef MSDOSFS #include <sys/stat.h> #include <unistd.h> +#include <ufs/ufs/ufsmount.h> static void create_termcap(void); static void fixit_common(void); @@ -446,8 +447,6 @@ installExpress(dialogMenuItem *self) /* Give user the option of one last configuration spree */ installConfigure(); } - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); return i | DITEM_RESTORE; } @@ -601,9 +600,6 @@ installNovice(dialogMenuItem *self) /* Give user the option of one last configuration spree */ installConfigure(); - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); - return DITEM_LEAVE_MENU | DITEM_RESTORE; } @@ -617,9 +613,6 @@ installCustomCommit(dialogMenuItem *self) if (DITEM_STATUS(i) == DITEM_SUCCESS) { /* Give user the option of one last configuration spree */ installConfigure(); - - /* Now write out any changes .. */ - configSysconfig("/etc/sysconfig"); return i; } else diff --git a/usr.sbin/sysinstall/menus.c b/usr.sbin/sysinstall/menus.c index 67bdcf0..0d5d424 100644 --- a/usr.sbin/sysinstall/menus.c +++ b/usr.sbin/sysinstall/menus.c @@ -359,8 +359,8 @@ DMenu MenuMouse = { "somewhat. Once you've selected one of the below, you can specify\n" "/dev/mouse as your mouse device when running the XFree86 configuration\n" "utility (see Configuration menu). Please note that for PS/2 mice,\n" - "a kernel recompile is also required! See the handbook for more details\n" - "on building a kernel.", + "you need to enable the psm driver in the kernel configuration menu\n" + "when installing for the first time.", "For more information, visit the Documentation menu", NULL, { { "COM1", "Serial mouse on COM1", whichMouse, dmenuSystemCommand, NULL, diff --git a/usr.sbin/sysinstall/system.c b/usr.sbin/sysinstall/system.c index 354f805..bb2f4c3 100644 --- a/usr.sbin/sysinstall/system.c +++ b/usr.sbin/sysinstall/system.c @@ -118,6 +118,10 @@ systemShutdown(int status) if (status >=0 && mediaDevice) mediaDevice->shutdown(mediaDevice); + /* write out any changes to sysconfig .. */ + if (!status) + configSysconfig("/etc/sysconfig"); + /* Shut down the dialog library */ if (DialogActive) { end_dialog(); |
