Author: mherger
Date: Wed Nov 2 08:35:35 2011
New Revision: 33644
URL: http://svn.slimdevices.com/slim?rev=33644&view=rev
Log:
Bug: 17644
Description: port changes from ReadyNAS branch to fix spilling the root partition with our caches etc.
Added:
7.7/trunk/platforms/readynas/squeezeboxserver.preinst
Modified:
7.7/trunk/platforms/readynas/dirs
7.7/trunk/platforms/readynas/rules
7.7/trunk/platforms/readynas/squeezeboxserver.init
7.7/trunk/platforms/readynas/squeezeboxserver.logrotate
7.7/trunk/platforms/readynas/squeezeboxserver.postinst
7.7/trunk/platforms/readynas/squeezeboxserver.postrm
7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh
7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/remove.sh
7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh
7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/remove.sh
7.7/trunk/platforms/readynas/squeezeboxserver_safe
Modified: 7.7/trunk/platforms/readynas/dirs
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/dirs?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/dirs (original)
+++ 7.7/trunk/platforms/readynas/dirs Wed Nov 2 08:35:35 2011
@@ -1,5 +1,4 @@
etc/squeezeboxserver
usr/sbin
usr/share/squeezeboxserver
-var/lib/squeezeboxserver
-var/log/squeezeboxserver
+c/squeezeboxserver
Modified: 7.7/trunk/platforms/readynas/rules
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/rules?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/rules (original)
+++ 7.7/trunk/platforms/readynas/rules Wed Nov 2 08:35:35 2011
@@ -10,7 +10,7 @@
share=usr/share/squeezeboxserver/
source=$(CURDIR)/../server
-varlib=var/lib/squeezeboxserver
+varlib=c/squeezeboxserver
clean:
dh_testdir
@@ -31,6 +31,7 @@
install -d -m0755 ${base}/usr/share/doc/squeezeboxserver/
install -d -m0755 ${base}/${varlib}/prefs
install -d -m0755 ${base}/${varlib}/cache
+ install -d -m0755 ${base}/${varlib}/log
## This only occurs if the files exist ... if they do not exist here, they were probably
## removed by the buildme.pl script on purpose.
@@ -75,7 +76,7 @@
# Make sure we copy in the Bin directory
cp -rf ${source}/Bin ${base}/${share}
- # We put the Plugins into /var/lib/ because they are modifiable,
+ # We put the Plugins into /c/ because they are modifiable,
# and shouldn't be put into /usr.
cp -rf ${source}/Plugins ${base}/${varlib}
ln -s /${varlib}/Plugins ${base}/${share}/Plugins
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver.init
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver.init?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.init (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.init Wed Nov 2 08:35:35 2011
@@ -19,9 +19,9 @@
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
SLIMUSER=root
-PREFSDIR=/var/lib/$NAME/prefs
-LOGDIR=/var/log/$NAME/
-CACHEDIR=/var/lib/$NAME/cache
+PREFSDIR=/c/$NAME/prefs
+LOGDIR=/c/$NAME/log
+CACHEDIR=/c/$NAME/cache
SLIMOPTIONS=-utf8
# Read config file if it is present.
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver.logrotate
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver.logrotate?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.logrotate (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.logrotate Wed Nov 2 08:35:35 2011
@@ -1,4 +1,4 @@
-/var/log/squeezeboxserver/server.log {
+/c/squeezeboxserver/log/server.log {
weekly
rotate 5
size 200k
@@ -11,7 +11,7 @@
endscript
}
-/var/log/squeezeboxserver/scanner.log {
+/c/squeezeboxserver/log/scanner.log {
weekly
rotate 5
size 200k
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver.postinst
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver.postinst?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.postinst (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.postinst Wed Nov 2 08:35:35 2011
@@ -20,26 +20,24 @@
update-rc.d -f squeezeboxserver remove
# Remove the old Favorites module.
- rm -rf /var/lib/squeezeboxserver/Plugins/Favorites
+ rm -rf /c/squeezeboxserver/Plugins/Favorites
# Create a "squeezebox" user. This has modeled after the code in the postfix.deb
- # postinst. We first try to set the ownership of /var/lib/squeezebox. If that
+ # postinst. We first try to set the ownership of /c/squeezebox. If that
# fails, we create the user and re-try. If that still fails, we abort.
# Note that the Firmware directory has to be owned by squeezebox, since the
# server may download files to there during operation.
- if chown squeezeboxserver:nogroup /var/log/squeezeboxserver 2>/dev/null ; then
+ if chown squeezeboxserver:nogroup /c/squeezeboxserver 2>/dev/null ; then
chown $VERBOSE squeezeboxserver:nogroup /etc/squeezeboxserver -R
- chown $VERBOSE squeezeboxserver:nogroup /var/cache/squeezeboxserver -R
- chown $VERBOSE squeezeboxserver:nogroup /var/log/squeezeboxserver -R
+ chown $VERBOSE squeezeboxserver:nogroup /c/squeezeboxserver -R
elif adduser --system --home /usr/share/squeezeboxserver --no-create-home --gecos "Logitech Media Server" squeezeboxserver --disabled-password; then
sleep 1 # wait for user creation
chown $VERBOSE squeezeboxserver:nogroup /etc/squeezeboxserver -R
- chown $VERBOSE squeezeboxserver:nogroup /var/cache/squeezeboxserver -R
- chown $VERBOSE squeezeboxserver:nogroup /var/log/squeezeboxserver -R
+ chown $VERBOSE squeezeboxserver:nogroup /c/squeezeboxserver -R
fi
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver.postrm
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver.postrm?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.postrm (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.postrm Wed Nov 2 08:35:35 2011
@@ -3,6 +3,8 @@
if [ "$1" = purge ]; then
rm -rf /var/lib/squeezeboxserver/cache
+ rm -rf /c/squeezeboxserver/cache
+ rm -rf /c/squeezeboxserver/log
rm -rf /var/log/squeezeboxserver
fi
Added: 7.7/trunk/platforms/readynas/squeezeboxserver.preinst
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver.preinst?rev=33644&view=auto
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.preinst (added)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.preinst Wed Nov 2 08:35:35 2011
@@ -1,0 +1,22 @@
+#!/bin/sh
+
+# $Id$
+
+# preinst script for Logitech Media Server
+
+set -e
+. /usr/share/debconf/confmodule
+
+# we're going to replace squeezeboxserver with logitechmediaserver
+if [ -f /etc/init.d/squeezeboxserver ]; then
+ /etc/init.d/squeezeboxserver stop
+ rm -f /etc/init.d/squeezeboxserver
+ rm -f /etc/init.d/squeezecenter
+fi
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/install.sh Wed Nov 2 08:35:35 2011
@@ -25,26 +25,13 @@
MAJOR=$((`sed -e 's/.*version=//' -e 's/\..*//' /etc/raidiator_version`))
MINOR=$((`sed -e 's/.*version=//' -e 's/.*\.//' -e 's/[a-z,-].*//' /etc/raidiator_version`))
-
VERS=$(printf "%04d%04d" $MAJOR $MINOR)
[ $VERS -lt 40001 ] && bye "ERROR: Addon is not compatible with this RAIDiator version!"
eval $stop && sleep 1
-# Kill the whole DB if we're updating from SlimServer < 7, so the SC7 DB schema update doesn't freak out
-start-stop-daemon -S -q -b -x /usr/sbin/mysqld -- \
- --basedir=/usr --datadir=/var/lib/mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --socket=/var/run/mysqld/mysqld.sock
-for i in `seq 1 10`; do
- if mysql -s -u slimserver -e 'show databases' &>/dev/null; then
- break
- else
- sleep .5
- fi
-done
-if [ $((`mysql -s --skip-column-names -uslimserver slimserver -e "SELECT value FROM dbix_migration;"`)) -lt 10 ]; then
- mysql -s -uslimserver -e 'DROP DATABASE slimserver'
- mysql -s -uslimserver -e 'CREATE DATABASE slimserver'
-fi
+# Kill the squeezebox DB - we're now using SQLite
+mysql -s -uslimserver -e 'DROP DATABASE slimserver'
# Remove old versions of our addon
if [ -f "/etc/frontview/addons/${name}.remove" ]; then
@@ -75,9 +62,18 @@
dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
>/etc/debian_version
+# we can't leave our files on the root partition, it's too small
+if [ !-e /c/squeezeboxserver/prefs/server.prefs ]; then
+ mv /var/lib/squeezeboxserver/* /c/squeezeboxserver/ > /dev/null 2>&1
+ mv /var/log/squeezeboxserver/* /c/squeezeboxserver/log/ > /dev/null 2>&1
+fi
+
+rm -rf /var/lib/squeezeboxserver
+rm -rf /var/log/squeezeboxserver
+
# Symlink the new log file to the old location, so the log .zip file picks it up
rm -f /var/log/slimserver.log
-ln -sf /var/log/squeezeboxserver/server.log /var/log/slimserver.log
+ln -sf /c/squeezeboxserver/log/server.log /var/log/slimserver.log
# Start up the addon program
eval $run || bye "ERROR: Could not start $friendly_name service"
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/remove.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/remove.sh?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/remove.sh (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_addon_i386/LogitechMediaServer/remove.sh Wed Nov 2 08:35:35 2011
@@ -10,10 +10,11 @@
/etc/squeezeboxserver \
/usr/share/squeezeboxserver \
/usr/sbin/squeezeboxserver* \
- ./etc/init.d/squeezeboxserver \
- ./etc/default/squeezeboxserver \
- ./usr/share/perl5/Slim \
- /var/lib/mysql/slimserver"
+ ./etc/init.d/squeezeboxserver \
+ ./etc/default/squeezeboxserver \
+ ./usr/share/perl5/Slim \
+ /var/lib/mysql/slimserver \
+ /c/squeezeboxserver"
# Stop service from running
eval `awk -F'!!' "/$SERVICE/ { print \\$5 }" /etc/frontview/addons/addons.conf`
@@ -45,8 +46,8 @@
# Doing an upgrade. Look for old config files. If we find them, copy them, then remove them
for package in $OLD_PACKAGE_NAMES; do
if [ -e /var/lib/$package/prefs ]; then
- mkdir -p /var/lib/squeezeboxserver/prefs
- mv -n /var/lib/$package/prefs/* /var/lib/squeezeboxserver/prefs &>/dev/null
+ mkdir -p /c/squeezeboxserver/prefs
+ mv -n /var/lib/$package/prefs/* /c/squeezeboxserver/prefs &>/dev/null
rm -rf /var/lib/$package
fi
done
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/install.sh Wed Nov 2 08:35:35 2011
@@ -30,20 +30,8 @@
eval $stop && sleep 1
-# Kill the whole DB if we're updating from SlimServer < 7, so the SC7 DB schema update doesn't freak out
-start-stop-daemon -S -q -b -x /usr/sbin/mysqld -- \
- --basedir=/usr --datadir=/var/lib/mysql --pid-file=/var/run/mysqld/mysqld.pid --skip-locking --socket=/var/run/mysqld/mysqld.sock
-for i in `seq 1 10`; do
- if mysql -s -u slimserver -e 'show databases' &>/dev/null; then
- break
- else
- sleep .5
- fi
-done
-if [ $((`mysql -s --skip-column-names -uslimserver slimserver -e "SELECT value FROM dbix_migration;"`)) -lt 10 ]; then
- mysql -s -uslimserver -e 'DROP DATABASE slimserver'
- mysql -s -uslimserver -e 'CREATE DATABASE slimserver'
-fi
+# Kill the squeezebox DB - we're now using SQLite
+mysql -s -uslimserver -e 'DROP DATABASE slimserver'
# Remove old versions of our addon
if [ -f "/etc/frontview/addons/${name}.remove" ]; then
@@ -74,9 +62,18 @@
dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
>/etc/debian_version && chattr +i /etc/debian_version
+# we can't leave our files on the root partition, it's too small
+if [ !-e /c/squeezeboxserver/prefs/server.prefs ]; then
+ mv /var/lib/squeezeboxserver/* /c/squeezeboxserver/ > /dev/null 2>&1
+ mv /var/log/squeezeboxserver/* /c/squeezeboxserver/log/ > /dev/null 2>&1
+fi
+
+rm -rf /var/lib/squeezeboxserver
+rm -rf /var/log/squeezeboxserver
+
# Symlink the new log file to the old location, so the log .zip file picks it up
rm -f /var/log/slimserver.log
-ln -sf /var/log/squeezeboxserver/server.log /var/log/slimserver.log
+ln -sf /c/squeezeboxserver/log/server.log /var/log/slimserver.log
# Start up the addon program
eval $run || bye "ERROR: Could not start $friendly_name service"
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/remove.sh
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/remove.sh?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/remove.sh (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_addon_sparc/LogitechMediaServer/remove.sh Wed Nov 2 08:35:35 2011
@@ -10,10 +10,11 @@
/etc/squeezeboxserver \
/usr/share/squeezeboxserver \
/usr/sbin/squeezeboxserver* \
- ./etc/init.d/squeezeboxserver \
- ./etc/default/squeezeboxserver \
- ./usr/share/perl5/Slim \
- /var/lib/mysql/slimserver"
+ ./etc/init.d/squeezeboxserver \
+ ./etc/default/squeezeboxserver \
+ ./usr/share/perl5/Slim \
+ /var/lib/mysql/slimserver \
+ /c/squeezeboxserver"
# Stop service from running
eval `awk -F'!!' "/$SERVICE/ { print \\$5 }" /etc/frontview/addons/addons.conf`
@@ -45,8 +46,8 @@
# Doing an upgrade. Look for old config files. If we find them, copy them, then remove them
for package in $OLD_PACKAGE_NAMES; do
if [ -e /var/lib/$package/prefs ]; then
- mkdir -p /var/lib/squeezeboxserver/prefs
- mv -n /var/lib/$package/prefs/* /var/lib/squeezeboxserver/prefs &>/dev/null
+ mkdir -p /c/squeezeboxserver/prefs
+ mv -n /var/lib/$package/prefs/* /c/squeezeboxserver/prefs &>/dev/null
rm -rf /var/lib/$package
fi
done
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver_safe
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver_safe?rev=33644&r1=33643&r2=33644&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_safe (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_safe Wed Nov 2 08:35:35 2011
@@ -19,13 +19,13 @@
function clean_up {
# Kill the daemon if it is running
kill $SLIMPID
- echo `date "+%F %H:%M:%S"` "squeezeboxserver_safe stopped." >> /var/log/squeezeboxserver/server.log
+ echo `date "+%F %H:%M:%S"` "squeezeboxserver_safe stopped." >> /c/squeezeboxserver/log/server.log
exit
}
trap clean_up SIGINT SIGHUP SIGTERM
-echo `date "+%F %H:%M:%S"` "squeezeboxserver_safe started." >> /var/log/squeezeboxserver/server.log
+echo `date "+%F %H:%M:%S"` "squeezeboxserver_safe started." >> /c/squeezeboxserver/log/server.log
while true
do
@@ -45,7 +45,7 @@
sleep 15
wait $SLIMPID
- echo `date "+%F %H:%M:%S"` "Logitech Media Server died. Restarting." >> /var/log/squeezeboxserver/server.log
+ echo `date "+%F %H:%M:%S"` "Logitech Media Server died. Restarting." >> /c/squeezeboxserver/log/server.log
# Normally, when Logitech Media Server realizes that the mysql-connection is gone,
# the mysql server has already been started again. So no need to sleep
lmpx.com only provides a reader for public news (NNTP) servers. It is not
affiliated with the servers or forums shown here and is not responsible for
the content of articles, which is written by their respective authors.