diff options
Diffstat (limited to 'move/tree')
| -rwxr-xr-x | move/tree/alsa_default.pl | 12 | ||||
| -rwxr-xr-x | move/tree/mdk_move_loop | 4 | ||||
| -rwxr-xr-x | move/tree/sound.initscript | 4 | ||||
| -rwxr-xr-x | move/tree/wait4x | 4 |
4 files changed, 12 insertions, 12 deletions
diff --git a/move/tree/alsa_default.pl b/move/tree/alsa_default.pl index d95400f67..0ad89c264 100755 --- a/move/tree/alsa_default.pl +++ b/move/tree/alsa_default.pl @@ -1,19 +1,19 @@ -#!/usr/bin/perl -pi +#!/usr/bin/perl # state machine: if (/\s*control\./) { ($min, $max) = (0, 0); } elsif (/\s*name '/) { - # skip masks and blacklist sb live and the like: - $ignore = /\s*name '.*(3D Control|AC97 Playback Volume|Audigy Analog\/Digital Output Jack|External Amplifier Power Down|Exchange DAC|IEC958 input monitor|IEC958 Capture Monitor|IEC958 Playback Switch|mask|Output Jack|Surround down mix)/i; + # skip masks + $ignore = /\s*name '.*(3D Control|mask|Exchange DAC|Output Jack)/; } elsif (!$ignore) { if (/s*comment.range '(\d+) - (\d+)'/) { ($min, $max) = ($1, $2); } elsif (/s*value/) { - # enable switches: + # enable switches (we should really blacklist sb live and the like): s/(value\w*\S*)\s* false/\1 true/; - # set volume to 80%: - my $val = int($max*0.8); + # set volume to 67%: + my $val = int($max*0.6); s/(value\w*\S*)\s* 0/\1 $val/ } } diff --git a/move/tree/mdk_move_loop b/move/tree/mdk_move_loop index b98c4a417..76aca6dbe 100755 --- a/move/tree/mdk_move_loop +++ b/move/tree/mdk_move_loop @@ -8,8 +8,8 @@ sub name2file { sub get_file2loop { my %file2loop; foreach (0 .. 9) { - my ($file) = `sudo losetup /dev/loop$_ 2>/dev/null` =~ m!\([^)]*/([^)]*)\)! or last; - $file2loop{$file} = "loop$_"; + my ($file) = `sudo losetup /dev/chloop$_ 2>/dev/null` =~ m!\([^)]*/([^)]*)\)! or last; + $file2loop{$file} = "chloop$_"; } %file2loop; } diff --git a/move/tree/sound.initscript b/move/tree/sound.initscript index 8fbd5d317..756f22398 100755 --- a/move/tree/sound.initscript +++ b/move/tree/sound.initscript @@ -21,8 +21,8 @@ function start_mixer () { if [ -d /proc/asound ] && [ -x /usr/sbin/alsactl ];then MIXER_SETTINGS=/root/tmp/asound.state_tmp alsactl -f $MIXER_SETTINGS store - # set some sane default volume and unmute needed channels: - /etc/rc.d/rc.alsa_default $MIXER_SETTINGS + # set sensible defaults: + perl -pi /usr/bin/alsa_default.pl $MIXER_SETTINGS action "Setting mixer settings" alsactl -f $MIXER_SETTINGS restore rm -f $MIXER_SETTINGS return 0 diff --git a/move/tree/wait4x b/move/tree/wait4x index a3158f1bd..40655e94c 100755 --- a/move/tree/wait4x +++ b/move/tree/wait4x @@ -2,7 +2,7 @@ use MDK::Common; use lib qw(/usr/lib/libDrakX); -use xf86misc::main; +use c; my $nb = 0; $| = 1; @@ -11,7 +11,7 @@ foreach (1..30) { print "."; sleep 1; print("no X server :(\n"), exit 1 if !fuzzy_pidofs(qr/\bX_move\b/); - $nb++ if xf86misc::main::Xtest(':0'); + $nb++ if c::Xtest(':0'); if ($nb > 2) { #- one succeeded test is not enough :-( print "found\n"; exit 0; |