--- logitechmediaserver.postinst.orig 2011-11-30 00:57:23.209586361 +0000 +++ logitechmediaserver.postinst 2011-11-30 01:11:29.159153753 +0000 @@ -42,9 +42,7 @@ # If there's an apparmor config, we need to update it to allow mysql to work properly if [ -f /etc/apparmor.d/usr.sbin.mysqld ]; then - ## Remove the end-bracket so we can input our data into the file... - sed -e 's/}//' /etc/apparmor.d/usr.sbin.mysqld > /etc/apparmor.d/usr.sbin.mysqld.squeezeboxserver.new - echo " # SqueezeBox Apparmor Changes for MySqld + LogitechProfile=" # SqueezeBox Apparmor Changes for MySqld /var/lib/squeezeboxserver/cache/ r, /var/lib/squeezeboxserver/cache/my.cnf r, /var/lib/squeezeboxserver/cache/mysql.startup rw, @@ -52,11 +50,21 @@ /var/lib/squeezeboxserver/cache/squeezebox-mysql.pid w, /var/lib/squeezeboxserver/cache/squeezebox-mysql.sock w, /var/lib/squeezeboxserver/cache/MySQL/ r, - /var/lib/squeezeboxserver/cache/MySQL/** rwk, - } " >> /etc/apparmor.d/usr.sbin.mysqld.squeezeboxserver.new + /var/lib/squeezeboxserver/cache/MySQL/** rwk," + if [ -f /etc/apparmor.d/local/usr.sbin.mysqld ]; then + if ! grep -q 'usr.sbin.mysqld.logitech' /etc/apparmor.d/local/usr.sbin.mysqld; then + echo "#include " >>/etc/apparmor.d/local/usr.sbin.mysqld + fi + echo "$LogitechProfile" >/etc/apparmor.d/local/usr.sbin.mysqld.logitech + elif ! grep -q 'SqueezeBox' /etc/apparmor.d/usr.sbin.mysqld; then + ## Remove the end-bracket so we can input our data into the file... + sed -e 's/^}$//' /etc/apparmor.d/usr.sbin.mysqld > /etc/apparmor.d/usr.sbin.mysqld.squeezeboxserver.new + echo "$LogitechProfile" >>/etc/apparmor.d/usr.sbin.mysqld.squeezeboxserver.new + echo "}" >>/etc/apparmor.d/usr.sbin.mysqld.squeezeboxserver.new + mv /etc/apparmor.d/usr.sbin.mysqld /var/lib/squeezeboxserver/usr.sbin.mysqld.orig + mv /etc/apparmor.d/usr.sbin.mysqld.squeezeboxserver.new /etc/apparmor.d/usr.sbin.mysqld + fi - mv /etc/apparmor.d/usr.sbin.mysqld /var/lib/squeezeboxserver/usr.sbin.mysqld.orig - mv /etc/apparmor.d/usr.sbin.mysqld.squeezeboxserver.new /etc/apparmor.d/usr.sbin.mysqld if [ -x /etc/init.d/apparmor ]; then /etc/init.d/apparmor restart fi