The daemon, snake and star savers should refuse to load if the current

video mode is the VESA mode, because they cannot work properly under the
VESA mode support as in the current form.

3 files changed, 12 insertions, 3 deletions

diff --git a/lkm/syscons/daemon/daemon_saver.c b/lkm/syscons/daemon/daemon_saver.c
index d5583c8..f3cf3dc 100644
--- a/lkm/syscons/daemon/daemon_saver.c
+++ b/lkm/syscons/daemon/daemon_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: daemon_saver.c,v 1.7 1997/10/26 07:35:18 yokota Exp $
+ *	$Id: daemon_saver.c,v 1.8 1998/01/16 17:58:43 bde Exp $
  */
 
 #include <sys/param.h>
@@ -333,6 +333,9 @@ daemon_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(hostname) + 3 + strlen(ostype) + 1 + 
 	    strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
diff --git a/lkm/syscons/snake/snake_saver.c b/lkm/syscons/snake/snake_saver.c
index 1449ae3..c3fa1fe 100644
--- a/lkm/syscons/snake/snake_saver.c
+++ b/lkm/syscons/snake/snake_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: snake_saver.c,v 1.15 1997/07/15 14:49:35 yokota Exp $
+ *	$Id: snake_saver.c,v 1.16 1998/01/16 17:58:50 bde Exp $
  */
 
 #include <sys/param.h>
@@ -110,6 +110,9 @@ snake_saver_load(struct lkm_table *lkmtp, int cmd)
 {
 	int err;
 
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	messagelen = strlen(ostype) + 1 + strlen(osrelease);
 	message = malloc(messagelen + 1, M_DEVBUF, M_WAITOK);
 	sprintf(message, "%s %s", ostype, osrelease);
diff --git a/lkm/syscons/star/star_saver.c b/lkm/syscons/star/star_saver.c
index 15525cb..517a557 100644
--- a/lkm/syscons/star/star_saver.c
+++ b/lkm/syscons/star/star_saver.c
@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *	$Id: star_saver.c,v 1.12 1997/07/15 14:49:39 yokota Exp $
+ *	$Id: star_saver.c,v 1.13 1998/01/16 17:58:55 bde Exp $
  */
 
 #include <sys/param.h>
@@ -89,6 +89,9 @@ star_saver(int blank)
 static int
 star_saver_load(struct lkm_table *lkmtp, int cmd)
 {
+	if (cur_console->mode >= M_VESA_BASE)
+		return ENODEV;
+
 	return add_scrn_saver(star_saver);
 }