Attachment 152904 Details for Bug 236918 – proposed patch

[patch] proposed patch

kudzu-1.2.69-salsa.patch (text/plain), 2.51 KB, created by Martin Stransky on 2007-04-18 13:27:02 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Stransky

Created: 2007-04-18 13:27:02 UTC

Size: 2.51 KB

patch

obsolete

>--- kudzu-1.2.69/hwconf.c.old	2006-11-16 20:25:08.000000000 +0100
>+++ kudzu-1.2.69/hwconf.c	2007-04-18 15:22:37.000000000 +0200
>@@ -600,7 +600,7 @@
> 			addLine(cf,path,CM_REPLACE);
> 			snprintf(path,256,"options %s index=%d",dev->driver,dev->index);
> 			addLine(cf,path,CM_REPLACE);
>-			snprintf(path,256,"remove %s { /usr/sbin/alsactl store %d >/dev/null 2>&1 || : ; }; /sbin/modprobe -r --ignore-remove %s",dev->driver, dev->index, dev->driver);
>+			snprintf(path,256,"remove %s { /sbin/salsa -s %d >/dev/null 2>&1 || : ; }; /sbin/modprobe -r --ignore-remove %s",dev->driver, dev->index, dev->driver);
> 			addLine(cf,path,CM_REPLACE);
> 			writeConfModules(cf,_module_file);
> 			madebak = cf->madebackup;
>@@ -682,7 +682,7 @@
> 				if (!needed) {
> 					snprintf(path,256,"options snd-card-%d index=%d",dev->index,dev->index);
> 					removeLine(cf,path,CM_REPLACE);
>-					snprintf(path,256,"remove %s { /usr/sbin/alsactl store >/dev/null 2>&1 || : ; }; /sbin/modprobe -r --ignore-remove %s",dev->driver, dev->driver);
>+					snprintf(path,256,"remove %s { /sbin/salsa -s %d >/dev/null 2>&1 || : ; }; /sbin/modprobe -r --ignore-remove %s",dev->driver, dev->index, dev->driver);
> 					removeLine(cf,path,CM_REPLACE);
> 					
> 				}
>--- kudzu-1.2.69/module_upgrade.c.old	2006-08-09 19:47:46.000000000 +0200
>+++ kudzu-1.2.69/module_upgrade.c	2007-04-18 15:20:54.000000000 +0200
>@@ -148,13 +148,13 @@
> 		addLine(cf,path,CM_REPLACE);
> 		snprintf(path,256,"options %s index=%d",aliasfoo,x);
> 		addLine(cf,path,CM_REPLACE);
>-		snprintf(path,256,"remove %s { /usr/sbin/alsactl store %d >/dev/null 2>&1 || : ; }; /sbin/modprobe -r --ignore-remove %s",aliasfoo, x, aliasfoo);
>+		snprintf(path,256,"remove %s { /sbin/salsa -s %d >/dev/null 2>&1 || : ; }; /sbin/modprobe -r --ignore-remove %s",aliasfoo, x, aliasfoo);
> 		addLine(cf,path,CM_REPLACE);
> 		snprintf(path,256,"post-install sound-slot-%d /bin/aumix-minimal -f /etc/.aumixrc -L >/dev/null 2>&1 || :", x);
> 		removeLine(cf,path,CM_REPLACE);
> 		snprintf(path,256,"pre-remove sound-slot-%d /bin/aumix-minimal -f /etc/.aumixrc -S >/dev/null 2>&1 || :", x);
> 		removeLine(cf,path,CM_REPLACE);
>-		snprintf(path,256,"install %s /sbin/modprobe --ignore-install %s && /usr/sbin/alsactl restore >/dev/null 2>&1 || :", aliasfoo, aliasfoo);
>+		snprintf(path,256,"install %s /sbin/modprobe --ignore-install %s && /sbin/salsa -l %d >/dev/null 2>&1 || :", aliasfoo, aliasfoo, x);
> 		removeLine(cf,path,CM_REPLACE);
> 		openlog("kudzu",0,LOG_USER);
> 		syslog(LOG_NOTICE,"changed sound-slot-%d alias to snd-card-%d, adjusted mixer calls", x, x);

Actions: View | Diff

Attachments on bug 236918: 152904