From 0dc9d8d6ffcdbdfda2723676f6ffc825a48a18b7 Mon Sep 17 00:00:00 2001 From: John Crispin Date: Wed, 12 Mar 2014 19:32:51 +0000 Subject: fstools: add the new fstools package Signed-off-by: John Crispin SVN-Revision: 39895 --- package/base-files/files/etc/init.d/done | 6 +----- package/base-files/files/lib/preinit/80_mount_root | 2 +- package/base-files/files/lib/upgrade/common.sh | 2 ++ 3 files changed, 4 insertions(+), 6 deletions(-) (limited to 'package/base-files/files') diff --git a/package/base-files/files/etc/init.d/done b/package/base-files/files/etc/init.d/done index 8040766..5565fbf 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 0292d82..40c5146 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 824a099..e53e844 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() { # [...] /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 -- cgit v1.1