Author: mherger
Date: Mon Dec 19 21:55:05 2011
New Revision: 33755
URL: http://svn.slimdevices.com/slim?rev=33755&view=rev
Log:
Bug: 17819
Description: rename our data folder once again, to work around a bug in the ReadyNAS firmware, messing up its Samba configuration.
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=33755&r1=33754&r2=33755&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/dirs (original)
+++ 7.7/trunk/platforms/readynas/dirs Mon Dec 19 21:55:05 2011
@@ -2,3 +2,4 @@
usr/sbin
usr/share/squeezeboxserver
c/squeezeboxserver
+c/.squeezeboxserver
Modified: 7.7/trunk/platforms/readynas/rules
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/rules?rev=33755&r1=33754&r2=33755&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/rules (original)
+++ 7.7/trunk/platforms/readynas/rules Mon Dec 19 21:55:05 2011
@@ -10,7 +10,7 @@
share=usr/share/squeezeboxserver/
source=$(CURDIR)/../server
-varlib=c/squeezeboxserver
+varlib=c/.squeezeboxserver
clean:
dh_testdir
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver.init
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver.init?rev=33755&r1=33754&r2=33755&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.init (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.init Mon Dec 19 21:55:05 2011
@@ -19,9 +19,9 @@
PIDFILE=/var/run/$NAME.pid
SCRIPTNAME=/etc/init.d/$NAME
SLIMUSER=root
-PREFSDIR=/c/$NAME/prefs
-LOGDIR=/c/$NAME/log
-CACHEDIR=/c/$NAME/cache
+PREFSDIR=/c/.$NAME/prefs
+LOGDIR=/c/.$NAME/log
+CACHEDIR=/c/.$NAME/cache
SLIMOPTIONS=-utf8
# Read config file if it is present.
@@ -36,14 +36,14 @@
d_start() {
# Use squeezebox_safe to restart the daemon when
# it dies. This must be done to handle mysql restarts.
- start-stop-daemon --start --quiet \
+ start-stop-daemon --start --quiet \
--chuid $SLIMUSER \
--pidfile $PIDFILE \
- --exec /bin/bash \
+ --exec /bin/bash \
--background \
--make-pidfile \
- --name squeezeboxserve \
- --startas $DAEMON_SAFE \
+ --name squeezeboxserve \
+ --startas $DAEMON_SAFE \
-- \
$DAEMON \
--prefsdir $PREFSDIR \
@@ -56,7 +56,7 @@
start-stop-daemon --start --quiet \
--chuid $SLIMUSER \
--pidfile $PIDFILE \
- --exec $DAEMON \
+ --exec $DAEMON \
-- \
--pidfile $PIDFILE \
--daemon \
Modified: 7.7/trunk/platforms/readynas/squeezeboxserver.logrotate
URL: http://svn.slimdevices.com/slim/7.7/trunk/platforms/readynas/squeezeboxserver.logrotate?rev=33755&r1=33754&r2=33755&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.logrotate (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.logrotate Mon Dec 19 21:55:05 2011
@@ -1,4 +1,4 @@
-/c/squeezeboxserver/log/server.log {
+/c/.squeezeboxserver/log/server.log {
weekly
rotate 5
size 200k
@@ -11,7 +11,7 @@
endscript
}
-/c/squeezeboxserver/log/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=33755&r1=33754&r2=33755&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.postinst (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.postinst Mon Dec 19 21:55:05 2011
@@ -20,24 +20,24 @@
update-rc.d -f squeezeboxserver remove
# Remove the old Favorites module.
- rm -rf /c/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 /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 /c/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 /c/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 /c/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=33755&r1=33754&r2=33755&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver.postrm (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver.postrm Mon Dec 19 21:55:05 2011
@@ -3,9 +3,11 @@
if [ "$1" = purge ]; then
rm -rf /var/lib/squeezeboxserver/cache
+ rm -rf /var/log/squeezeboxserver
rm -rf /c/squeezeboxserver/cache
rm -rf /c/squeezeboxserver/log
- rm -rf /var/log/squeezeboxserver
+ rm -rf /c/.squeezeboxserver/cache
+ rm -rf /c/.squeezeboxserver/log
fi
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=33755&r1=33754&r2=33755&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 Mon Dec 19 21:55:05 2011
@@ -62,10 +62,16 @@
dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
>/etc/debian_version
+# Argh... ReadyNAS messes up the Samba configuration if there are folders in /c/ - let's hid ours
+# http://bugs.slimdevices.com/show_bug.cgi?id=17819
+if [ !-e /c/.squeezeboxserver ]; then
+ mv /c/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
+fi
+
# 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
+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
@@ -73,7 +79,7 @@
# 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 /c/squeezeboxserver/log/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=33755&r1=33754&r2=33755&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 Mon Dec 19 21:55:05 2011
@@ -14,7 +14,8 @@
./etc/default/squeezeboxserver \
./usr/share/perl5/Slim \
/var/lib/mysql/slimserver \
- /c/squeezeboxserver"
+ /c/squeezeboxserver \
+ /c/.squeezeboxserver"
# Stop service from running
eval `awk -F'!!' "/$SERVICE/ { print \\$5 }" /etc/frontview/addons/addons.conf`
@@ -46,8 +47,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 /c/squeezeboxserver/prefs
- mv -n /var/lib/$package/prefs/* /c/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=33755&r1=33754&r2=33755&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 Mon Dec 19 21:55:05 2011
@@ -62,10 +62,16 @@
dpkg -i --force-all squeezeboxserver*.deb &>/dev/null || bye "ERROR: $friendly_name installation failed"
>/etc/debian_version && chattr +i /etc/debian_version
+# Argh... ReadyNAS messes up the Samba configuration if there are folders in /c/ - let's hid ours
+# http://bugs.slimdevices.com/show_bug.cgi?id=17819
+if [ !-e /c/.squeezeboxserver ]; then
+ mv /c/squeezeboxserver/* /c/.squeezeboxserver/ > /dev/null 2>&1
+fi
+
# 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
+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
@@ -73,7 +79,7 @@
# 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 /c/squeezeboxserver/log/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=33755&r1=33754&r2=33755&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 Mon Dec 19 21:55:05 2011
@@ -14,7 +14,8 @@
./etc/default/squeezeboxserver \
./usr/share/perl5/Slim \
/var/lib/mysql/slimserver \
- /c/squeezeboxserver"
+ /c/squeezeboxserver \
+ /c/.squeezeboxserver"
# Stop service from running
eval `awk -F'!!' "/$SERVICE/ { print \\$5 }" /etc/frontview/addons/addons.conf`
@@ -46,8 +47,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 /c/squeezeboxserver/prefs
- mv -n /var/lib/$package/prefs/* /c/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=33755&r1=33754&r2=33755&view=diff
==============================================================================
--- 7.7/trunk/platforms/readynas/squeezeboxserver_safe (original)
+++ 7.7/trunk/platforms/readynas/squeezeboxserver_safe Mon Dec 19 21:55:05 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." >> /c/squeezeboxserver/log/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." >> /c/squeezeboxserver/log/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." >> /c/squeezeboxserver/log/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.