diff options
| author | Olivier Blin <oblin@mandriva.com> | 2007-09-11 23:07:48 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.com> | 2007-09-11 23:07:48 +0000 |
| commit | 656b70319b462e77711438af83ba5f7aa56748f7 (patch) | |
| tree | 3a31a0353009d027a638ec3974d921d76ba5b291 /perl-install | |
| parent | 302915a43ada55d969647137cfd83bca86dedafe (diff) | |
| download | drakx-656b70319b462e77711438af83ba5f7aa56748f7.tar drakx-656b70319b462e77711438af83ba5f7aa56748f7.tar.gz drakx-656b70319b462e77711438af83ba5f7aa56748f7.tar.bz2 drakx-656b70319b462e77711438af83ba5f7aa56748f7.tar.xz drakx-656b70319b462e77711438af83ba5f7aa56748f7.zip | |
drop snd-usb-audio blacklist, now done with a modprobe.d file
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake | 7 | ||||
| -rwxr-xr-x | perl-install/standalone/service_harddrake.sh | 1 |
3 files changed, 1 insertions, 8 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 62e722772..6ce85acfc 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -2,6 +2,7 @@ o drop support for iiimf - list jmicron driver in disk/ide - library: have "defaults" mount option instead of empty string (for rescue) +- service_harddrake: drop snd-usb-audio blacklist, now done with a modprobe.d file Version 10.4.190 - 5 September 2007, by Thierry Vignaud diff --git a/perl-install/standalone/service_harddrake b/perl-install/standalone/service_harddrake index 3f3ba8517..7dde81a78 100755 --- a/perl-install/standalone/service_harddrake +++ b/perl-install/standalone/service_harddrake @@ -18,13 +18,6 @@ use Storable qw(store retrieve); my $force = member('--force', @ARGV); -my $mode = $ARGV[0] eq 'stop' && 'stop'; - -if ($mode eq 'stop') { - append_to_file('/etc/modprobe.conf', "blacklist audio\nblacklist snd-usb-audio\n") if cat_('/etc/modprobe.conf') !~ /^blacklist snd-usb-audio/m; - c::_exit(0); -} - my $invert_do_it = $ARGV[0] eq 'X11' ? 1 : 0; my ($hw_sysconfdir, $timeout) = ("/etc/sysconfig/harddrake2", $invert_do_it ? 600 : 25); my $last_boot_config = "$hw_sysconfdir/previous_hw"; diff --git a/perl-install/standalone/service_harddrake.sh b/perl-install/standalone/service_harddrake.sh index efc7313ef..e1c439e95 100755 --- a/perl-install/standalone/service_harddrake.sh +++ b/perl-install/standalone/service_harddrake.sh @@ -53,7 +53,6 @@ case "$1" in stop) # dummy rm -f $SUBSYS - action "Stopping %s" harddrake /usr/share/harddrake/service_harddrake stop 2>/dev/null ;; *) gprintf "Usage: %s {start|stop}\n" "$0" |