3 files changed, 15 insertions, 5 deletions

diff --git a/release/sysinstall/config.c b/release/sysinstall/config.c
index c24221bd32c5..fbed13f98524 100644
--- a/release/sysinstall/config.c
+++ b/release/sysinstall/config.c
@@ -324,6 +324,15 @@ configSysconfig(char *config)
 }
 
 int
+configSaver(dialogMenuItem *self)
+{
+    variable_set((char *)self->data);
+    if (!variable_get(VAR_BLANKTIME))
+	variable_set2(VAR_BLANKTIME, "300");
+    return DITEM_SUCCESS;
+}
+
+int
 configSaverTimeout(dialogMenuItem *self)
 {
     if (variable_get(VAR_BLANKTIME)) {
diff --git a/release/sysinstall/menus.c b/release/sysinstall/menus.c
index 10d13edaed86..41f3e92828d4 100644
--- a/release/sysinstall/menus.c
+++ b/release/sysinstall/menus.c
@@ -1173,14 +1173,14 @@ probably enable one of these screen savers to prevent phosphor burn-in.",
     "Choose a nifty-looking screen saver",
     NULL,
 { { "blank",	"Simply blank the screen",
-    dmenuVarCheck, dmenuSetVariable, NULL, "saver=blank" },
+    dmenuVarCheck, configSaver, NULL, "saver=blank" },
   { "Green",	"\"Green\" power saving mode (if supported by monitor)",
-    dmenuVarCheck, dmenuSetVariable, NULL, "saver=green" },
+    dmenuVarCheck, configSaver, NULL, "saver=green" },
   { "Snake",	"Draw a FreeBSD \"snake\" on your screen",
-    dmenuVarCheck, dmenuSetVariable, NULL, "saver=snake" },
+    dmenuVarCheck, configSaver, NULL, "saver=snake" },
   { "Star",	"A \"twinkling stars\" effect",
-    dmenuVarCheck, dmenuSetVariable, NULL, "saver=star" },
+    dmenuVarCheck, configSaver, NULL, "saver=star" },
   { "Timeout",	"Set the screen saver timeout interval",
-    dmenuVarCheck, configSaverTimeout, NULL, "blanktime", ' ', ' ', ' ' },
+    dmenuVarCheck, configSaverTimeout, NULL, "blanktime" },
   { NULL } },
 };
diff --git a/release/sysinstall/sysinstall.h b/release/sysinstall/sysinstall.h
index 72ddd69698e4..d50107f9a153 100644
--- a/release/sysinstall/sysinstall.h
+++ b/release/sysinstall/sysinstall.h
@@ -371,6 +371,7 @@ extern int	configFstab(void);
 extern void	configSysconfig(char *config);
 extern void	configResolv(void);
 extern int	configPackages(dialogMenuItem *self);
+extern int	configSaver(dialogMenuItem *self);
 extern int	configSaverTimeout(dialogMenuItem *self);
 extern int	configNTP(dialogMenuItem *self);
 extern int	configXFree86(dialogMenuItem *self);