| Message ID | 1467577984-19167-1-git-send-email-mayosemmel@gmail.com |
|---|---|
| State | Accepted, archived |
| Commit | 06e72576d608d425ec84091333d942c1ebf834e3 |
| Headers | show |
diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile index ded9852..6c5dd43 100644 --- a/src/packages/fff/fff-sysupgrade/Makefile +++ b/src/packages/fff/fff-sysupgrade/Makefile @@ -1,8 +1,8 @@ include $(TOPDIR)/rules.mk PKG_NAME:=fff-sysupgrade -PKG_VERSION:=0.0.1 -PKG_RELEASE:=1 +PKG_VERSION:=0.0.2 +PKG_RELEASE:=2 PKG_BUILD_DIR:=$(BUILD_DIR)/fff-sysupgrade diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh index e6bc7d9..27e3874 100755 --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh @@ -34,6 +34,10 @@ echo -ne "Firmware found on server: $VERSION\n" if [ $VERSION -eq $FIRMWARE_VERSION ]; then echo -ne "The installed firmware version is already the current version.\n\n" + if [ "$1" = "--script" ]; then + exit 1 + fi + while true; do echo -ne "Do you want to reinstall the current version? [y/N]\n" read DO_UPDATE @@ -65,6 +69,10 @@ if [ $ret -ne 0 ]; then rm -f ${FILE}* exit 1 else + if [ "$1" = "--script" ]; then + echo -ne "\nStarting firmware upgrade. Don't touch me until I reboot.\n\n\n" + sysupgrade ${FILE} + fi while true; do read -p "sha256 sums correct. Should I start upgrading the firmware (y/N)? " yn case $yn in
On 07/03/2016 10:33 PM, Jan Kraus wrote: Hi Jan Danke fuer den Patch, dieser ist jetzt im Master: https://github.com/FreifunkFranken/firmware/commit/06e72576d608d425ec84091333d942c1ebf834e3 Gruss -Steffen > This makes automatic update via cron jobs possible. > > Signed-off-by: Jan Kraus <mayosemmel@gmail.com> > --- > Changes in v2: removed "break", which was accidential copied from switch..case. Also changed ";" to newline. > Changes in v3: added missing blank in if statements > --- > src/packages/fff/fff-sysupgrade/Makefile | 4 ++-- > src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 ++++++++ > 2 files changed, 10 insertions(+), 2 deletions(-) > > diff --git a/src/packages/fff/fff-sysupgrade/Makefile b/src/packages/fff/fff-sysupgrade/Makefile > index ded9852..6c5dd43 100644 > --- a/src/packages/fff/fff-sysupgrade/Makefile > +++ b/src/packages/fff/fff-sysupgrade/Makefile > @@ -1,8 +1,8 @@ > include $(TOPDIR)/rules.mk > > PKG_NAME:=fff-sysupgrade > -PKG_VERSION:=0.0.1 > -PKG_RELEASE:=1 > +PKG_VERSION:=0.0.2 > +PKG_RELEASE:=2 > > PKG_BUILD_DIR:=$(BUILD_DIR)/fff-sysupgrade > > diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > index e6bc7d9..27e3874 100755 > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > @@ -34,6 +34,10 @@ echo -ne "Firmware found on server: $VERSION\n" > if [ $VERSION -eq $FIRMWARE_VERSION ]; then > echo -ne "The installed firmware version is already the current version.\n\n" > > + if [ "$1" = "--script" ]; then > + exit 1 > + fi > + > while true; do > echo -ne "Do you want to reinstall the current version? [y/N]\n" > read DO_UPDATE > @@ -65,6 +69,10 @@ if [ $ret -ne 0 ]; then > rm -f ${FILE}* > exit 1 > else > + if [ "$1" = "--script" ]; then > + echo -ne "\nStarting firmware upgrade. Don't touch me until I reboot.\n\n\n" > + sysupgrade ${FILE} > + fi > while true; do > read -p "sha256 sums correct. Should I start upgrading the firmware (y/N)? " yn > case $yn in >
This makes automatic update via cron jobs possible. Signed-off-by: Jan Kraus <mayosemmel@gmail.com> --- Changes in v2: removed "break", which was accidential copied from switch..case. Also changed ";" to newline. Changes in v3: added missing blank in if statements --- src/packages/fff/fff-sysupgrade/Makefile | 4 ++-- src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-)