diff --git a/extras/hotplug/sound.agent b/extras/hotplug/sound.agent index 70374f5..2f513a8 100755 --- a/extras/hotplug/sound.agent +++ b/extras/hotplug/sound.agent @@ -18,7 +18,10 @@ ALSACTL=/usr/sbin/alsactl # Fail if needed files and directories are not available, # so that the event can be retried later. -[ -d "$STATEPATH" ] && [ -x "$AMIXER" ] && [ -x "$ALSACTL" ] || exit 1 +## NB: split the check into relevant parts, we don't really +## need anything else than amixer and set_mixer_default() +## in LTSP chroot -- mike@altlinux.org 20071214 +#[ -d "$STATEPATH" ] && [ -x "$AMIXER" ] && [ -x "$ALSACTL" ] || exit 1 mixer() { @@ -28,6 +31,7 @@ mixer() set_mixer_default() { + [ -x "$AMIXER" ] || exit 1 mesg "Set default mixer values for $DEVPATH ($CARDN)" mixer Master 75% mixer PCM 90% @@ -56,6 +60,7 @@ set_mixer_default() restore_mixer() { + [ -d "$STATEPATH" ] && [ -x "$ALSACTL" ] || exit 1 mesg "Restore mixer values for $DEVPATH ($CARDN)" ret=`$ALSACTL -F -f "$STATEPATH/asound$CARDN.state" restore $CARDN 2>&1` [ "$ret" = "" ] || return 1 @@ -63,6 +68,7 @@ restore_mixer() save_mixer() { + [ -d "$STATEPATH" ] && [ -x "$ALSACTL" ] || exit 1 rm -f "$STATEPATH/asound$CARDN.state" $ALSACTL -f "$STATEPATH/asound$CARDN.state" store $CARDN ret=$? diff --git a/udev.spec b/udev.spec index 5a28dd8..cd73248 100644 --- a/udev.spec +++ b/udev.spec @@ -9,7 +9,7 @@ Name: udev Version: 108 -Release: alt2 +Release: alt2.1 Summary: udev - an userspace implementation of devfs Summary(ru_RU.UTF-8): udev - это вынесенная из ядра реализация devfs @@ -23,6 +23,8 @@ Source0: %name-%version.tar Patch0: %name-%version-%release.patch +Packager: Sergey Vlasov + PreReq: shadow-utils PreReq: module-init-tools >= 3.3 PreReq: dmsetup @@ -292,6 +294,13 @@ fi /lib/mkinitrd/udev %changelog +* Fri Dec 14 2007 Michael Shigorin 108-alt2.1 +- NMU: fixed premature safety checks in sound.agent + (it's perfectly good to only have amixer in LTSP chroot, + there's no possibility to save/restore mixer state on diskless + systems anyways) +- added Packager: + * Wed Nov 28 2007 Sergey Vlasov 108-alt2 - Applied post-108 upstream changes (0809c264e9878cdd1c61d9fb0e077972bc596ef8): + make ACTION!="add|change" working (now "!=" is really the inverse of "==")