aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-03-12 19:32:51 +0000
committerJohn Crispin <john@openwrt.org>2014-03-12 19:32:51 +0000
commit0dc9d8d6ffcdbdfda2723676f6ffc825a48a18b7 (patch)
tree0e723f844a2516729ec4ce71273b0e4480d73107 /package/base-files/files
parent8411a5703f449a929623b7c41ba8b216685e8018 (diff)
downloadupstream-0dc9d8d6ffcdbdfda2723676f6ffc825a48a18b7.tar.gz
upstream-0dc9d8d6ffcdbdfda2723676f6ffc825a48a18b7.tar.bz2
upstream-0dc9d8d6ffcdbdfda2723676f6ffc825a48a18b7.zip
fstools: add the new fstools package
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 39895
Diffstat (limited to 'package/base-files/files')
-rwxr-xr-xpackage/base-files/files/etc/init.d/done6
-rw-r--r--package/base-files/files/lib/preinit/80_mount_root2
-rw-r--r--package/base-files/files/lib/upgrade/common.sh2
3 files changed, 4 insertions, 6 deletions
diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done
index 8040766dc2..5565fbf13e 100755
--- a/package/base-files/files/etc/init.d/done
+++ b/package/base-files/files/etc/init.d/done
@@ -3,11 +3,7 @@
START=95
boot() {
- [ -d /tmp/root ] && {
- lock /tmp/.switch2jffs
- switch2jffs
- lock -u /tmp/.switch2jffs
- }
+ [ -d /tmp/root ] && fs-state 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 0292d82d4a..40c5146c58 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() {
- mount_root
+ fs-state start
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 824a099801..e53e844d5e 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -57,6 +57,8 @@ run_ramfs() { # <command> [...]
/bin/sleep /bin/zcat /usr/bin/bzcat /usr/bin/printf /usr/bin/wc
install_bin /sbin/mtd
+ install_bin /sbin/fs-state
+ install_bin /sbin/snapshot
for file in $RAMFS_COPY_BIN; do
install_bin $file
done