perfsonar development work

Author: psnc.lopatowski
Date: 2010-09-02 15:01:03 +0100 (Thu, 02 Sep 2010)
New Revision: 5743

Added:
   trunk/perfsonar-install-dvd/centos-5.5/packages.txt
   trunk/perfsonar-install-dvd/debian-5.0/packages.txt
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/04-ps-cron.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-backup.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-repos.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-startup.sh
Modified:
   trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
   trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
   trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0
   trunk/perfsonar-install-dvd/debian-5.0/preseed.cfg
   trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/01-ps-reps.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/02-ps-install-autorun.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-config.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-install.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/usb-mount.sh
   
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-packageslists/common.list
Log:


Modified: trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-08-27 
15:12:07 UTC (rev 5742)
+++ trunk/perfsonar-install-dvd/centos-5.5/desktop/postinstall0 2010-09-02 
14:01:03 UTC (rev 5743)
@@ -80,7 +80,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Authentication Service <<<"
        echo
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-as-1.3-0rc3.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-as-1.3-0rc5.noarch.rpm
        echo
 fi
 
@@ -96,7 +96,7 @@
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/rrdtool-devel-1.2.30-2.el5.wrl.i686.rpm
        rpm -ivh --nosignature /root/perfSONAR/rpms/rrdjtool-1.0-1.i386.rpm
        rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-rrd-ma-3.3-rc3.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-rrd-ma-3.3-rc4.noarch.rpm
        echo
 fi
 

Added: trunk/perfsonar-install-dvd/centos-5.5/packages.txt
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/packages.txt                       
  (rev 0)
+++ trunk/perfsonar-install-dvd/centos-5.5/packages.txt 2010-09-02 14:01:03 
UTC (rev 5743)
@@ -0,0 +1,49 @@
+bwctl-1.2a.tar.gz
+exist-1.2.6-1.noarch.rpm
+iperf-2.0.2.tar.gz
+java-1.6.0-sun-compat-1.6.0.06-1jpp.i586.rpm
+jdk-6u6-linux-i586-rpm.bin
+mrtg-2.16.2.tar.gz
+mysql-sqlma-dbsetup.sql
+owamp-3.0c.tar.gz
+perfsonar-clmp-2.1-1.noarch.rpm
+perfsonar-java-as-1.3-0rc5.noarch.rpm
+perfsonar-java-rrd-ma-3.3-rc4.noarch.rpm
+perfsonar-java-sshtelnet-mp-1.4-3rc2.noarch.rpm
+perfsonar-java-xml-ls-1.5-rc4.noarch.rpm
+perfsonar-mdm-unstable.repo
+perfsonar-oppd-0.52-rc1.noarch.rpm
+perfsonar-oppd-mp-bwctl-0.52-rc1.noarch.rpm
+perfsonar-perl-e2emon-mp-1.2-rc0.noarch.rpm
+perl-Authen-SASL-2.14-1.el5.pp.noarch.rpm
+perl-Config-General-2.40-1.el5.noarch.rpm
+perl-Email-Date-Format-1.002-4.el5.noarch.rpm
+perl-GSSAPI-0.26-1.el5.rf.i386.rpm
+perl-HTTP-Daemon-SSL-1.04-1.el5.rf.noarch.rpm
+perl-IO-Tty-1.07-2.el5.kb.i386.rpm
+perl-IPC-Run-0.80-3.el5.kb.noarch.rpm
+perl-IPC-Shareable-0.60-3.el5.noarch.rpm
+perl-Log-Dispatch-2.22-2.el5.pp.noarch.rpm
+perl-Mail-Sender-0.8.16-1.el5.rf.noarch.rpm
+perl-Mail-Sendmail-0.79-9.el5.1.noarch.rpm
+perl-MailTools-2.04-1.el5.rf.noarch.rpm
+perl-MIME-Lite-3.023-1.el5.rf.noarch.rpm
+perl-Net-Jabber-2.0-10.el5.noarch.rpm
+perl-Net-XMPP-1.02-1.el5.rf.noarch.rpm
+perl-NMWG-0.02-rc1.noarch.rpm
+perl-Params-Validate-0.91-1.el5.rf.i386.rpm
+perl-rrdtool-1.2.30-1.centos5.i386.rpm
+perl-SOAP-Lite-0.710.08-1.el5.rf.noarch.rpm
+perl-Sys-Syslog-0.27-2.el5.pp.i386.rpm
+perl-Time-modules-2003.1126-4.el5.1.noarch.rpm
+perl-version-0.76-1.el5.pp.i386.rpm
+perl-XML-DOM-1.44-2.el5.rf.noarch.rpm
+perl-XML-LibXML-1.66-1.el5.rf.i386.rpm
+perl-XML-LibXML-Common-0.13-8.2.2.i386.rpm
+perl-XML-Parser-2.36-3.el5.pp.i386.rpm
+perl-XML-RegExp-0.03-2.el5.noarch.rpm
+perl-XML-Stream-1.22-1.el5.pp.noarch.rpm
+rpmforge-release-0.5.1-1.el5.rf.i386.rpm
+rrdjtool-1.0-1.i386.rpm
+rrdtool-1.2.30-2.el5.wrl.i686.rpm
+rrdtool-devel-1.2.30-2.el5.wrl.i686.rpm

