summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2008-03-25 16:18:28 +0000
committerThierry Vignaud <tv@mandriva.org>2008-03-25 16:18:28 +0000
commit44370a2c3f5beffe46eea237e25d023b663bf5cc (patch)
tree2ee2759da45e72cac8194c00d44577d49f2f15a7 /perl-install
parentad008b8d1e71c920cc97f7bcf68d31a13af32c42 (diff)
downloaddrakx-44370a2c3f5beffe46eea237e25d023b663bf5cc.tar
drakx-44370a2c3f5beffe46eea237e25d023b663bf5cc.tar.gz
drakx-44370a2c3f5beffe46eea237e25d023b663bf5cc.tar.bz2
drakx-44370a2c3f5beffe46eea237e25d023b663bf5cc.tar.xz
drakx-44370a2c3f5beffe46eea237e25d023b663bf5cc.zip
fix errors while setting PA preferences (#39270)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/harddrake/sound.pm6
-rw-r--r--perl-install/install/NEWS1
2 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/harddrake/sound.pm b/perl-install/harddrake/sound.pm
index d9b382706..94695d3c8 100644
--- a/perl-install/harddrake/sound.pm
+++ b/perl-install/harddrake/sound.pm
@@ -181,7 +181,7 @@ our %oss2alsa =
my @blacklist = qw(cs46xx cs4281);
my $blacklisted = 0;
-my $config_file = '/etc/sysconfig/pulseaudio';
+my $config_file = "$::prefix/etc/sysconfig/pulseaudio";
sub is_user_switching_enabled() {
my $output = run_program::get_stdout('polkit-action', '--action',
@@ -221,7 +221,7 @@ sub set_pulseaudio {
}
-my $alsa_routing_config_file = '/etc/alsa/pulse-default.conf';
+my $alsa_routing_config_file = "$::prefix/etc/alsa/pulse-default.conf";
my $disabling_routing = '#DRAKSOUND- ';
sub is_pulseaudio_routing_enabled() {
@@ -242,7 +242,7 @@ sub set_pulseaudio_routing {
-my $pulse_config_file = '/etc/pulse/daemon.conf';
+my $pulse_config_file = "$::prefix/etc/pulse/daemon.conf";
sub is_5_1_in_pulseaudio_enabled() {
my ($val) = (cat_($pulse_config_file) =~ /^default-sample-channels\s*=\s*(\d+)/m); #^
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 8e7bbbac6..789c4b4d4 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,4 @@
+- fix errors while setting PA preferences
- use umask=0 by default on vfat (#39315)
- root/user password:
o force the password to be utf8 (#23273)