Commit 41a1f238 authored by Mike Hibler's avatar Mike Hibler

Fix problems shown while setting up elabinelab.

Be sure to configure the mfrisbeed startup script.
Make *-install self-loader fixup work even if patch already applied.
parent ede0034d
......@@ -2776,6 +2776,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/2.elvind.sh rc.d/3.plab.sh rc.d/2.dhcpd.sh rc.d/3.and.sh \
rc.d/3.elvin_gateway.sh rc.d/pelab.sh rc.d/capture.sh \
rc.d/3.mfrisbeed.sh rc.d/3.mfrisbeed-subboss.sh \
tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \
tools/pcapper/GNUmakefile tools/teachswitch/GNUmakefile \
tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \
......
......@@ -1006,6 +1006,7 @@ outfiles="$outfiles Makeconf GNUmakefile \
rc.d/GNUmakefile rc.d/2.mysql-server.sh rc.d/3.testbed.sh \
rc.d/2.elvind.sh rc.d/3.plab.sh rc.d/2.dhcpd.sh rc.d/3.and.sh \
rc.d/3.elvin_gateway.sh rc.d/pelab.sh rc.d/capture.sh \
rc.d/3.mfrisbeed.sh rc.d/3.mfrisbeed-subboss.sh \
tools/GNUmakefile rc.d/1.mysql-server.sh tools/svn/GNUmakefile \
tools/pcapper/GNUmakefile tools/teachswitch/GNUmakefile \
tools/webcamapplet/GNUmakefile tools/whol/GNUmakefile \
......
......@@ -2,7 +2,7 @@
#
# EMULAB-COPYRIGHT
# Copyright (c) 2003-2010 , 2011University of Utah and the Flux Group.
# Copyright (c) 2003-2010 , 2011, 2011University of Utah and the Flux Group.
# All rights reserved.
#
......@@ -723,6 +723,10 @@ Phase "patches", "Applying patches", sub {
Phase "perlselfloaderpatch", "Fixing perl self-loader", sub {
my $perldir = "/usr/local/lib/perl5/5.10.1";
DoneIfDoesntExist("$perldir/SelfLoader.pm");
my $ver = `fgrep 'our \$VERSION =' $perldir/SelfLoader.pm 2>/dev/null`;
if ($? == 0 && $ver =~ /1\.18/) {
PhaseSkip("Patch already applied");
}
ExecQuietFatal("$PATCH -d $perldir -i $SELFLOAD_PATCH");
};
};
......
......@@ -642,6 +642,10 @@ Phase "patches", "Applying patches", sub {
Phase "perlselfloaderpatch", "Fixing perl self-loader", sub {
my $perldir = "/usr/local/lib/perl5/5.10.1";
DoneIfDoesntExist("$perldir/SelfLoader.pm");
my $ver = `fgrep 'our \$VERSION =' $perldir/SelfLoader.pm 2>/dev/null`;
if ($? == 0 && $ver =~ /1\.18/) {
PhaseSkip("Patch already applied");
}
ExecQuietFatal("$PATCH -d $perldir -i $SELFLOAD_PATCH");
};
if ($MAILMANSUPPORT) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment