forked from pool/alsa-utils
124 lines
4.1 KiB
Diff
124 lines
4.1 KiB
Diff
|
From 81f015f5abdd8e6cfa75e37bd97eb22781019eec Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Tue, 23 Nov 2010 02:59:18 +0100
|
||
|
|
Subject: [PATCH 38/38] alsactl: Move asound.state location to /var/lib/alsa
|
||
|
|
|
||
|
|
.... and add configure switch for it.
|
||
|
|
|
||
|
|
/etc might be on a read-only partition which is not suitable for dynamic
|
||
|
|
data such as the mixer settings. Hence move the location of asound.state
|
||
|
|
to /var/lib.
|
||
|
|
|
||
|
|
This is based on a patch from Ubuntu/Debian which hardcoded the pah in
|
||
|
|
/var/lib.
|
||
|
|
|
||
|
|
Signed-off-by: Lennart Poettering <mznyfn@0pointer.de>
|
||
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
||
|
|
---
|
||
|
|
Makefile.am | 3 +++
|
||
|
|
alsaconf/alsaconf.in | 5 +++--
|
||
|
|
alsactl/Makefile.am | 1 +
|
||
|
|
alsactl/alsactl.1 | 4 ++--
|
||
|
|
alsactl/alsactl.c | 4 +++-
|
||
|
|
configure.in | 6 ++++++
|
||
|
|
6 files changed, 18 insertions(+), 5 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/Makefile.am b/Makefile.am
|
||
|
|
index 62e1ba6..48a4780 100644
|
||
|
|
--- a/Makefile.am
|
||
|
|
+++ b/Makefile.am
|
||
|
|
@@ -38,5 +38,8 @@ dist-hook:
|
||
|
|
$(TAR) --create --verbose --file=- $(distdir) | bzip2 -c -9 > $(distdir).tar.bz2 ; \
|
||
|
|
fi
|
||
|
|
|
||
|
|
+install-data-hook:
|
||
|
|
+ $(MKDIR_P) -m 0755 $(DESTDIR)$(ASOUND_STATE_DIR)
|
||
|
|
+
|
||
|
|
DISTCHECK_CONFIGURE_FLAGS = \
|
||
|
|
--with-systemdsystemunitdir=$$dc_install_base/$(systemdsystemunitdir)
|
||
|
|
diff --git a/alsaconf/alsaconf.in b/alsaconf/alsaconf.in
|
||
|
|
index ccc1b37..5c23787 100644
|
||
|
|
--- a/alsaconf/alsaconf.in
|
||
|
|
+++ b/alsaconf/alsaconf.in
|
||
|
|
@@ -956,8 +956,9 @@ If you have a big amplifier, lower your volumes or say no.
|
||
|
|
aplay -N $TESTSOUND
|
||
|
|
fi
|
||
|
|
fi
|
||
|
|
- if [ ! -r /etc/asound.state ]; then
|
||
|
|
- xecho "Saving the mixer setup used for this in /etc/asound.state."
|
||
|
|
+ mkdir -p -m 0755 @ASOUND_STATE_DIR@
|
||
|
|
+ if [ ! -r @ASOUND_STATE_DIR@/asound.state ]; then
|
||
|
|
+ xecho "Saving the mixer setup used for this in @ASOUND_STATE_DIR@/asound.state."
|
||
|
|
$sbindir/alsactl store
|
||
|
|
fi
|
||
|
|
clear
|
||
|
|
diff --git a/alsactl/Makefile.am b/alsactl/Makefile.am
|
||
|
|
index 9a2d30e..721b619 100644
|
||
|
|
--- a/alsactl/Makefile.am
|
||
|
|
+++ b/alsactl/Makefile.am
|
||
|
|
@@ -8,6 +8,7 @@ endif
|
||
|
|
EXTRA_DIST=alsactl.1 alsactl_init.xml
|
||
|
|
|
||
|
|
alsactl_SOURCES=alsactl.c state.c utils.c init_parse.c
|
||
|
|
+alsactl_CFLAGS=$(AM_CFLAGS) -DSYS_ASOUNDRC=\"$(ASOUND_STATE_DIR)/asound.state\"
|
||
|
|
noinst_HEADERS=alsactl.h list.h init_sysdeps.c init_utils_string.c init_utils_run.c init_sysfs.c
|
||
|
|
|
||
|
|
udevrulesdir=/lib/udev/rules.d
|
||
|
|
diff --git a/alsactl/alsactl.1 b/alsactl/alsactl.1
|
||
|
|
index eb3cbd1..eb5968c 100644
|
||
|
|
--- a/alsactl/alsactl.1
|
||
|
|
+++ b/alsactl/alsactl.1
|
||
|
|
@@ -43,7 +43,7 @@ Print alsactl version number.
|
||
|
|
|
||
|
|
.TP
|
||
|
|
\fI\-f, \-\-file\fP
|
||
|
|
-Select the configuration file to use. The default is /etc/asound.state.
|
||
|
|
+Select the configuration file to use. The default is /var/lib/alsa/asound.state.
|
||
|
|
|
||
|
|
.TP
|
||
|
|
\fI\-F, \-\-force\fP
|
||
|
|
@@ -90,7 +90,7 @@ The configuration file for init. By default, PREFIX/share/alsa/init/00main
|
||
|
|
is used.
|
||
|
|
|
||
|
|
.SH FILES
|
||
|
|
-\fI/etc/asound.state\fP (or whatever file you specify with the
|
||
|
|
+\fI/var/lib/alsa/asound.state\fP (or whatever file you specify with the
|
||
|
|
\fB\-f\fP flag) is used to store current settings for your
|
||
|
|
soundcards. The settings include all the usual soundcard mixer
|
||
|
|
settings. More importantly, alsactl is
|
||
|
|
diff --git a/alsactl/alsactl.c b/alsactl/alsactl.c
|
||
|
|
index 3b5dfda..c2120bd 100644
|
||
|
|
--- a/alsactl/alsactl.c
|
||
|
|
+++ b/alsactl/alsactl.c
|
||
|
|
@@ -30,7 +30,9 @@
|
||
|
|
#include <alsa/asoundlib.h>
|
||
|
|
#include "alsactl.h"
|
||
|
|
|
||
|
|
-#define SYS_ASOUNDRC "/etc/asound.state"
|
||
|
|
+#ifndef SYS_ASOUNDRC
|
||
|
|
+#define SYS_ASOUNDRC "/var/lib/alsa/asound.state"
|
||
|
|
+#endif
|
||
|
|
|
||
|
|
int debugflag = 0;
|
||
|
|
int force_restore = 1;
|
||
|
|
diff --git a/configure.in b/configure.in
|
||
|
|
index 54ea74c..94a2b17 100644
|
||
|
|
--- a/configure.in
|
||
|
|
+++ b/configure.in
|
||
|
|
@@ -289,6 +289,12 @@ if test "x$with_systemdsystemunitdir" != xno; then
|
||
|
|
fi
|
||
|
|
AM_CONDITIONAL(HAVE_SYSTEMD, [test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ])
|
||
|
|
|
||
|
|
+AC_ARG_WITH(ASOUND_STATE_DIR,
|
||
|
|
+ AS_HELP_STRING([--with-asound-state-dir=DIR], [Directory to place asound.state file in]),
|
||
|
|
+ [ASOUND_STATE_DIR="$withval"],
|
||
|
|
+ [ASOUND_STATE_DIR="/var/lib/alsa"])
|
||
|
|
+AC_SUBST(ASOUND_STATE_DIR)
|
||
|
|
+
|
||
|
|
AC_OUTPUT(Makefile alsactl/Makefile alsactl/init/Makefile \
|
||
|
|
alsamixer/Makefile amidi/Makefile amixer/Makefile \
|
||
|
|
m4/Makefile po/Makefile.in \
|
||
|
|
--
|
||
|
|
1.7.3.1
|
||
|
|
|