[Slim-Checkins] r33834 - in /7.7/trunk/platforms/debian: logitechmediaserver.postinst logitechmediaserver.postrm rules

Author: mherger
Date: Tue Feb 14 04:37:47 2012
New Revision: 33834

URL: http://svn.slimdevices.com/slim?rev=33834&view=rev
Log:
Bug: 17818
Description: don't mess with the apparmor/mysql files. We don't use mysql any longer.

Modified:
    7.7/trunk/platforms/debian/logitechmediaserver.postinst
    7.7/trunk/platforms/debian/logitechmediaserver.postrm
    7.7/trunk/platforms/debian/rules

Modified: 7.7/trunk/platforms/debian/logitechmediaserver.postinst
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/debian/logitechmediaserver.postinst?rev=33834&r1=33833&r2=33834&view=diff
==============================================================================
--- 7.7/trunk/platforms/debian/logitechmediaserver.postinst (original)
+++ 7.7/trunk/platforms/debian/logitechmediaserver.postinst Tue Feb 14 04:37:47 2012
@@ -40,29 +40,6 @@
 
 	fi
 
-	# 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
-  /var/lib/squeezeboxserver/cache/ r,
-  /var/lib/squeezeboxserver/cache/my.cnf r,
-  /var/lib/squeezeboxserver/cache/mysql.startup rw,
-  /var/lib/squeezeboxserver/cache/mysql-error-log.txt rw,
-  /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
-
-		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
-		echo "\n"
-	fi
-	
 	db_stop
 
     ;;

Modified: 7.7/trunk/platforms/debian/logitechmediaserver.postrm
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/debian/logitechmediaserver.postrm?rev=33834&r1=33833&r2=33834&view=diff
==============================================================================
--- 7.7/trunk/platforms/debian/logitechmediaserver.postrm (original)
+++ 7.7/trunk/platforms/debian/logitechmediaserver.postrm Tue Feb 14 04:37:47 2012
@@ -11,13 +11,6 @@
 
 fi
 
-## if we had moved the original apparmor config file out of the way,
-## then lets put it back in place... 
-if [ -f /var/lib/squeezeboxserver/usr.sbin.mysqld.orig ]; then
-	rm /etc/apparmor.d/usr.sbin.mysqld
-	mv /var/lib/squeezeboxserver/usr.sbin.mysqld.orig /etc/apparmor.d/usr.sbin.mysqld
-fi
-
 # dh_installdeb will replace this with shell code automatically
 # generated by other debhelper scripts.
 

Modified: 7.7/trunk/platforms/debian/rules
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/debian/rules?rev=33834&r1=33833&r2=33834&view=diff
==============================================================================
--- 7.7/trunk/platforms/debian/rules (original)
+++ 7.7/trunk/platforms/debian/rules Tue Feb 14 04:37:47 2012
@@ -47,9 +47,6 @@
 
 	# Make sure we copy in the Bin directory
 	cp -r ${source}/Bin ${base}/${share}
-
-	# Remove the mysqld daemon on purpose, so that we use the system binary
-	rm -rf ${base}/${share}/Bin/i386-linux/mysqld 
 
 	# Remove non-Linux binary modules and binaries
 	rm -rf ${base}/${share}/CPAN/arch/*/darwin-thread-multi-2level