Inline…
> On Apr 23, 2017, at 6:06 PM, Matthias Schiffer
> <mschif...@universe-factory.net> wrote:
>
> We can reuse the kill_remaining and run_ramfs facilities of the stage2 run
> by upgraded.
>
> Signed-off-by: Matthias Schiffer <mschif...@universe-factory.net>
> ---
> package/system/fstools/Makefile | 2 +-
> package/system/fstools/files/snapshot | 16 +++++++++-------
> 2 files changed, 10 insertions(+), 8 deletions(-)
>
> diff --git a/package/system/fstools/Makefile b/package/system/fstools/Makefile
> index 759ea65978..db234aeecf 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 c1a5b733f3..a495e34345 100644
> --- a/package/system/fstools/files/snapshot
> +++ b/package/system/fstools/files/snapshot
> @@ -42,7 +42,7 @@ do_snapshot_upgrade() {
>
> opkg list-upgradable
> [ $? -eq 0 ] || exit 2
> -
> +
Same as above… please make your changeset the absolute smallest substantive set
of changes.
We can live with a tab on an otherwise empty line…
> UPDATES=`opkg list-upgradable | cut -d" " -f1`
> [ -z "${UPDATES}" ] && exit 0
>
> @@ -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)" ] && {
> --
> 2.12.2
>
>
> _______________________________________________
> Lede-dev mailing list
> Lede-dev@lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/lede-dev
_______________________________________________
Lede-dev mailing list
Lede-dev@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/lede-dev
