shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-31 14:50:15 +03:00
Code

logind: remove warn_melody() logic

Browse Source 
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.
This commit is contained in:
Lennart Poettering 2015-10-01 21:11:12 +02:00
parent 8ac5aaa9fa
commit 2c6c4ab2f5
3 changed files with 0 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/basic/terminal-util.c
View File

@ -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;

2
src/basic/terminal-util.h
View File

@ -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);

1
src/login/logind-action.c
View File

@ -147,7 +147,6 @@ int manager_handle_action(
offending->uid, strna(u),
offending->pid, strna(comm));
warn_melody();
return -EPERM;
}