diff options
| author | segfault <segfault@riseup.net> | 2019-04-04 10:51:13 +0200 |
|---|---|---|
| committer | segfault <segfault@riseup.net> | 2019-04-04 14:10:52 +0200 |
| commit | 28ef46f6b5b9a407c0b61c1aec9432fb4ea17e1f (patch) | |
| tree | 0091c95ea18b4c767454451ca69c3dc72b9015b1 | |
| parent | 28cf5d756dcbab5fdf5b389bfb072043a25a7741 (diff) | |
Move hooks to drop-in config file snippetsbugfix/11052-do-not-suspend-when-closing-lid
6 files changed, 7 insertions, 30 deletions
diff --git a/config/chroot_local-hooks/31-lower-DefaultTimeoutStopSec b/config/chroot_local-hooks/31-lower-DefaultTimeoutStopSec deleted file mode 100755 index 56b9ee6..0000000 --- a/config/chroot_local-hooks/31-lower-DefaultTimeoutStopSec +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh -set -e -set -u - -echo "Lower systemd's DefaultTimeoutStopSec" - -sed --in-place --regexp-extended \ - 's/^#DefaultTimeoutStopSec=.*$/DefaultTimeoutStopSec=5s/' \ - /etc/systemd/system.conf diff --git a/config/chroot_local-hooks/32-logind-NAutoVTs b/config/chroot_local-hooks/32-logind-NAutoVTs deleted file mode 100755 index 57f67ae..0000000 --- a/config/chroot_local-hooks/32-logind-NAutoVTs +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh -set -e -set -u - -# Make room for tails-gdm-failed-to-start.service -echo "Lower logind's NAutoVTs" - -sed --in-place --regexp-extended \ - 's/^#NAutoVTs=.*$/NAutoVTs=4/' \ - /etc/systemd/logind.conf diff --git a/config/chroot_local-hooks/48-disable-suspend-when-closing-lid b/config/chroot_local-hooks/48-disable-suspend-when-closing-lid deleted file mode 100755 index fa12844..0000000 --- a/config/chroot_local-hooks/48-disable-suspend-when-closing-lid +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -echo "Disabling suspend when closing lid" - -sed -i --regexp-extended 's/^#?HandleLidSwitch=.*/HandleLidSwitch=ignore/' \ - /etc/systemd/logind.conf - -# Check if the option was actually set -grep -q ^HandleLidSwitch=ignore$ /etc/systemd/logind.conf diff --git a/config/chroot_local-includes/lib/systemd/system.conf.d/lower-DefaultTimeoutStopSec.conf b/config/chroot_local-includes/lib/systemd/system.conf.d/lower-DefaultTimeoutStopSec.conf new file mode 100644 index 0000000..90dce4f --- /dev/null +++ b/config/chroot_local-includes/lib/systemd/system.conf.d/lower-DefaultTimeoutStopSec.conf @@ -0,0 +1,2 @@ +[Manager] +DefaultTimeoutStopSec=5s diff --git a/config/chroot_local-includes/usr/lib/systemd/logind.conf.d/disable-suspend-on-lid-close.conf b/config/chroot_local-includes/usr/lib/systemd/logind.conf.d/disable-suspend-on-lid-close.conf new file mode 100644 index 0000000..6cbf33b --- /dev/null +++ b/config/chroot_local-includes/usr/lib/systemd/logind.conf.d/disable-suspend-on-lid-close.conf @@ -0,0 +1,2 @@ +[Login] +HandleLidSwitch=ignore diff --git a/config/chroot_local-includes/usr/lib/systemd/logind.conf.d/lower-NAutoVTs.conf b/config/chroot_local-includes/usr/lib/systemd/logind.conf.d/lower-NAutoVTs.conf new file mode 100644 index 0000000..df32fcc --- /dev/null +++ b/config/chroot_local-includes/usr/lib/systemd/logind.conf.d/lower-NAutoVTs.conf @@ -0,0 +1,3 @@ +# Leaves a free virtual terminal to run tails-gdm-failed-to-start.service on +[Login] +NAutoVTs=4 |