lilalo
changeset 65:b7a217f8e963
Небольшие исправления
author | devi |
---|---|
date | Fri Jan 27 09:53:10 2006 +0200 (2006-01-27) |
parents | 3326053f9b23 |
children | 563e3ee69ce8 |
files | l3-agent l3scripts lm-install |
line diff
1.1 --- a/l3-agent Fri Jan 27 09:04:44 2006 +0200 1.2 +++ b/l3-agent Fri Jan 27 09:53:10 2006 +0200 1.3 @@ -545,7 +545,7 @@ 1.4 err 1.5 last_command 1.6 )) { 1.7 - next unless $cl->{"$element"}; 1.8 + next unless defined($cl->{"$element"}); 1.9 print OUT "<$element>".$cl->{$element}."</$element>\n"; 1.10 } 1.11 for my $element (qw( 1.12 @@ -554,7 +554,7 @@ 1.13 note 1.14 note_title 1.15 )) { 1.16 - next unless $cl->{"$element"}; 1.17 + next unless defined($cl->{"$element"}); 1.18 print OUT "<$element>"; 1.19 printq(\*OUT,$cl->{"$element"}); 1.20 print OUT "</$element>\n"; 1.21 @@ -670,7 +670,7 @@ 1.22 load_diff_files($lab_log); 1.23 } 1.24 load_command_lines($Config{"input"}, $Config{"input_mask"}); 1.25 - sort_command_lines; 1.26 + #sort_command_lines; 1.27 #process_command_lines; 1.28 print_command_lines($Config{"cache"}); 1.29 } 1.30 @@ -729,8 +729,8 @@ 1.31 load_cache_stat(); 1.32 load_command_lines($Config{"input"}, $Config{"input_mask"}); 1.33 if (@Command_Lines) { 1.34 - sort_command_lines; 1.35 - process_command_lines; 1.36 + #sort_command_lines; 1.37 + #process_command_lines; 1.38 print_command_lines($Config{"cache"}); 1.39 } 1.40 save_cache_stat();
2.1 --- a/l3scripts Fri Jan 27 09:04:44 2006 +0200 2.2 +++ b/l3scripts Fri Jan 27 09:53:10 2006 +0200 2.3 @@ -1,5 +1,6 @@ 2.4 ###install 2.5 -cat $sshkey | $lmssh $ssh_user@$host /bin/sh -c '"mkdir -p ~/.ssh; cat >>~/.ssh/authorized_keys; chmod 600 ~/.ssh/authorized_keys"' 2.6 +$lmssh $ssh_user@$host /bin/sh -c '"mkdir -p ~/.ssh"' 2.7 +cat $sshkey | $lmssh $ssh_user@$host /bin/sh -c '"cat >>~/.ssh/authorized_keys; chmod 600 ~/.ssh/authorized_keys"' 2.8 2.9 ###install-lm 2.10 cat $lminstall | ssh $ssh_user@$host /bin/sh -s $dirs 2.11 @@ -8,7 +9,7 @@ 2.12 ###install-pm 2.13 scp PM/* $ssh_user@$host:/tmp 2.14 ssh $ssh_user@$host 'cd /tmp; tar xfz Term-VT102*.gz; cd Term-VT102*[^z]; perl Makefile.PL; make ; make install' 2.15 -#ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install' 2.16 +ssh $ssh_user@$host 'cd /tmp; tar xfz Text-Iconv*.gz; cd Text-Iconv*[^z]; perl Makefile.PL; make ; make install' 2.17 2.18 ###copy-lablogs 2.19 for i in $dirs
3.1 --- a/lm-install Fri Jan 27 09:04:44 2006 +0200 3.2 +++ b/lm-install Fri Jan 27 09:53:10 2006 +0200 3.3 @@ -35,14 +35,14 @@ 3.4 install_to_profile() 3.5 { 3.6 profile=$1 3.7 - cat $profile \ 3.8 - | sed '/LabMaker:START/,/LabMaker:END/ d' \ 3.9 - > $temp_file 3.10 - cat <<'LM_bash_profile' >> $temp_file 3.11 + cat <<'LM_bash_profile' > $temp_file 3.12 # LabMaker:START 3.13 /usr/local/bin/l3-agent 3.14 # LabMaker:END 3.15 LM_bash_profile 3.16 + cat $profile \ 3.17 + | sed '/LabMaker:START/,/LabMaker:END/ d' \ 3.18 + >> $temp_file 3.19 cat $temp_file > $profile 3.20 rm $temp_file 3.21 } 3.22 @@ -100,6 +100,7 @@ 3.23 <local_session_id>$session_id</local_session_id> 3.24 <hostname>$hostname</hostname> 3.25 <user>$USER</user> 3.26 +<uid>$UID</uid> 3.27 <login_from>$login_from</login_from> 3.28 <tty>$tty</tty> 3.29 <system>$system</system>