diff options
author | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
---|---|---|
committer | Ron Yorston <rmy@pobox.com> | 2012-03-22 15:21:20 +0000 |
commit | 0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2 (patch) | |
tree | 6709ddd6071a9c238ba69233540bbcfe560c6a44 /console-tools | |
parent | 67758035a4fe040c6ac69b39d61bcd6bddd7b827 (diff) | |
parent | 56a3b82e9692a25ef9c9269e88feac0d579ce8e8 (diff) | |
download | busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.gz busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.tar.bz2 busybox-w32-0d8b2c4a929ea9d3ac37499319fe0d8e7941a0c2.zip |
Merge commit '56a3b82e9692a25ef9c9269e88feac0d579ce8e8' into merge
Conflicts:
coreutils/ls.c
include/platform.h
libbb/bb_basename.c
Diffstat (limited to 'console-tools')
-rw-r--r-- | console-tools/setconsole.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/console-tools/setconsole.c b/console-tools/setconsole.c index 59c83361c..771974ae3 100644 --- a/console-tools/setconsole.c +++ b/console-tools/setconsole.c | |||
@@ -41,6 +41,6 @@ int setconsole_main(int argc UNUSED_PARAM, char **argv) | |||
41 | device = DEV_CONSOLE; | 41 | device = DEV_CONSOLE; |
42 | } | 42 | } |
43 | 43 | ||
44 | xioctl(xopen(device, O_RDONLY), TIOCCONS, NULL); | 44 | xioctl(xopen(device, O_WRONLY), TIOCCONS, NULL); |
45 | return EXIT_SUCCESS; | 45 | return EXIT_SUCCESS; |
46 | } | 46 | } |