Author: jdsn Date: Mon May 30 14:44:34 2011 New Revision: 64142 URL: http://svn.opensuse.org/viewcvs/yast?rev=64142&view=rev Log: fix proxy settings in automatic online update script, bnc#(678888) make online-update script more robust Modified: trunk/online-update-configuration/package/yast2-online-update-configuration.changes trunk/online-update-configuration/src/scripts/online_update Modified: trunk/online-update-configuration/package/yast2-online-update-configuration.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/package/yast2-online-update-configuration.changes?rev=64142&r1=64141&r2=64142&view=diff ============================================================================== --- trunk/online-update-configuration/package/yast2-online-update-configuration.changes (original) +++ trunk/online-update-configuration/package/yast2-online-update-configuration.changes Mon May 30 14:44:34 2011 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Fri Apr 8 15:56:56 CEST 2011 - jdsn@suse.de + +- fix proxy settings in automatic online update script, bnc#(678888) +- make online-update script more robust + +------------------------------------------------------------------- Mon Apr 26 16:57:22 2010 - jdsn@suse.de - initial version, split off from yast2-registration (fate#308494) Modified: trunk/online-update-configuration/src/scripts/online_update URL: http://svn.opensuse.org/viewcvs/yast/trunk/online-update-configuration/src/scripts/online_update?rev=64142&r1=64141&r2=64142&view=diff ============================================================================== --- trunk/online-update-configuration/src/scripts/online_update (original) +++ trunk/online-update-configuration/src/scripts/online_update Mon May 30 14:44:34 2011 @@ -1,5 +1,8 @@ #!/bin/bash +# source the profile to get proper proxy settings, bnc#(678888) +. /etc/profile.d/profile.sh + zyppercmd="/usr/bin/zypper" upcmd="/bin/false" syscfgfile="/etc/sysconfig/automatic_online_update" @@ -21,35 +24,27 @@ fi -if [ ! -z $AOU_ENABLE_CRONJOB ] +if [ ! "x$AOU_ENABLE_CRONJOB" = "xtrue" ] then - if [ ! $AOU_ENABLE_CRONJOB = "true" ] - then - echo "Online Update is disabled in ${syscfgfile}. Will not run update." - exit 0 - fi + echo "Online Update is disabled in ${syscfgfile}. Will not run update." + exit 0 fi -if [ ! -z $AOU_ENABLE_CRONJOB ] + +if [ "x${AOU_SKIP_INTERACTIVE_PATCHES}" = "xtrue" ] then - if [ ${AOU_SKIP_INTERACTIVE_PATCHES} = "true" ] - then - skipInteractive="--skip-interactive" - else - skipInteractive= - fi + skipInteractive="--skip-interactive" +else + skipInteractive= fi -if [ ! -z $AOU_ENABLE_CRONJOB ] +if [ "x${AOU_AUTO_AGREE_WITH_LICENSES}" = "xtrue" ] then - if [ ${AOU_AUTO_AGREE_WITH_LICENSES} = "true" ] - then - autoAgreeWithLicenses="--auto-agree-with-licenses" - else - autoAgreeWithLicenses= - fi + autoAgreeWithLicenses="--auto-agree-with-licenses" +else + autoAgreeWithLicenses= fi -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org