Modified: trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2010-08-27 
15:12:07 UTC (rev 5742)
+++ trunk/perfsonar-install-dvd/centos-5.5/server/postinstall0  2010-09-02 
14:01:03 UTC (rev 5743)
@@ -82,7 +82,7 @@
        exec >> $LOGFILE 2>&1
        echo ">>> Installing perfSONAR Authentication Service <<<"
        echo
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-as-1.3-0rc3.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-as-1.3-0rc5.noarch.rpm
        echo
 fi
 
@@ -98,7 +98,7 @@
        rpm -ivh --nosignature 
/root/perfSONAR/rpms/rrdtool-devel-1.2.30-2.el5.wrl.i686.rpm
        rpm -ivh --nosignature /root/perfSONAR/rpms/rrdjtool-1.0-1.i386.rpm
        rpm -ivh --nosignature /root/perfSONAR/rpms/exist-1.2.6-1.noarch.rpm
-       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-rrd-ma-3.3-rc3.noarch.rpm
+       rpm -ivh --nosignature 
/root/perfSONAR/rpms/perfsonar-java-rrd-ma-3.3-rc4.noarch.rpm
        echo
 fi
 

Modified: trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-08-27 
15:12:07 UTC (rev 5742)
+++ trunk/perfsonar-install-dvd/debian-5.0/desktop/postinstall0 2010-09-02 
14:01:03 UTC (rev 5743)
@@ -29,6 +29,9 @@
         choice=$?
 done
 
+dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
+       --yesno "\n      Use packages only from local repository?" 7 60
+
 select=$(cat /root/select.txt)
 
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
@@ -44,7 +47,10 @@
 echo
 echo ">>> Performing prerequisite operations <<<"
 echo
-echo ">>> Adding/Configuring perfSONAR repositories <<<"
+
+if [ $choice == 1 ]; then 
+echo ">>> Adding/Configuring perfSONAR online repositories <<<"
+echo ">>> Online repositories will be available during installation <<<"
 echo
 cd /etc/apt/sources.list.d
 wget -v http://downloads.perfsonar.eu/repositories/deb/perfsonar-stable.list
@@ -53,6 +59,8 @@
 apt-get clean
 apt-get update
 echo
+fi
+
 echo ">>> Configuring Iceweasel browser <<<"
 /root/perfSONAR/scripts/desktop/iceweaselconfig $select
 echo
@@ -172,6 +180,19 @@
        echo
 fi
 
+if [ $choice == 0 ]; then 
+echo ">>> Adding/Configuring perfSONAR online repositories <<<"
+echo ">>> after services installation <<<"
+echo
+cd /etc/apt/sources.list.d
+wget -v http://downloads.perfsonar.eu/repositories/deb/perfsonar-stable.list
+wget -v http://downloads.perfsonar.eu/repositories/perfsonar.asc
+apt-key add perfsonar.asc
+apt-get clean
+apt-get update
+echo
+fi
+
 rm -f /etc/rc2.d/S24postinstall0
 echo ">>> perfSONAR MDM 3.3 INSTALLATION FINISHED <<<"
 
