Commit 1ec51476 authored by Russ Fish's avatar Russ Fish
Browse files

Move HOSTSFILE into liblocsetup for Windows.

parent 53d65f4a
......@@ -33,9 +33,7 @@ $| = 1;
BEGIN { require "/etc/emulab/paths.pm"; import emulabpaths; }
# Script specific goo
my $HOSTSFILE = "/etc/hosts";
my $DEFAULT = "$ETCDIR/hosts";
my $pathname = $HOSTSFILE;
#
# Load the OS independent support library. It will load the OS dependent
......@@ -46,6 +44,8 @@ use liblocsetup;
use libtmcc;
use librc;
my $pathname = $HOSTSFILE; # Default path from liblocsetup.
#
# Not all clients support this.
#
......
......@@ -13,7 +13,7 @@ package liblocsetup;
use Exporter;
@ISA = "Exporter";
@EXPORT =
qw ( $CP $EGREP $NFSMOUNT $UMOUNT $TMPASSWD $SFSSD $SFSCD $RPMCMD
qw ( $CP $EGREP $NFSMOUNT $UMOUNT $TMPASSWD $SFSSD $SFSCD $RPMCMD $HOSTSFILE
$LOOPBACKMOUNT
os_account_cleanup os_ifconfig_line os_etchosts_line
os_setup os_groupadd os_useradd os_userdel os_usermod os_mkdir
......@@ -59,6 +59,7 @@ $TMPASSWD = "$ETCDIR/master.passwd";
$SFSSD = "/usr/local/sbin/sfssd";
$SFSCD = "/usr/local/sbin/sfscd";
$RPMCMD = "/usr/local/bin/rpm";
$HOSTSFILE = "/etc/hosts";
#
# These are not exported
......
......@@ -12,7 +12,7 @@ package liblocsetup;
use Exporter;
@ISA = "Exporter";
@EXPORT =
qw ( $CP $EGREP $NFSMOUNT $UMOUNT $TMPASSWD $SFSSD $SFSCD $RPMCMD
qw ( $CP $EGREP $NFSMOUNT $UMOUNT $TMPASSWD $SFSSD $SFSCD $RPMCMD $HOSTSFILE
os_account_cleanup os_ifconfig_line os_etchosts_line
os_setup os_groupadd os_useradd os_userdel os_usermod os_mkdir
os_ifconfig_veth
......@@ -52,6 +52,7 @@ $TMPASSWD = "$ETCDIR/passwd";
$SFSSD = "/usr/local/sbin/sfssd";
$SFSCD = "/usr/local/sbin/sfscd";
$RPMCMD = "/bin/rpm";
$HOSTSFILE = "/etc/hosts";
#
# These are not exported
......
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