From 1d5ac958504df256ed307af56b0bdf5113096bd2 Mon Sep 17 00:00:00 2001
From: John Crispin <john@openwrt.org>
Date: Mon, 7 Apr 2014 15:10:15 +0000
Subject: [PATCH] base-files: make use of new fstools
Signed-off-by: John Crispin <blogic@openwrt.org>
SVN-Revision: 40416
---
package/base-files/files/etc/init.d/done | 2 +-
package/base-files/files/lib/preinit/80_mount_root | 2 +-
package/base-files/files/lib/upgrade/common.sh | 3 ++-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done
index 5565fbf13e..b254aff315 100755
--- 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 40c5146c58..0292d82d4a 100644
--- 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 2963c37b65..207eae0948 100644
--- 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
--
2.25.1