@@ -179,4 +200,4 @@
 echo "Press [ENTER] to continue..."
 # read
 clear
-EOF
+

Added: trunk/perfsonar-install-dvd/debian-5.0/packages.txt
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/packages.txt                       
  (rev 0)
+++ trunk/perfsonar-install-dvd/debian-5.0/packages.txt 2010-09-02 14:01:03 
UTC (rev 5743)
@@ -0,0 +1,36 @@
+bwctl-1.3.tar.gz
+dbus_1.2.1-5+lenny1_i386.deb
+dbus-x11_1.2.1-5+lenny1_i386.deb
+exist_1.2.6-1_all.deb
+geant2-tomcat5.5-runscript_1.1-1_all.deb
+iperf_2.0.2-2_i386.deb
+jsvc_1.0.2~svn20061127-10_i386.deb
+libcommons-daemon-java_1.0.2~svn20061127-10_all.deb
+libconfig-general-perl_2.31-3_all.deb
+libcups2_1.3.8-1+lenny7_i386.deb
+libdbus-1-3_1.2.1-5+lenny1_i386.deb
+libexpat1_2.0.1-4+lenny1_i386.deb
+libhash-flatten-perl_1.16-2_all.deb
+libhtml-parser-perl_3.56-1+lenny1_i386.deb
+libhttp-daemon-ssl-perl_1.04-2_all.deb
+libipc-run-perl_0.80-2_all.deb
+libipc-shareable-perl_0.60-7_all.deb
+liblog-dispatch-perl_2.18-1_all.deb
+liblog-trace-perl_1.070-2_all.deb
+libnmwg-perl_0.02-0rc1_all.deb
+librrd2_1.2.15-0.3_i386.deb
+libtest-assertions-perl_1.054-2_all.deb
+libtiff4_3.8.2-11.2_i386.deb
+Packages.gz
+perfsonar-java-as_1.3-0rc5_all.deb
+perfsonar-java-rrd-ma_3.3rc4_all.deb
+perfsonar-java-sql-ma_2.2_all.deb
+perfsonar-java-sshtelnet-mp_1.4-0RC3_all.deb
+perfsonar-java-xml-ls_1.5-0rc4_all.deb
+perfsonar-oppd_0.52-0rc1_all.deb
+perfsonar-oppd-mp-bwctl_0.52-0rc1_all.deb
+perfsonar-perl-e2emon-mp_1.2-0rc0_all.deb
+rrdjtool-debian5_1.1-1_i386.deb
+sun-java6-bin_6-12-1_i386.deb
+sun-java6-jre_6-12-1_all.deb
+tomcat5.5_5.5.26-5_all.deb

Modified: trunk/perfsonar-install-dvd/debian-5.0/preseed.cfg
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/preseed.cfg  2010-08-27 15:12:07 
UTC (rev 5742)
+++ trunk/perfsonar-install-dvd/debian-5.0/preseed.cfg  2010-09-02 14:01:03 
UTC (rev 5743)
@@ -70,3 +70,4 @@
                                 in-target chmod +x 
/root/perfSONAR/scripts/server/chmysqlpass; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/server/lynxconfig; \
                                 in-target chmod +x 
/root/perfSONAR/scripts/server/lynxautorun;
+

Modified: trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0
===================================================================
--- trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2010-08-27 
15:12:07 UTC (rev 5742)
+++ trunk/perfsonar-install-dvd/debian-5.0/server/postinstall0  2010-09-02 
14:01:03 UTC (rev 5743)
@@ -29,6 +29,10 @@
        choice=$?
 done
 
+dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
+       --yesno "\n      Use packages only from local repository?" 7 60
+choice=$?
+
 select=$(cat /root/select.txt)
 
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
@@ -44,7 +48,10 @@
 echo
 echo ">>> Performing prerequisite operations <<<"
 echo
-echo ">>> Adding/Configuring perfSONAR repositories <<<"
+
+if [ $choice == 1 ]; then 
+echo ">>> Adding/Configuring perfSONAR online repositories <<<"
+echo ">>> Online repositories will be available during installation <<<"
 echo
 cd /etc/apt/sources.list.d
 wget -v http://downloads.perfsonar.eu/repositories/deb/perfsonar-stable.list
