| Message ID | 1498984901-3769-1-git-send-email-tim@tn-x.org |
|---|---|
| State | Accepted |
| Headers | show |
diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh index 942573c..1680378 100755 --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh @@ -54,10 +54,10 @@ if [ $VERSION -eq $FIRMWARE_VERSION ]; then echo -ne "Do you want to reinstall the current version? [y/N]\n" read DO_UPDATE case $DO_UPDATE in - [yY]) + [yY]*|[Jj]*) break ;; - [nN] | "") + [nN]*|"") exit 1 ;; *) @@ -92,8 +92,8 @@ else while true; do read -p "sha256 sums correct. Should I start upgrading the firmware (y/N)? " yn case $yn in - [Yy] ) echo -ne "\nStarting firmware upgrade. Don't touch me until I reboot.\n\n\n"; sysupgrade ${FILE}; break;; - [Nn]|* ) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; exit 0;; + [Yy]*|[Jj]*) echo -ne "\nStarting firmware upgrade. Don't touch me until I reboot.\n\n\n"; sysupgrade ${FILE}; break;; + *) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; exit 0;; esac done fi
Reviewed-by: Adrian Schmutzler <freifunk@adrianschmutzler.de> > -----Original Message----- > From: franken-dev [mailto:franken-dev-bounces@freifunk.net] On Behalf > Of Tim Niemeyer > Sent: Sonntag, 2. Juli 2017 10:42 > To: franken-dev@freifunk.net > Subject: [PATCH 1/2] fff-sysupgrade: Security question with yes/no > > Fixes: #31 > > Changes from Bjoerns ticket. Thanks. > > CC: freifunk@bjoernengel.de > Signed-off-by: Tim Niemeyer <tim@tn-x.org> > --- > > src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > index 942573c..1680378 100755 > --- a/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > +++ b/src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh > @@ -54,10 +54,10 @@ if [ $VERSION -eq $FIRMWARE_VERSION ]; then > echo -ne "Do you want to reinstall the current version? [y/N]\n" > read DO_UPDATE > case $DO_UPDATE in > - [yY]) > + [yY]*|[Jj]*) > break > ;; > - [nN] | "") > + [nN]*|"") > exit 1 > ;; > *) > @@ -92,8 +92,8 @@ else > while true; do > read -p "sha256 sums correct. Should I start upgrading the firmware (y/N)? > " yn > case $yn in > - [Yy] ) echo -ne "\nStarting firmware upgrade. Don't touch me until I > reboot.\n\n\n"; sysupgrade ${FILE}; break;; > - [Nn]|* ) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; > exit 0;; > + [Yy]*|[Jj]*) echo -ne "\nStarting firmware upgrade. Don't touch me > until I reboot.\n\n\n"; sysupgrade ${FILE}; break;; > + *) echo -ne "\nAborting firmware upgrade.\n\n"; rm -f ${FILE}*; exit 0;; > esac > done > fi > -- > 2.1.4 > > -- > franken-dev mailing list > franken-dev@freifunk.net > http://lists.freifunk.net/mailman/listinfo/franken-dev-freifunk.net
Fixes: #31 Changes from Bjoerns ticket. Thanks. CC: freifunk@bjoernengel.de Signed-off-by: Tim Niemeyer <tim@tn-x.org> --- src/packages/fff/fff-sysupgrade/files/etc/sysupgrade.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)