| 12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849 |
- From: Matthias Schiffer <mschiffer@universe-factory.net>
- Date: Wed, 3 May 2017 08:29:55 +0200
- Subject: fstools: snapshot: handle jffs2 conversion using upgraded
- We can reuse the kill_remaining and run_ramfs facilities of the stage2 run
- by upgraded.
- Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
- diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
- index 28f68b57d6f82dd066410a577e84e32a3a54dc37..2789424c5f5fb50cc1f004d2ab5223a7fecbf53a 100644
- --- a/package/system/fstools/Makefile
- +++ b/package/system/fstools/Makefile
- @@ -8,7 +8,7 @@
- include $(TOPDIR)/rules.mk
-
- PKG_NAME:=fstools
- -PKG_RELEASE:=1
- +PKG_RELEASE:=2
-
- PKG_SOURCE_PROTO:=git
- PKG_SOURCE_URL=$(LEDE_GIT)/project/fstools.git
- diff --git a/package/system/fstools/files/snapshot b/package/system/fstools/files/snapshot
- index baf24f1e3e90fe7708e0f28c17ba270a35a2cd52..a495e3434523b7a4b1b2f1bc3f4c9298197fc745 100644
- --- a/package/system/fstools/files/snapshot
- +++ b/package/system/fstools/files/snapshot
- @@ -64,14 +64,16 @@ do_convert_jffs2() {
- do_convert() {
- . /lib/functions.sh
- . /lib/upgrade/common.sh
- - ubus call system upgrade
- - touch /tmp/sysupgrade
- +
- cd /overlay/upper
- tar czf /tmp/snapshot.tar.gz *
- - kill_remaining TERM
- - sleep 3
- - kill_remaining KILL
- - run_ramfs '. /sbin/snapshot; do_convert_jffs2'
- +
- + install_bin /sbin/upgraded
- + ubus call system sysupgrade "{
- + \"prefix\": \"$RAM_ROOT\",
- + \"path\": \"\",
- + \"command\": \". /sbin/snapshot; do_convert_jffs2\"
- + }"
- }
-
- [ -n "$(cat /proc/mounts|grep /overlay|grep jffs2)" ] && {
|
