Merge branch '4.6.9'

This commit is contained in:
Tom Eastep 2015-05-13 14:57:53 -07:00
commit cccf6b4657
3 changed files with 34 additions and 34 deletions

View File

@ -320,7 +320,7 @@ sub generate_script_2() {
set_global_variables(1,1);
if ( $global_variables & NOT_RESTORE ) {
handle_optional_interfaces(0);
handle_optional_interfaces(1);
emit ';;';
pop_indent;
pop_indent;

View File

@ -1516,7 +1516,7 @@ EOF
" start_provider_$provider" );
}
emit ( ' elif [ -z $2 ]; then',
emit ( ' elif [ -z "$2" ]; then',
" startup_error \"Interface $providerref->{physical} is already enabled\"",
' fi',
' ;;'