Skip to content
GitLab
Commit ac91d0f3 authored by Mike Hibler's avatar Mike Hibler
Browse files

Remove FreeBSD 6.x version of DHCP-on-all-interfaces setup

parent b228e982
Hide whitespace changes
Inline Side-by-side
tmcd/common/config/rc.mkelab
View file @ ac91d0f3
...@@ -419,6 +419,8 @@ sub SetupFsNode() ...@@ -419,6 +419,8 @@ sub SetupFsNode()
mysystem("rm -rf /usr/testbed/bin"); mysystem("rm -rf /usr/testbed/bin");
unlink("/etc/rc.conf.d/dhclient") unlink("/etc/rc.conf.d/dhclient")
if (-e "/etc/rc.conf.d/dhclient"); if (-e "/etc/rc.conf.d/dhclient");
unlink("/etc/rc.d/netif-emulab")
if (-e "/etc/rc.d/netif-emulab");
# XXX fer now: if not set, derive from the OPS info # XXX fer now: if not set, derive from the OPS info
if (!$emulabconfig{FS_PKG_DIR} || !$emulabconfig{FS_PKG}) { if (!$emulabconfig{FS_PKG_DIR} || !$emulabconfig{FS_PKG}) {
...@@ -737,6 +739,8 @@ sub SetupOpsNode($) ...@@ -737,6 +739,8 @@ sub SetupOpsNode($)
mysystem("rm -rf /usr/testbed/bin"); mysystem("rm -rf /usr/testbed/bin");
unlink("/etc/rc.conf.d/dhclient") unlink("/etc/rc.conf.d/dhclient")
if (-e "/etc/rc.conf.d/dhclient"); if (-e "/etc/rc.conf.d/dhclient");
unlink("/etc/rc.d/netif-emulab")
if (-e "/etc/rc.d/netif-emulab");
goto skippkg goto skippkg
if ($NOSETUP); if ($NOSETUP);
...@@ -1102,6 +1106,8 @@ sub SetupBossNode() ...@@ -1102,6 +1106,8 @@ sub SetupBossNode()
mysystem("rm -rf /usr/testbed/bin"); mysystem("rm -rf /usr/testbed/bin");
unlink("/etc/rc.conf.d/dhclient") unlink("/etc/rc.conf.d/dhclient")
if (-e "/etc/rc.conf.d/dhclient"); if (-e "/etc/rc.conf.d/dhclient");
unlink("/etc/rc.d/netif-emulab")
if (-e "/etc/rc.d/netif-emulab");
# #
# Create a bigger /var/db/mysql (before installing mysql!) # Create a bigger /var/db/mysql (before installing mysql!)
......
Supports Markdown
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