base-files: make use of new fstools

Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 40416

diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done
index 5565fbf13e7007729b7744a3fa67e13f29a14603..b254aff31501dc8ad31063cc8b1495994eedf106 100755 (executable)
--- a/package/base-files/files/etc/init.d/done
+++ b/package/base-files/files/etc/init.d/done
@@ -3,7 +3,7 @@
 
 START=95
 boot() {
-       [ -d /tmp/root ] && fs-state done
+       [ -d /tmp/root ] && mount_root done
 
        # process user commands
        [ -f /etc/rc.local ] && {

diff --git a/package/base-files/files/lib/preinit/80_mount_root b/package/base-files/files/lib/preinit/80_mount_root
index 40c5146c58eae7655f7e2f24d2c53bd5f8c3cb6b..0292d82d4abe9c4451f1932e2581425a040109e6 100644 (file)
--- a/package/base-files/files/lib/preinit/80_mount_root
+++ b/package/base-files/files/lib/preinit/80_mount_root
@@ -3,7 +3,7 @@
 # Copyright (C) 2010 Vertical Communications
 
 do_mount_root() {
-       fs-state start
+       mount_root
        boot_run_hook preinit_mount_root
        [ -f /sysupgrade.tgz ] && {
                echo "- config restore -"

diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 2963c37b65f05ae7b1b028cd92f25d6087b6ec18..207eae094857ca1929a3176778d40722469ee5c0 100644 (file)
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -58,8 +58,9 @@ run_ramfs() { # <command> [...]
                /bin/cut /usr/bin/printf /bin/sync
 
        install_bin /sbin/mtd
-       install_bin /sbin/fs-state
+       install_bin /sbin/mount_root
        install_bin /sbin/snapshot
+       install_bin /sbin/snapshot_tool
        install_bin /usr/sbin/ubiupdatevol
        install_bin /usr/sbin/ubiattach
        install_bin /usr/sbin/ubidetach