Merge remote-tracking branch 'origin/master' into next

src/initscripts/packages/alsa

@@ -24,12 +24,12 @@
 
 case "$1" in
 	start)
+		modprobe snd_pcm_oss >/dev/null 2>&1
+		modprobe snd_mixer_oss >/dev/null 2>&1
 		boot_mesg "Starting ALSA...   Restoring volumes..."
-		modprobe snd_pcm_oss >/dev/null 2>&1 || failed=1
-		modprobe snd_mixer_oss >/dev/null 2>&1 || failed=1
-		(exit ${failed})
-		evaluate_retval
 		loadproc /usr/sbin/alsactl restore
+		evaluate_retval
+		exit 0
 		;;
 	stop)
 		boot_mesg "Stopping ALSA...    Saving volumes..."

src/paks/alsa/uninstall.sh

@@ -24,9 +24,6 @@
 . /opt/pakfire/lib/functions.sh
 stop_service ${NAME}
 make_backup ${NAME}
-# unload alsa related modules
-modprobe -r snd_pcm_oss >/dev/null 2>&1 || failed=1
-modprobe -r snd_timer >/dev/null 2>&1 || failed=1
 remove_files
 rm -rf /etc/rc.d/rc*.d/*alsa
 exit 0