diff options
author | Lennart Poettering <lennart@poettering.net> | 2015-10-01 21:11:12 +0200 |
---|---|---|
committer | Lennart Poettering <lennart@poettering.net> | 2015-10-01 21:11:12 +0200 |
commit | 2c6c4ab2f5523940df64af205315612d89b818f0 (patch) | |
tree | 732599107fb011f08cc9fa2a7b0eda2d08363474 /src | |
parent | 8ac5aaa9fa47622e480391886c34f052f5ff909d (diff) | |
download | systemd-2c6c4ab2f5523940df64af205315612d89b818f0.tar.gz systemd-2c6c4ab2f5523940df64af205315612d89b818f0.tar.bz2 systemd-2c6c4ab2f5523940df64af205315612d89b818f0.zip |
logind: remove warn_melody() logic
The internal speaker is usually not available on modern latops that
support suspend, and even if it is available in the hardware, most
distributions turned support for it off in the kernel. And even if it is
enabled, it's probably still a bad idea to make use of it for the
suspend-failures. If anything a proper sound should be played.
Long story short, let's remove support of this anachronism.
Diffstat (limited to 'src')
-rw-r--r-- | src/basic/terminal-util.c | 21 | ||||
-rw-r--r-- | src/basic/terminal-util.h | 2 | ||||
-rw-r--r-- | src/login/logind-action.c | 1 |
3 files changed, 0 insertions, 24 deletions
diff --git a/src/basic/terminal-util.c b/src/basic/terminal-util.c index 287e0dfa13..22ee6ad83f 100644 --- a/src/basic/terminal-util.c +++ b/src/basic/terminal-util.c @@ -607,27 +607,6 @@ int vt_disallocate(const char *name) { return 0; } -void warn_melody(void) { - _cleanup_close_ int fd = -1; - - fd = open("/dev/console", O_WRONLY|O_CLOEXEC|O_NOCTTY); - if (fd < 0) - return; - - /* Yeah, this is synchronous. Kinda sucks. But well... */ - - (void) ioctl(fd, KIOCSOUND, (int)(1193180/440)); - usleep(125*USEC_PER_MSEC); - - (void) ioctl(fd, KIOCSOUND, (int)(1193180/220)); - usleep(125*USEC_PER_MSEC); - - (void) ioctl(fd, KIOCSOUND, (int)(1193180/220)); - usleep(125*USEC_PER_MSEC); - - (void) ioctl(fd, KIOCSOUND, 0); -} - int make_console_stdio(void) { int fd, r; diff --git a/src/basic/terminal-util.h b/src/basic/terminal-util.h index a9e325ccb3..da2a5b8897 100644 --- a/src/basic/terminal-util.h +++ b/src/basic/terminal-util.h @@ -67,8 +67,6 @@ bool tty_is_console(const char *tty) _pure_; int vtnr_from_tty(const char *tty); const char *default_term_for_tty(const char *tty); -void warn_melody(void); - int make_stdio(int fd); int make_null_stdio(void); int make_console_stdio(void); diff --git a/src/login/logind-action.c b/src/login/logind-action.c index f635fb1b63..a44e369149 100644 --- a/src/login/logind-action.c +++ b/src/login/logind-action.c @@ -147,7 +147,6 @@ int manager_handle_action( offending->uid, strna(u), offending->pid, strna(comm)); - warn_melody(); return -EPERM; } |