@@ -53,6 +60,8 @@
 apt-get clean
 apt-get update
 echo
+fi
+
 echo ">>> Configuring Lynx browser <<<"
 /root/perfSONAR/scripts/server/lynxconfig $select
 echo
@@ -177,6 +186,20 @@
        echo
 fi
 
+
+if [ $choice == 0 ]; then 
+echo ">>> Adding/Configuring perfSONAR online repositories <<<"
+echo ">>> after services installation <<<"
+echo
+cd /etc/apt/sources.list.d
+wget -v http://downloads.perfsonar.eu/repositories/deb/perfsonar-stable.list
+wget -v http://downloads.perfsonar.eu/repositories/perfsonar.asc
+apt-key add perfsonar.asc
+apt-get clean
+apt-get update
+echo
+fi
+
 rm -f /etc/rc2.d/S98postinstall0
 echo ">>> perfSONAR MDM 3.3 INSTALLATION FINISHED <<<"
 
@@ -184,4 +207,4 @@
 echo "Press [ENTER] to continue..."
 # read
 clear
-EOF
+

Modified: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/01-ps-reps.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/01-ps-reps.sh
     2010-08-27 15:12:07 UTC (rev 5742)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/01-ps-reps.sh
     2010-09-02 14:01:03 UTC (rev 5743)
@@ -1,9 +1,6 @@
 #!/bin/sh
-echo ">>> Adding/Configuring perfSONAR repositories <<<"
-cd /etc/apt/sources.list.d
-wget -v 
http://downloads.perfsonar.eu/repositories/deb/perfsonar-unstable.list
-wget -v http://downloads.perfsonar.eu/repositories/perfsonar.asc
-apt-key add perfsonar.asc
-apt-get clean
-apt-get update
-echo ">>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<"
\ No newline at end of file
+echo ">>> Configuring perfSONAR repositories <<<<<<<<<<<<<<<<"
+chmod a+x /root/ps-scripts/ps-repos.sh
+cp /root/ps-scripts/ps-repos.sh /etc/init.d/
+update-rc.d ps-repos.sh start 97 2 .
+echo ">>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"

Modified: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/02-ps-install-autorun.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/02-ps-install-autorun.sh
  2010-08-27 15:12:07 UTC (rev 5742)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/02-ps-install-autorun.sh
  2010-09-02 14:01:03 UTC (rev 5743)
@@ -1,15 +1,20 @@
 #!/bin/sh
+
+chmod a+x /root/ps-scripts/*
+
 echo ">>> Configuring usb storage mounting <<<<<<<<<<<<<<<<<<"
-chmod a+x /root/ps-scripts/usb-mount.sh
 cp /root/ps-scripts/usb-mount.sh /etc/init.d/
 update-rc.d usb-mount.sh start 97 2 .
+
 echo ">>> Configuring automatic perfSONAR Installation <<<<<<"
-chmod a+x /root/ps-scripts/ps-install.sh
 cp /root/ps-scripts/ps-install.sh /etc/init.d/
 update-rc.d ps-install.sh start 98 2 .
-chmod a+x /root/ps-scripts/ps-config.sh
 cp /root/ps-scripts/ps-config.sh /etc/init.d/
 update-rc.d ps-config.sh start 99 2 .
-echo ">>> Configuring Lynx autostart <<<<<<<<<<<<<<<<<<<<<<<<"
-chmod a+x /root/ps-scripts/*
+
+echo ">>> Configuring system startup operations <<<<<<<<<<<<<"
+cp /root/ps-scripts/ps-startup.sh /etc/init.d/
+update-rc.d ps-startup.sh start 99 2 .
+
 echo ">>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"
+

Added: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/04-ps-cron.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/04-ps-cron.sh
                             (rev 0)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/04-ps-cron.sh
     2010-09-02 14:01:03 UTC (rev 5743)
@@ -0,0 +1,4 @@
+#!/bin/sh
+echo ">>> Configuring usb storage mounting <<<<<<<<<<<<<<<<<<"
+echo "*/2 * * * * root /root/ps-scripts/ps-backup.sh" >> /etc/crontab
+echo ">>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<<<<"


