On Tue, 12 Apr 2011 00:16:37 -0300 Gerardo Exequiel Pozzi <[email protected]> wrote:
> Fixes FS#23610 > > Signed-off-by: Gerardo Exequiel Pozzi <[email protected]> > --- > .../overlay/etc/rc.d/functions.d/automated_script | 10 +++++----- > 1 files changed, 5 insertions(+), 5 deletions(-) > > diff --git > a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script > b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script > index 09f04b8..984a7fa 100644 > --- a/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script > +++ b/configs/syslinux-iso/overlay/etc/rc.d/functions.d/automated_script > @@ -1,18 +1,18 @@ > automated_script () > { > script="$(kernel_cmdline script)" > - if [ -n $script ] ; then > + if [[ "x$script" != "x" ]]; then say what? how about: if [ -n "$script" ]; then this also works (bashism): if [[ -n $script ]]; then > stat_busy "Configuring $script" > - if [[ $script =~ ^http:// || $script =~ ^ftp:// ]] ; then > + if [[ "$script" =~ "^http://"; || "$script" =~ "^ftp://"; ]]; then I think this change is not needed at all. > wget "$script" -q -O /tmp/startup_script >/dev/null > rt=$? > else > - cp $script /tmp/startup_script > + cp "$script" /tmp/startup_script > rt=$? > fi > - if [ $rt -eq 0 ] ; then > + if [ $rt -eq 0 ]; then > chmod +x /tmp/startup_script > - echo -e "\nif [ \`tty\` = \"/dev/tty1\" ] ; then\n > /tmp/startup_script\nfi\n" >> /root/.bash_profile > + echo -e '\nif [ $(tty) = "/dev/tty1" ]; then\n > /tmp/startup_script\nfi\n' >> /root/.bash_profile > stat_done > else > stat_fail looks good.
