updater: don't use pakfire function for untar.

This updater should now work also with older testreleases of IPFire 2.13.

diff --git a/config/rootfiles/core/65/filelists/files b/config/rootfiles/core/65/filelists/files
index 97f63a23296b10dcd8b9fa10d35f1c2e2217f7d7..bcccb2bf5d5b5c9ef726ff7321a3909fd7f223b2 100644 (file)
--- a/config/rootfiles/core/65/filelists/files
+++ b/config/rootfiles/core/65/filelists/files
@@ -17,6 +17,8 @@ etc/rc.d/init.d/udev
 etc/rc.d/init.d/udev_retry
 etc/rc.d/rc0.d/K47setclock
 etc/rc.d/rc6.d/K47setclock
+opt/pakfire/db/core/mine
+opt/pakfire/lib/functions.sh
 srv/web/ipfire/cgi-bin/credits.cgi
 srv/web/ipfire/cgi-bin/ids.cgi
 srv/web/ipfire/cgi-bin/qos.cgi

diff --git a/config/rootfiles/core/65/update.sh b/config/rootfiles/core/65/update.sh
index 024920d0d720d77cf55bee2184724bbb40951a09..904287b4ec17ac3990c983b5ecec823107694cd5 100644 (file)
--- a/config/rootfiles/core/65/update.sh
+++ b/config/rootfiles/core/65/update.sh
@@ -43,16 +43,10 @@ done
 
 #
 # Do some sanity checks.
-
-if [ "$(grep " xavf " /opt/pakfire/lib/functions.sh)" == "" ]; then
-       /usr/bin/logger -p syslog.emerg -t core-upgrade-$core \
-               "ERROR: this update need a newer pakfire version (core64)."
-       exit 1
-fi
 if [ ! "$(mount | grep " reiser4 (")" == "" ]; then
        /usr/bin/logger -p syslog.emerg -t core-upgrade-$core \
                "ERROR: cannot update because there is a reiser4 fs mounted."
-       exit 2
+       exit 1
 fi
 
 #
@@ -143,7 +137,7 @@ rm -rf /lib/libncurses*
 
 #
 #Extract files
-extract_files
+tar xavf /opt/pakfire/tmp/files* --no-overwrite-dir -p --numeric-owner -C /
 
 #
 # Start services