lilalo

diff lm-install @ 32:4d252e7dd478

l3-frontend:
Добавлена поддержка фильтрации по пользователю (user) и хосту (hostname).
Пока только прототип - нужно оптимизировать.
И нужно стандартизировать имена для полей

l3-cgi:
В current теперь могут быть подразделы
author devi
date Mon Nov 14 07:42:57 2005 +0200 (2005-11-14)
parents 098664cf339c
children 34f3ce44c365
line diff
     1.1 --- a/lm-install	Mon Nov 07 11:24:49 2005 +0200
     1.2 +++ b/lm-install	Mon Nov 14 07:42:57 2005 +0200
     1.3 @@ -39,13 +39,9 @@
     1.4  		| sed '/LabMaker:START/,/LabMaker:END/ d' \
     1.5  		> $temp_file
     1.6  	cat <<'LM_bash_profile' >> $temp_file
     1.7 -	# LabMaker:START
     1.8 -	#LMHOME=~/.labmaker
     1.9 -	#mkdir -p ${LMHOME}
    1.10 -	#TTY=`tty`
    1.11 -	#flush="-f"
    1.12 -	#exec script $flush -q $LMHOME/${TTY##*/}-$$.script
    1.13 -	# LabMaker:END
    1.14 +# LabMaker:START
    1.15 +/usr/local/bin/l3-agent
    1.16 +# LabMaker:END
    1.17  LM_bash_profile
    1.18  	cat $temp_file > $profile
    1.19  	rm $temp_file
    1.20 @@ -69,7 +65,7 @@
    1.21  		> $temp_file
    1.22  	cat <<'LM_bash_profile' >> $temp_file
    1.23  # LabMaker:START
    1.24 -LMHOME=~/.labmaker
    1.25 +LMHOME=~/.lilalo
    1.26  mkdir -p ${LMHOME}
    1.27  
    1.28  uname -a | grep -qi bsd && bsd=yes
    1.29 @@ -100,7 +96,7 @@
    1.30  
    1.31  	cat <<INFO > $LMHOME/${session_id}.info
    1.32  <session>
    1.33 -<session_id>$session_id</session_id>
    1.34 +<local_session_id>$session_id</local_session_id>
    1.35  <hostname>$hostname</hostname>
    1.36  <user>$USER</user>
    1.37  <login_from>$login_from</login_from>
    1.38 @@ -139,7 +135,7 @@
    1.39  cat <<'editor_wrapper' | sed "s@EDITOR@$editor@" > $editor
    1.40  #!/bin/sh
    1.41  
    1.42 -LMHOME=~/.labmaker
    1.43 +LMHOME=~/.lilalo
    1.44  if [ "${1#-}" = "$1" -a -d "$LMHOME" ]
    1.45  then
    1.46  	LAB=`cat $LMHOME/lab`
    1.47 @@ -192,9 +188,9 @@
    1.48  		# fix this!
    1.49  		user=${home%/} 
    1.50  		user=${user##*/}
    1.51 -		mkdir -p $home/.labmaker
    1.52 -		echo $first_lab > $home/.labmaker/lab
    1.53 -		chown -R $user $home/.labmaker
    1.54 +		mkdir -p $home/.lilalo
    1.55 +		echo $first_lab > $home/.lilalo/lab
    1.56 +		chown -R $user $home/.lilalo
    1.57  
    1.58  		#if [ ! -e $home/.bash_profile ] 
    1.59  		#then
    1.60 @@ -229,9 +225,9 @@
    1.61  	for user in $users_to_install
    1.62  	do 
    1.63  		home=$user		
    1.64 -		mkdir -p $home/.labmaker
    1.65 -		echo $first_lab > $home/.labmaker/lab
    1.66 -		chown -R ${user##*/} $home/.labmaker
    1.67 +		mkdir -p $home/.lilalo
    1.68 +		echo $first_lab > $home/.lilalo/lab
    1.69 +		chown -R ${user##*/} $home/.lilalo
    1.70  
    1.71  		#if [ ! -e $home/.bash_profile ] 
    1.72  		#then