diff options
| author | John Crispin <blogic@openwrt.org> | 2014-04-07 15:10:15 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2014-04-07 15:10:15 +0000 |
| commit | 1a579e57fe608e50edae8db5d71e68f1dc99cbfd (patch) | |
| tree | 800ec29854b2e5d190c1d6da64d59d1f2f3f31fc | |
| parent | 43562719f08fc80a1596da0af297345a754e025d (diff) | |
| download | master-187ad058-1a579e57fe608e50edae8db5d71e68f1dc99cbfd.tar.gz master-187ad058-1a579e57fe608e50edae8db5d71e68f1dc99cbfd.tar.bz2 master-187ad058-1a579e57fe608e50edae8db5d71e68f1dc99cbfd.zip | |
base-files: make use of new fstools
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@40416 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rwxr-xr-x | package/base-files/files/etc/init.d/done | 2 | ||||
| -rw-r--r-- | package/base-files/files/lib/preinit/80_mount_root | 2 | ||||
| -rw-r--r-- | 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 |