mirror of the now-defunct rocklinux.org
You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
 
 
 
 
 
 

54 lines
2.0 KiB

# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
#
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
#
# ROCK Linux: rock-src/package/powerpc/mol/console-driver-devfs.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
#
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
#
# --- ROCK-COPYRIGHT-NOTE-END ---
--- mol-2003-06-20/src/drivers/console.c 2003-06-12 13:00:59.000000000 +0200
+++ mol-2003-06-20-devfs/src/drivers/console.c 2003-06-21 19:43:11.000000000 +0200
@@ -359,11 +359,13 @@
{
struct vt_stat vts;
char vtname[32];
+ char vtname2[32];
int vt_no = get_numeric_res( "vt" ); /* -1 if missing */
int fd;
- if( (fd=open("/dev/tty0", O_WRONLY)) < 0 ) {
- printm("failed to open /dev/tty0: %s\n", strerror(errno));
+ if( (fd=open("/dev/tty0", O_WRONLY)) < 0 &&
+ (fd=open("/dev/vc/0", O_WRONLY)) < 0) {
+ printm("failed to open /dev/tty0 or /dev/vc/0: %s\n", strerror(errno));
return 1;
}
@@ -396,8 +398,11 @@
/* open our vt */
sprintf( vtname, "/dev/tty%d", vt_no );
if( (fd=open(vtname, O_RDWR | O_NONBLOCK )) < 0) {
- perrorm("Cannot open %s", vtname );
- return 1;
+ sprintf( vtname2, "/dev/vc/%d", vt_no );
+ if( (fd=open(vtname2, O_RDWR | O_NONBLOCK )) < 0) {
+ perrorm("Cannot open %s or %s", vtname, vtname2 );
+ return 1;
+ }
}
/* set controlling tty */