From 301dafca91c9524db9b46634f1420498139ac915 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pali=20Roh=C3=A1r?= Date: Fri, 25 Oct 2013 15:51:47 +0200 Subject: [PATCH] Update kernel-power-modules postinst and postrm files: Totally remove shm_size=0x400000 from /etc/modprobe.d/bridgedriver because it is not needed --- .../debian/kernel-power-modules.postinst.in | 10 ++++++++-- .../debian/kernel-power-modules.postrm.in | 4 ---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in index 274f616..fb9b5a6 100644 --- a/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in +++ b/kernel-power-2.6.28/debian/kernel-power-modules.postinst.in @@ -10,8 +10,14 @@ if grep -q "MODULE_PATH=/lib/modules/current" /sbin/preinit; then sed 's%MODULE_PATH=/lib/modules/current%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%' -i /sbin/preinit fi -if ! grep -q '#fixed by kernel-power' /etc/modprobe.d/bridgedriver; then - echo -e "options bridgedriver phys_mempool_base=0 base_img=/lib/dsp/baseimage.dof\n#fixed by kernel-power" > /etc/modprobe.d/bridgedriver +# Remove param shm_size for bridgedriver +if grep -q 'shm_size=' /etc/modprobe.d/bridgedriver; then + sed 's/shm_size=[^\s*] //' -i /etc/modprobe.d/bridgedriver +fi + +# Remove comment set by previous kernel-power versions +if grep -q '#fixed by kernel-power' /etc/modprobe.d/bridgedriver; then + sed 's/#fixed by kernel-power//;/^$/d' -i /etc/modprobe.d/bridgedriver fi #DEBHELPER# diff --git a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in index 07b43e2..f3308f2 100644 --- a/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in +++ b/kernel-power-2.6.28/debian/kernel-power-modules.postrm.in @@ -10,8 +10,4 @@ if test "$1" != "upgrade" && grep -q 'MODULE_PATH=/lib/modules/`uname -r`' /sbin sed 's%MODULE_PATH=/lib/modules/`uname -r` #fixed by kernel-power%MODULE_PATH=/lib/modules/current%' -i /sbin/preinit fi -if test "$1" != "upgrade" && grep -q '#fixed by kernel-power' /etc/modprobe.d/bridgedriver; then - echo -e "options bridgedriver shm_size=0x400000 phys_mempool_base=0 base_img=/lib/dsp/baseimage.dof\n" > /etc/modprobe.d/bridgedriver -fi - #DEBHELPER# -- 1.7.9.5