diff options
| author | John Crispin | 2024-11-05 08:40:24 +0000 |
|---|---|---|
| committer | John Crispin | 2024-12-02 13:43:09 +0000 |
| commit | 83491965715eea103c9386494e2643ba644ad248 (patch) | |
| tree | 517a38f67bf163f4632c11b4332645568b7740fe | |
| parent | 5c12fe45b98d9edab88b580b23dbe3528b025fd5 (diff) | |
| download | openwrt-83491965715eea103c9386494e2643ba644ad248.tar.gz | |
fstools: update to latest HEAD
Rename jffs2reset to factoryreset. Convert all scripts to using the new command
line. Print a deprecation notice when jffs2reset is invoked.
49d36ba jffs2reset: rename to factoryreset
b135064 jffs2reset: print deprecation message
Signed-off-by: John Crispin <john@phrozen.org>
| -rwxr-xr-x | package/base-files/files/etc/rc.button/reset | 2 | ||||
| -rwxr-xr-x | package/base-files/files/sbin/firstboot | 2 | ||||
| -rw-r--r-- | package/system/fstools/Makefile | 11 |
3 files changed, 8 insertions, 7 deletions
diff --git a/package/base-files/files/etc/rc.button/reset b/package/base-files/files/etc/rc.button/reset index 2403122ad2..8465133471 100755 --- a/package/base-files/files/etc/rc.button/reset +++ b/package/base-files/files/etc/rc.button/reset @@ -23,7 +23,7 @@ released) elif [ "$SEEN" -ge 5 -a -n "$OVERLAY" ] then echo "FACTORY RESET" > /dev/console - jffs2reset -y && reboot & + factoryreset -y && reboot & fi ;; esac diff --git a/package/base-files/files/sbin/firstboot b/package/base-files/files/sbin/firstboot index d9af57d596..3dd6f1e7d2 100755 --- a/package/base-files/files/sbin/firstboot +++ b/package/base-files/files/sbin/firstboot @@ -1,3 +1,3 @@ #!/bin/sh -/sbin/jffs2reset $@ +/sbin/factoryreset $@ diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile index 419cdfff9a..2f30915bf9 100644 --- a/package/system/fstools/Makefile +++ b/package/system/fstools/Makefile @@ -12,9 +12,9 @@ PKG_RELEASE:=1 PKG_SOURCE_PROTO:=git PKG_SOURCE_URL=$(PROJECT_GIT)/project/fstools.git -PKG_MIRROR_HASH:=5f04ce2b346d9a48468180dd9601ca0fcc83896ebf5466855578e766646e14a1 -PKG_SOURCE_DATE:=2024-07-14 -PKG_SOURCE_VERSION:=408c2cc48e6694446c89da7f8121b399063e1067 +PKG_MIRROR_HASH:=b0de38a758cccdb234d909eda3bf4de40d260f75000f27d30e7d1bc4158b1094 +PKG_SOURCE_DATE:=2024-12-02 +PKG_SOURCE_VERSION:=49d36ba2d1ada4ca177612cfbe904beb286dcab7 CMAKE_INSTALL:=1 PKG_LICENSE:=GPL-2.0 @@ -95,9 +95,10 @@ endef define Package/fstools/install $(INSTALL_DIR) $(1)/sbin $(1)/lib - $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,jffs2reset} $(1)/sbin/ + $(INSTALL_BIN) $(PKG_INSTALL_DIR)/usr/sbin/{mount_root,factoryreset} $(1)/sbin/ $(INSTALL_DATA) $(PKG_INSTALL_DIR)/usr/lib/libfstools.so $(1)/lib/ - $(LN) jffs2reset $(1)/sbin/jffs2mark + $(LN) factoryreset $(1)/sbin/jffs2mark + $(LN) factoryreset $(1)/sbin/jffs2reset endef define Package/snapshot-tool/install |