diff options
-rwxr-xr-x | etc/rc.conf_mount_ro | 1 | ||||
-rwxr-xr-x | etc/rc.conf_mount_rw | 1 | ||||
-rwxr-xr-x | etc/rc.firmware_auto | 24 |
3 files changed, 18 insertions, 8 deletions
diff --git a/etc/rc.conf_mount_ro b/etc/rc.conf_mount_ro index db6643a..a0d3092 100755 --- a/etc/rc.conf_mount_ro +++ b/etc/rc.conf_mount_ro @@ -30,7 +30,6 @@ */ require("config.inc"); -require("xmlparse_pkg.inc"); conf_mount_ro(); diff --git a/etc/rc.conf_mount_rw b/etc/rc.conf_mount_rw index 790e0e1..b9f72cd 100755 --- a/etc/rc.conf_mount_rw +++ b/etc/rc.conf_mount_rw @@ -30,7 +30,6 @@ */ require("config.inc"); -require("xmlparse_pkg.inc"); conf_mount_rw(); diff --git a/etc/rc.firmware_auto b/etc/rc.firmware_auto index 6ead7de..ad04ce5 100755 --- a/etc/rc.firmware_auto +++ b/etc/rc.firmware_auto @@ -23,8 +23,10 @@ fi #echo "Downloading $FMFILENAME.md5 from $FMBASEURL ..." | logger -p daemon.info -i -t AutoUpgrade #/usr/bin/fetch -o /tmp/latest.tgz.md5 $FETCHFILENAME.md5 | logger -p daemon.info -i -t AutoUpgrade -PMD=`/bin/cat /tmp/latest.tgz.md5 | cut -d" " -f4 `; -MD=`/sbin/md5 /tmp/latest.tgz | cut -d" " -f4`; +PMD=`/bin/cat /tmp/latest.tgz.md5 | cut -d" " -f4 ` +MD=`/sbin/md5 /tmp/latest.tgz | cut -d" " -f4` + +PLATFORM=`cat /etc/version` echo " Package MD5: ${PMD}" | logger -p daemon.info -i -t AutoUpgrade echo "Downloaded MD5: ${MD}" | logger -p daemon.info -i -t AutoUpgrade @@ -41,13 +43,23 @@ fi if [ "$PMD" = "$MD" ]; then echo "MD5's match." | logger -p daemon.info -i -t AutoUpgrade - /etc/rc.conf_mount_rw + if [ "$PLATFORM" = "net45xx" ]; then + /usr/local/bin/php /etc/rc.conf_mount_rw + fi + if [ "$PLATFORM" = "wrap" ]; then + /usr/local/bin/php /etc/rc.conf_mount_rw + fi if [ -r "/tmp/custom.tgz" ]; then - /etc/rc.firmware pfSenseupgrade /tmp/latest.tgz /tmp/custom.tgz + sh /etc/rc.firmware pfSenseupgrade /tmp/latest.tgz /tmp/custom.tgz else - /etc/rc.firmware pfSenseupgrade /tmp/latest.tgz + sh /etc/rc.firmware pfSenseupgrade /tmp/latest.tgz + fi + if [ "$PLATFORM" = "wrap" ]; then + /usr/local/bin/php /etc/rc.conf_mount_ro fi - /etc/rc.conf_mount_ro + if [ "$PLATFORM" = "net45xx" ]; then + /usr/local/bin/php /etc/rc.conf_mount_ro + fi exit 0 fi |