Author: titmuss
Date: Fri Apr 18 15:17:58 2008
New Revision: 2289
URL: http://svn.slimdevices.com?rev=2289&root=Jive&view=rev
Log:
Bug: 7875
Description:
Remove local changes from the Controller after an upgrade.
Renamed the script run from the SD card on boot.
Added an option to automatically apply a patch file after an upgrade, this is
not working
so well. It looks like busybox's patch program does not work very well.
Added:
7.1/trunk/squeezeos/src/system/filesystem/etc/keep-after-upgrade
Modified:
7.1/trunk/squeezeos/src/system/filesystem/Makefile
7.1/trunk/squeezeos/src/system/filesystem/etc/inetd.conf
7.1/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS
7.1/trunk/squeezeos/src/system/filesystem/linuxrc
Modified: 7.1/trunk/squeezeos/src/system/filesystem/Makefile
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/system/filesystem/Makefile?rev=2289&root=Jive&r1=2288&r2=2289&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/system/filesystem/Makefile (original)
+++ 7.1/trunk/squeezeos/src/system/filesystem/Makefile Fri Apr 18 15:17:58 2008
@@ -23,6 +23,7 @@
install etc/group ${PREFIX}/etc
install etc/motd ${PREFIX}/etc
install etc/mdev.conf ${PREFIX}/etc
+ install etc/keep-after-upgrade ${PREFIX}/etc
cd ${PREFIX}/etc; ln -sf /proc/mounts mtab
install ${LIB_DIR}/ld-2.6.1.so ${PREFIX}/lib
cd ${PREFIX}/lib; ln -sf ld-2.6.1.so ld-linux.so.3
Modified: 7.1/trunk/squeezeos/src/system/filesystem/etc/inetd.conf
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/system/filesystem/etc/inetd.conf?rev=2289&root=Jive&r1=2288&r2=2289&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/system/filesystem/etc/inetd.conf (original)
+++ 7.1/trunk/squeezeos/src/system/filesystem/etc/inetd.conf Fri Apr 18
15:17:58 2008
@@ -71,5 +71,5 @@
#systat stream tcp nowait nobody /usr/sbin/tcpd /bin/ps -auwwx
#netstat stream tcp nowait root /bin/netstat /bin/netstat
-a
#ident stream tcp nowait root /usr/sbin/in.identd in.identd
-#ssh stream tcp nowait root /usr/sbin/dropbear dropbear -i
+ssh stream tcp nowait root /usr/sbin/dropbear dropbear -i
netperf stream tcp nowait root /usr/bin/netserver netserver
Modified: 7.1/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS?rev=2289&root=Jive&r1=2288&r2=2289&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS (original)
+++ 7.1/trunk/squeezeos/src/system/filesystem/etc/init.d/rcS Fri Apr 18
15:17:58 2008
@@ -56,8 +56,12 @@
echo "First boot"
touch /etc/firstboot
- if [ -x /mnt/mmc/firstboot.sh ]; then
- (cd /mnt/mmc; ./firstboot.sh)
+ if [ -r /mnt/mmc/squeezeos.patch ]; then
+ /usr/bin/patch -i /mnt/mmc/squeezeos.patch
+ fi
+
+ if [ -x /mnt/mmc/squeezeos-post-reset.sh ]; then
+ (cd /mnt/mmc; ./squeezeos-post-reset.sh)
fi
fi
@@ -91,8 +95,8 @@
/etc/init.d/rcS.local
fi
-if [ -x /mnt/mmc/jiveboot.sh ]; then
- (cd /mnt/mmc; ./jiveboot.sh)
+if [ -x /mnt/mmc/squeezeos-boot.sh ]; then
+ (cd /mnt/mmc; ./squeezeos-boot.sh)
fi
echo "Starting jive applications"
Added: 7.1/trunk/squeezeos/src/system/filesystem/etc/keep-after-upgrade
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/system/filesystem/etc/keep-after-upgrade?rev=2289&root=Jive&view=auto
==============================================================================
--- 7.1/trunk/squeezeos/src/system/filesystem/etc/keep-after-upgrade (added)
+++ 7.1/trunk/squeezeos/src/system/filesystem/etc/keep-after-upgrade Fri Apr 18
15:17:58 2008
@@ -1,0 +1,3 @@
+# Files matching the following pattern are preserved after an SqueezeOS upgrade
+/settings.lua$
+/etc/
Modified: 7.1/trunk/squeezeos/src/system/filesystem/linuxrc
URL:
http://svn.slimdevices.com/7.1/trunk/squeezeos/src/system/filesystem/linuxrc?rev=2289&root=Jive&r1=2288&r2=2289&view=diff
==============================================================================
--- 7.1/trunk/squeezeos/src/system/filesystem/linuxrc (original)
+++ 7.1/trunk/squeezeos/src/system/filesystem/linuxrc Fri Apr 18 15:17:58 2008
@@ -20,15 +20,22 @@
# Factory reset
if [ $JFFS2_OK -ne 0 -o -f /mnt/storage/.factoryreset ]
then
- /bin/echo "*** FACTORY RESET ***"
+ /bin/echo "Factory Reset"
/bin/umount /mnt/storage
/usr/sbin/flash_eraseall -q /dev/mtd/2
/bin/mount -t jffs2 -o noatime /dev/mtdblock/2 /mnt/storage
else
- # Delete wireless lan firmware
- /bin/rm -f /mnt/storage/lib/firmware/gspi8686.bin
- /bin/rm -f /mnt/storage/lib/firmware/helper_gspi.bin
+ # Upgraded?
+ /usr/bin/diff -N /etc/jive.version /mnt/storage/etc/jive.version >
/dev/null 2> /dev/null
+ if [ $? -ne 0 ]
+ then
+ # Remove modified files
+ /bin/echo "SqueezeOS Upgraded"
+ /usr/bin/find /mnt/storage/ -type f | /bin/grep -v -f
/etc/keep-after-upgrade | /usr/bin/xargs /bin/rm -f
+ fi
+
+ cp /etc/jive.version /mnt/storage/etc/jive.version
fi
# Mount overlay filesystem
_______________________________________________
Jive-checkins mailing list
[email protected]
http://lists.slimdevices.com/cgi-bin/mailman/listinfo/jive-checkins
