a8f5051104
783465d783 odhcpd: don't enable server mode on non-static lan port c92c1894a5 odhcpd: backport fixes from master branch (FS#402, FS#524) 4b4a4af814 dnsmasq: bump to v2.78 b8357e87d7 base-files: create /etc/config/ directory 3350137bd3 sunxi: clean up modules definitions a881323cb2 ltq-vdsl-mei: revert disable optimized firmware download f483a35f08 curl: fix security problems e232c6754d mbedtls: update to 2.6.0 CVE-2017-14032 37e1bd27d0 generic: drop 704-phy-no-genphy-soft-reset.patch 720b0e2e2d kernel: update 4.4 to 4.4.89 b428f45c06 ltq-vdsl-mei: disable optimized firmware download 39e5cd9556 ltq-vdsl: fix PM thread suspend and resume handling 86f0e8b091 openvpn: add "extra-certs" option af802bc687 lantiq: fix missing otg_cap on danube platform 12a0da6315 tcpdump: noop commit to refer CVEs fixed in 4.9.2 f66c6e1d8a tcpdump: bump to 4.9.2 a131f7cb69 utils/tcpdump: Rework URLs 7f1359c14e base-files: fix wan6 interface config generation for pppoe 97ebdf93a3 ipq806x: Archer C2600: fix switch ports numbering d33f7905df treewide: fix shellscript syntax errors/typos 4f162ac3ce ramips: fix hg255d LED status support
50 lines
1.5 KiB
Diff
50 lines
1.5 KiB
Diff
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 43febd4727b94bca1311987558b0363eb5319180..b73e8ad67da478d2b9b5fa7038d240372c618f97 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)" ] && {
|