Changeset 2608 in /cluster/svnroot


Ignore:
Timestamp:
Sep 1, 2010 9:36:28 PM (10 years ago)
Author:
skylar
Message:

backing out rough merge (#457)

Location:
bccd-ng/branches/skylar-devel
Files:
12 deleted
5 edited
1 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar-devel/bin/build_livecd.pl

    r2606 r2608  
    9292Readonly my $KERNREV    => "2.6.31.12-aufs";
    9393$ENV{'DEBIAN_FRONTEND'} = "noninteractive";
    94 Readonly my $PACKAGES   => "screen openssh-client openssh-server less make gcc-4.2 g++-4.2 flex bison gdb alien lsb-rpm bzip2 sudo yum debootstrap rsync dhcp3-server tcpdump syslinux syslinux-common subversion nfs-common nfs-kernel-server ncurses-base ncurses-bin libncurses5 libncurses5-dev psmisc vim iproute pciutils host bc ntp ntpdate debconf-utils dhcpcd xbase-clients libxt-dev lesstif2 lesstif2-dev ipcalc dialog lvm2 grub parted tzdata xserver-xorg-video-fbdev xfonts-100dpi xfonts-75dpi xfonts-scalable xserver-xorg-video-all fontconfig xfonts-base gpm udev vtwm aterm rxvt xbase-clients menu bbkeys libwww-mechanize-perl postgresql-client-common postgresql-client-8.3 libdbi-perl libdbd-pg-perl strace tcsh libnet-dhcp-perl libnetaddr-ip-perl libnet-ip-perl libstdc++5 pdnsd csh libterm-readkey-perl libsvn-perl libui-dialog-perl libreadonly-perl sshfs autofs libnet-dhcp-perl dnsutils libfile-touch-perl libnet-cidr-perl arping dosfstools gawk dc glutg3-dev libxi-dev wireless-tools snmp snmpd netpbm imagemagick libyaml-perl tcl8.4 libc6-i386 initramfs-tools linux-image-$KERNREV xvfb";
     94Readonly my $PACKAGES   => "screen openssh-client openssh-server less make gcc-4.2 g++-4.2 flex bison gdb alien lsb-rpm bzip2 sudo yum debootstrap rsync dhcp3-server tcpdump syslinux syslinux-common subversion nfs-common nfs-kernel-server ncurses-base ncurses-bin libncurses5 libncurses5-dev psmisc vim iproute pciutils host bc ntp ntpdate debconf-utils dhcpcd xbase-clients libxt-dev lesstif2 lesstif2-dev ipcalc dialog lvm2 grub parted tzdata xserver-xorg-video-fbdev xfonts-100dpi xfonts-75dpi xfonts-scalable xserver-xorg-video-all fontconfig xfonts-base gpm udev vtwm aterm rxvt xbase-clients menu bbkeys libwww-mechanize-perl postgresql-client-common postgresql-client-8.3 libdbi-perl libdbd-pg-perl strace tcsh libnet-dhcp-perl libnetaddr-ip-perl libnet-ip-perl libstdc++5 pdnsd csh libterm-readkey-perl libsvn-perl libui-dialog-perl libreadonly-perl sshfs autofs libnet-dhcp-perl dnsutils libfile-touch-perl libnet-cidr-perl arping dosfstools gawk dc glutg3-dev libxi-dev wireless-tools snmp snmpd netpbm imagemagick libyaml-perl tcl8.4 libc6-i386 initramfs-tools linux-image-$KERNREV xvfb libmime-lite-perl exim4"";
    9595Readonly my $EXTRA_PACKAGES => "fftw2 fftw-dev sfftw-dev sfftw2 automake1.7 console-tools libreadline5-dev hal libxmu-headers libxmu-dev gfortran ethtool libssl0.9.8 libblas-dev libblas-dev atlas3-base atlas3-base-dev atlas3-base refblas3 lapack3 atlas3-test libg2c0-dev libg2c0 apache2 iceweasel xpdf octave3.0 ruby sl robotfindskitten pvm xpvm emacs grac blender automake1.9 libtool libglu1-mesa-dev minicom lcd4linux insight joe grace libxpm-dev telnet lsof xresprobe fbset fluxbox xgalaga zenmap nedit eterm";
     96
    9697Readonly my $AMD64_PACKAGES => "libc6-dev-i386 ia32-libs";
    9798Readonly my $BAD_PACKAGES   => ""; # Packages that throw some fatal error during install but still work
     
    339340
    340341foreach my $file ( "bccd-networking", "bccd-passwd", "bccd-dhcp", "bccd-sshd", "bccd-nfs", "bccd-unite-sw",
    341           "bccd-nics", "bccd-dhcp-conf", "bccd-route", "bccd-keyboard", "bccd-fsrw" ) {
     342          "bccd-nics", "bccd-dhcp-conf", "bccd-route", "bccd-keyboard", "bccd-fsrw", ) {
    342343    $Bccd->run_test(
    343344        "chmod",
  • bccd-ng/branches/skylar-devel/trees/bin/bccd-syncdir

    r2599 r2608  
    7676sleep 2
    7777) |
    78 if test ! $NI; then
    7978dialog --gauge "Syncing directory $DIRECTORY across hosts in $MACHINEFILE.  Target directory: $COMMONDIR" 6 60 0
    80 fi
    8179
    8280pushd $PWD
  • bccd-ng/branches/skylar-devel/trees/bin/pkbcast

    r2600 r2608  
    2020        }
    2121
    22         until ( $sock = new IO::Socket::INET (
    23                         PeerPort => $BCAST_PORT,
    24                         PeerAddr => inet_ntoa(INADDR_BROADCAST),
    25                         LocalHost => $ip,
    26                         Proto => 'udp',
    27                         Broadcast => 1) ) {
    28                 syslog('err', "Could not create broadcast socket: %m");
    29                 sleep $BCAST_INTERVAL;
    30         }
     22        syslog('err', "Could not create broadcast socket: %m")
     23        until $sock = new IO::Socket::INET (
     24                PeerPort => $BCAST_PORT,
     25                PeerAddr => inet_ntoa(INADDR_BROADCAST),
     26                LocalHost => $ip,
     27                Proto => 'udp',
     28                Broadcast => 1);
    3129
    3230        $hostname .= "\r\n";
     
    5856
    5957### Main ###
     58$SIG{ALRM} = \&send_bcast;
     59alarm $BCAST_INTERVAL;
     60
    6061openlog("pkbcast", 'pid', 'user') or die "Could not establish connection to syslog";
    6162
     
    6970        my $list_sock;
    7071
    71         until ( $list_sock = new IO::Socket::INET (
    72                         LocalPort => $BCAST_PORT,
    73                         LocalHost => inet_ntoa(INADDR_ANY),
    74                         Proto => 'udp') ) {
    75                 syslog('err', "Could not create listen socket: %m");
    76                 sleep $BCAST_INTERVAL;
    77         }
    78 
    79         # Set alarm for broadcasting
    80         $SIG{ALRM} = \&send_bcast;
    81         alarm $BCAST_INTERVAL;
     72        syslog('err', "Could not create listen socket: %m")
     73        until $list_sock = new IO::Socket::INET (
     74                LocalPort => $BCAST_PORT,
     75                LocalHost => inet_ntoa(INADDR_ANY),
     76                Proto => 'udp');
    8277
    8378        # Won't return unless $list_sock unexpectedly closes,
  • bccd-ng/branches/skylar-devel/trees/usr/local/etc/modules/R/2.6.2

    r2599 r2608  
    22
    33prereq          modules
    4 #prereq         lam
     4prereq          lam
    55set             MOD_R              $env(BCCD_SW)/R
    66set      MOD_R_VERSION      2.6.2
  • bccd-ng/branches/skylar-devel/trees/usr/local/lib/site_perl/5.10.0/Bccd.pm

    r2600 r2608  
    513513        $self->leave_sub($sub);
    514514        return $rc;
    515 }
    516 
    517 sub test_read_yaml{
    518         my($self,$type,$okrc,$msg,$file) = @_;
    519         my $sub = 'test_read_yaml';
    520 
    521         $self->enter_sub($sub);
    522 
    523         if(! -f $file) {
    524                 $self->log_and_die("ERROR",$sub,"Cannot read in $file");
    525         }
    526 
    527         if($self->is_log($INFO) || $self->is_log($DEBUG)) {
    528                 $self->log_and_cont("INFO",$sub,"Reading in: $file");
    529         }
    530         my $y = LoadFile($file);
    531         if($self->is_log($INFO) || $self->is_log($DEBUG)) {
    532                 $self->log_and_cont("INFO",$sub,"Read in:".Dumper($y));
    533         }
    534 
    535         $self->leave_sub($sub);
    536         return $y;
    537 }
    538 
    539 sub test_mknods{
    540         my($self,$type,$okrc,$msg,$file,$base) = @_;
    541         my($rc,$out);
    542         my $sub = 'test_mknods';
    543 
    544         $self->enter_sub($sub);
    545 
    546         my $y = $self->test_read_yaml($type,$okrc,"Reading mknod configuration from $file.",$file);
    547         if(!defined($y)) {
    548                 $self->log_and_die("ERROR",$sub,"Can't proceeded with invalid configuration.");
    549         }
    550 
    551         foreach my $d (keys(%{$y})) {
    552                 my $cmd = "/bin/mknod $base/$d $y->{$d}->{type} $y->{$d}->{major} $y->{$d}->{minor}";
    553         if($self->is_log($INFO) || $self->is_log($DEBUG)) {
    554             $self->log_and_cont("INFO",$sub,"Running $cmd");
    555         }
    556 
    557                 ($rc,$out) = $self->exec_system($cmd);
    558                 if($rc) {
    559                         $self->log_and_die("$cmd failed with $rc, out $out");
    560                 }
    561         }
    562 
    563         $self->leave_sub($sub);
    564         return 0;
    565515}
    566516
Note: See TracChangeset for help on using the changeset viewer.