Didn't know about this... http://wiki.answers.com/Q/What_is_the_plural_of_firmware
ok for me On Wed, Jul 27, 2011 at 10:31 PM, Stuart Henderson <[email protected]> wrote: > ok? > > Index: distrib/miniroot/install.sub > =================================================================== > RCS file: /cvs/src/distrib/miniroot/install.sub,v > retrieving revision 1.647 > diff -u -p -r1.647 install.sub > --- distrib/miniroot/install.sub 14 Jul 2011 14:54:57 -0000 1.647 > +++ distrib/miniroot/install.sub 27 Jul 2011 20:29:51 -0000 > @@ -1643,12 +1643,12 @@ run_sysmerge() { > fi > } > > -update_firmwares() { > +update_firmware() { > local _get=Install > [[ $MODE == upgrade ]] && _get=Update > - ask_yn "$_get non-free firmwares on first boot?" no > + ask_yn "$_get non-free firmware on first boot?" no > [[ $resp == y ]] && \ > - echo "echo 'updating firmwares'; /usr/sbin/fw_update -v" \ > + echo "echo 'updating firmware'; /usr/sbin/fw_update -v" \ > >> /mnt/etc/rc.firsttime > } > > @@ -1991,7 +1991,7 @@ finish_up() { > > [[ "$MODE" == upgrade ]] && run_sysmerge > > - update_firmwares > + update_firmware > > # Pat on the back. > cat <<__EOT > Index: usr.sbin/fw_update/fw_update.sh > =================================================================== > RCS file: /cvs/src/usr.sbin/fw_update/fw_update.sh,v > retrieving revision 1.7 > diff -u -p -r1.7 fw_update.sh > --- usr.sbin/fw_update/fw_update.sh 27 Jul 2011 15:12:57 -0000 1.7 > +++ usr.sbin/fw_update/fw_update.sh 27 Jul 2011 20:29:51 -0000 > @@ -66,21 +66,21 @@ for driver in $DRIVERS; do > done > > if [ -z "$install$update" ]; then > - verbose "No devices found which need firmwares to be downloaded." > + verbose "No devices found which need firmware to be downloaded." > exit 0 > fi > > [ "$nop" ] || [ 0 = $(id -u) ] || > { echo "${0##*/} must be run as root" >&2; exit 1; } > > -# Install missing firmwares > +# Install missing firmware > if [ "$install" ]; then > - verbose "Installing firmwares:$install." > + verbose "Installing firmware:$install." > $PKG_ADD $nop $verbose $install > fi > > -# Update installed firmwares > +# Update installed firmware > if [ "$update" ]; then > - verbose "Updating firmwares:$update." > + verbose "Updating firmware:$update." > $PKG_ADD $nop $verbose -u $update > fi