Property changes on: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-hooks/04-ps-cron.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-backup.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-backup.sh
                           (rev 0)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-backup.sh
   2010-09-02 14:01:03 UTC (rev 5743)
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+date >> /mnt/storage/cron-test.txt
\ No newline at end of file

Modified: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-config.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-config.sh
   2010-08-27 15:12:07 UTC (rev 5742)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-config.sh
   2010-09-02 14:01:03 UTC (rev 5743)
@@ -1,8 +1,30 @@
 #!/bin/bash
 
+
+dialog --title "perfSONAR MDM 3.3.x services Installation" --backtitle 
"perfSONAR MDM 3.3.x Live Debian" \
+       --yesno "\nAutomatically load pS services state from USB storage?" 7 
60
+choice=$?
+
+LOGFILE=/root/ps-install.log
+exec 6>&1
+exec >> $LOGFILE 2>&1
+echo
+echo ">>> Configuring auto loading pS services status from USB storage <<<"
+
+if [[ $choice == 0 ]]; then
+       echo "Autoload: ON"
+       echo "<autoload>true</autoload>" >> /root/ps-config.xml
+fi
+if [[ $choice == 1 ]]; then
+       echo "Autoload: OFF"
+       echo "<autoload>false</autoload>" >> /root/ps-config.xml
+fi
+echo
+
+exec 1>&6 6>&-
 select=$(cat /root/select.txt)
 
-OPTIONS="\n       No additional password configuration is made."
+OPTIONS="\n       No additional password configuration is made"
 if [[ $select == *4* ]]; then
 OPTIONS="\nThis will change the passwords for the root and perfsonar_ma 
MySQL users."
 fi
@@ -14,7 +36,7 @@
 fi
 
 dialog --title "Passwords configuration" --backtitle "perfSONAR MDM 3.3 DVD 
for Debian 5" \
-       --msgbox "$OPTIONS" 8 60
+       --msgbox "$OPTIONS" 7 60
 
 PASSWD=pass1
 PASSWD2=pass2
@@ -48,7 +70,6 @@
 dialog --title "perfSONAR MDM 3.3 Installation" --backtitle "perfSONAR MDM 
3.3 DVD for Debian 5" \
        --infobox "\n             Configuration in progress ... \n\n          
   It may take several minutes." 7 60
 
-LOGFILE=/root/perfSONAR.log
 exec 6>&1
 exec >> $LOGFILE 2>&1
 
@@ -87,6 +108,4 @@
 
 sleep 2
 clear
-echo "Please log in as \"root\" (password: root)"
 
-

Modified: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-install.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-install.sh
  2010-08-27 15:12:07 UTC (rev 5742)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-install.sh
  2010-09-02 14:01:03 UTC (rev 5743)
@@ -27,7 +27,7 @@
        --infobox "\n             Installation in progress ... \n\n           
  It may take several minutes." 7 60
 
 
-LOGFILE=/root/perfSONAR.log
+LOGFILE=/root/ps-install.log
 exec 6>&1
 exec >> $LOGFILE 2>&1
 
@@ -37,7 +37,9 @@
 /root/ps-scripts/lynxconfig $select
 echo
 
+echo "<installed-services>" >> /root/ps-config.xml
 if [[ $select == *1* ]]; then
+       echo "<service>LS</service>" >> /root/ps-config.xml
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
                --infobox "\n            Installing Lookup Service ..." 5 60
@@ -50,6 +52,7 @@
 fi
 
 if [[ $select == *2* ]]; then
+       echo "<service>AS</service>" >> /root/ps-config.xml
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
                --infobox "\n          Installing Authentication Service ..." 
5 60
@@ -62,6 +65,7 @@
 fi
 
 if [[ $select == *3* ]]; then
+       echo "<service>RRD MA</service>" >> /root/ps-config.xml
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
                --infobox "\n                 Installing RRD MA ..." 5 60
@@ -74,6 +78,7 @@
 fi
 
 if [[ $select == *4* ]]; then
+       echo "<service>SQL MA</service>" >> /root/ps-config.xml
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
                --infobox "\n                 Installing SQL MA ..." 5 60
@@ -83,15 +88,16 @@
        echo
        apt-get -y install perfsonar-java-sql-ma
        echo
-# TODO
-#      echo "Creating mysql database ... "
-#      cp 
/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/mysql-sqlma-dbsetup.sql
 /root/perfSONAR/
-#      mysql -u root < /root/perfSONAR/mysql-sqlma-dbsetup.sql
-#      rm /root/perfSONAR/mysql-sqlma-dbsetup.sql
+
+       echo "Creating mysql database ... "
+       cp 
/usr/lib/perfsonar/services/geant2-java-sql-ma/WEB-INF/classes/perfsonar/conf/mysql-sqlma-dbsetup.sql
 /root
+       mysql -u root < /root/mysql-sqlma-dbsetup.sql
+       rm /root/mysql-sqlma-dbsetup.sql
        echo
 fi
 
 if [[ $select == *5* ]]; then
+       echo "<service>BWCTL MP</service>" >> /root/ps-config.xml
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
                --infobox "\n                Installing BWCTL MP ..." 5 60
@@ -122,6 +128,7 @@
 fi
 
 if [[ $select == *6* ]]; then
+       echo "<service>Telnet/SSH MP</service>" >> /root/ps-config.xml
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
                --infobox "\n              Installing Telnet/SSH MP ..." 5 60
@@ -135,6 +142,7 @@
 fi
 
 if [[ $select == *7* ]]; then
+       echo "<service>E2EMon MP</service>" >> /root/ps-config.xml
        exec 1>&6 6>&-
        dialog --title "perfSONAR MDM 3.3 Installation" --backtitle 
"perfSONAR MDM 3.3.x Live Debian" \
                --infobox "\n              Installing E2EMon MP ..." 5 60
@@ -145,6 +153,7 @@
        apt-get -y install perfsonar-perl-e2emon-mp
        echo
 fi
+echo "</installed-services>" >> /root/ps-config.xml
 
 echo ">>> perfSONAR MDM 3.3 INSTALLATION FINISHED <<<"
 
@@ -152,7 +161,7 @@
 echo ">>> perfSONAR MDM 3.3 INSTALLATION FINISHED <<<"
 
 echo
-echo "Press [ENTER] to continue..."
-read
+#echo "Press [ENTER] to continue..."
+#read
 clear
-EOF
+

Added: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-repos.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-repos.sh
                            (rev 0)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-repos.sh
    2010-09-02 14:01:03 UTC (rev 5743)
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+touch /root/select.txt
+
+dialog --title "perfSONAR MDM 3.3.x services Installation" --backtitle 
"perfSONAR MDM 3.3.x Live Debian" \
+       --radiolist "\nSelect perfSONAR repository:" 10 60 3 \
+       1 "stable" on \
+       2 "unstable" off \
+       2>/root/select.txt 
+
+LOGFILE=/root/ps-install.log
+exec 6>&1
+exec >> $LOGFILE 2>&1
+
+select=$(cat /root/select.txt)
+echo ">>> Configuring perfSONAR repository ... <<<"
+
+if [[ $select == 1 ]]; then
+       echo "Selected: stable"
+       echo
+       exec 1>&6 6>&-
+       dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
+               --infobox "\n     Configuring \"stable\" perfSONAR repository 
..." 5 60
+       exec 6>&1
+       exec >> $LOGFILE 2>&1
+       echo ">>> Configuring \"stable\" perfSONAR repository ... <<<"
+       echo
+       cd /etc/apt/sources.list.d
+       wget -v 
http://downloads.perfsonar.eu/repositories/deb/perfsonar-stable.list
+       wget -v http://downloads.perfsonar.eu/repositories/perfsonar.asc
+       apt-key add perfsonar.asc
+       apt-get clean
+       apt-get update
+       echo ">>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<"
+       echo
+fi
+
+if [[ $select == 2 ]]; then
+       echo "Selected: unstable"
+       echo
+       exec 1>&6 6>&-
+       dialog --title "perfSONAR MDM 3.3.x services Installation" 
--backtitle "perfSONAR MDM 3.3.x Live Debian" \
+               --infobox "\n    Configuring \"unstable\" perfSONAR 
repository ..." 5 60
+       exec 6>&1
+       exec >> $LOGFILE 2>&1
+       echo ">>> Configuring \"unstable\" perfSONAR repository ... <<<"
+       echo
+       cd /etc/apt/sources.list.d
+       wget -v 
http://downloads.perfsonar.eu/repositories/deb/perfsonar-unstable.list
+       wget -v http://downloads.perfsonar.eu/repositories/perfsonar.asc
+       apt-key add perfsonar.asc
+       apt-get clean
+       apt-get update
+       echo ">>>>>>>>>>>>>>>>>>>>>>>>><<<<<<<<<<<<<<<<<<<<<<<<<<<"
+       echo
+fi
+
+rm /root/select.txt
+
+

Added: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-startup.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-startup.sh
                          (rev 0)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/ps-startup.sh
  2010-09-02 14:01:03 UTC (rev 5743)
@@ -0,0 +1,46 @@
+#!/bin/bash
+
+#display information at startup
+
+echo "Please log in as \"root\" (password: root)"
+
+pendrive=$(sed -n 's|<pendrive>\(.*\)</pendrive>|\1|p' /root/ps-config.xml)
+services=$(sed -n 's|<service>\(.*\)</service>|\1|p' /root/ps-config.xml)
+if [[ $pendrive == "true" ]]; then
+       echo "USB Storage successfully mounted to /mnt/storage directory"
+       mkdir /mnt/storage/ps-storage 2>/dev/null
+       if [[ $services == *LS*  ]]; then
+               mkdir /mnt/storage/ps-storage/LS
+       fi
+       if [[ $services == *AS*  ]]; then
+               mkdir /mnt/storage/ps-storage/AS
+       fi
+       if [[ $services == *RRD*  ]]; then
+               mkdir /mnt/storage/ps-storage/RRD-MA
+       fi
+       if [[ $services == *SQL*  ]]; then
+               mkdir /mnt/storage/ps-storage/SQL-MA
+       fi
+       if [[ $services == *BWC*  ]]; then
+               mkdir /mnt/storage/ps-storage/BWCTL-MP
+       fi
+       if [[ $services == *SSH*  ]]; then
+               mkdir /mnt/storage/ps-storage/Telnet-SSH-MP
+       fi
+       if [[ $services == *E2E*  ]]; then
+               mkdir /mnt/storage/ps-storage/E2EMon-MP
+       fi
+fi
+if [[ $pendrive == "false" ]]; then
+       echo "No USB Storage available!" 
+       echo "perfSONAR services won't be able to save their status !!"
+fi
+
+autoload=$(sed -n 's|<autoload>\(.*\)</autoload>|\1|p' /root/ps-config.xml) 
+if [[ $autoload == "true" ]]; then
+       echo "pS services state restored from USB storage"
+fi
+if [[ $autoload == "false" ]]; then
+       echo "pS services state is not automatically restored" 
+fi
+

Modified: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/usb-mount.sh
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/usb-mount.sh
   2010-08-27 15:12:07 UTC (rev 5742)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-includes/root/ps-scripts/usb-mount.sh
   2010-09-02 14:01:03 UTC (rev 5743)
@@ -1,5 +1,14 @@
 #!/bin/bash
 
-apt-get -y install ntfs-3g
 mkdir /mnt/storage
-mount -t ntfs-3g /dev/sdb1 /mnt/storage -o force
\ No newline at end of file
+mount -t auto /dev/sdb1 /mnt/storage 2>/root/pendrive-info.temp
+error=$(cat /root/pendrive-info.temp)
+
+if [ -z $error ]; then
+       echo "<pendrive>true</pendrive>" >> /root/ps-config.xml
+else
+       echo "<pendrive>false</pendrive>" >> /root/ps-config.xml
+fi
+
+rm /root/pendrive-info.temp
+

Modified: 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-packageslists/common.list
===================================================================
--- 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-packageslists/common.list
       2010-08-27 15:12:07 UTC (rev 5742)
+++ 
trunk/perfsonar-install-dvd/debian-live/config/chroot_local-packageslists/common.list
       2010-09-02 14:01:03 UTC (rev 5743)
@@ -5,5 +5,6 @@
 expect
 dialog
 lynx
+ntfs-3g
 
 ######################