Commit 642ead8c authored by intrigeri's avatar intrigeri
Browse files

Merge branch 'feature/stretch-unfrozen' into feature/stretch-maint

parents 1a691a45 374b90ce
......@@ -2,32 +2,6 @@
set -e
CUSTOM_INITSCRIPTS="
"
PATCHED_INITSCRIPTS="
alsa-utils
haveged
hwclock.sh
i2p
kexec-load
laptop-mode
memlockd
saned
spice-vdagent
tor
"
echo "Configuring boot sequence"
# The patches to adjust the runlevels are applied to the chroot
# after the packages have been installed. So we need to remove them first,
# to re-install them with our settings.
insserv -r $PATCHED_INITSCRIPTS
# Re-install overriden initscripts and install our custom ones.
insserv $PATCHED_INITSCRIPTS $CUSTOM_INITSCRIPTS
### Tweak systemd unit files
# Workaround for https://bugs.debian.org/714957
......@@ -92,15 +66,3 @@ systemctl mask hwclock-save.service
# Do not run timesyncd: we have our own time synchronization mechanism
systemctl mask systemd-timesyncd.service
# Unmute and sanitize mixer levels at boot time
# (`systemctl unmask` does not support initscripts on Jessie,
# hence the manual unmasking)
dpkg-divert --add --rename --divert \
/lib/systemd/system/alsa-utils.service.orig \
/lib/systemd/system/alsa-utils.service
# Disable the ALSA state store/restore systemd services (that lack mixer
# levels unmuting/sanitizing), we use the legacy initscript instead
systemctl mask alsa-restore.service
systemctl mask alsa-state.service
systemctl mask alsa-store.service
Tails specific: we are amnesic, no need to save mixer levels on shutdown.
--- chroot.orig/etc/init.d/alsa-utils 2012-09-24 10:05:12.749039812 +0200
+++ chroot/etc/init.d/alsa-utils 2012-09-24 10:47:23.717869294 +0200
@@ -10,1 +10,1 @@
-# Default-Stop: 0 1 6
+# Default-Stop:
--- chroot.orig/etc/init.d/alsa-utils 2010-10-04 18:14:10.000000000 +0000
+++ chroot/etc/init.d/alsa-utils 2012-03-12 13:49:11.815997232 +0000
@@ -206,4 +206,9 @@
exit 3
;;
esac
+ # On MacBook5,2 models (See Bug#602973)
+ unmute_and_set_level "LFE" "80%"
+
+ # On Intel 82801H (See Bug#603550)
+ unmute_and_set_level "Speaker" "80%"
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment