Skip to content
GitLab
Menu
Projects
Groups
Snippets
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
emulab
emulab-devel
Commits
a5386a06
Commit
a5386a06
authored
Apr 06, 2015
by
Mike Hibler
Browse files
Forgot half of the previous client-side change for disabled interfaces.
parent
30cbf0df
Changes
3
Hide whitespace changes
Inline
Side-by-side
clientside/tmcc/freebsd/rc.frisbee
View file @
a5386a06
...
...
@@ -511,6 +511,8 @@ fixone() {
export
SLICEFIX_CONSOLE
=
`
getvar CONSOLE
"
$iline
"
unknown
`
export
SLICEFIX_BIOSDISK
=
`
getvar BIOSDISK
"
$iline
"
`
export
SLICEFIX_DOM0MEM
=
`
getvar DOM0MEM
"
$iline
"
unknown
`
export
SLICEFIX_DISABLEIF
=
`
getvar DISABLEIF
"
$iline
"
unknown
`
$BINDIR
/slicefix
$PART
$DISK
return
$?
}
...
...
clientside/tmcc/linux/rc.frisbee
View file @
a5386a06
...
...
@@ -457,6 +457,8 @@ fixone() {
export
SLICEFIX_CONSOLE
=
`
getvar CONSOLE
"
$iline
"
unknown
`
export
SLICEFIX_BIOSDISK
=
`
getvar BIOSDISK
"
$iline
"
`
export
SLICEFIX_DOM0MEM
=
`
getvar DOM0MEM
"
$iline
"
unknown
`
export
SLICEFIX_DISABLEIF
=
`
getvar DISABLEIF
"
$iline
"
unknown
`
$BINDIR
/slicefix
$PART
$DISK
return
$?
}
...
...
clientside/tmcc/linux/slicefix
View file @
a5386a06
#!/bin/sh
#
# Copyright (c) 2000-201
4
University of Utah and the Flux Group.
# Copyright (c) 2000-201
5
University of Utah and the Flux Group.
#
# {{{EMULAB-LICENSE
#
...
...
@@ -136,6 +136,22 @@ if [ -n "$BIOSDISK" ]; then
esac
fi
#
# See if we need to exclude the management interface.
# If an interface is specified and we can parse, create the "hint"
# line for loader.conf.
#
DISABLEIF
=
$SLICEFIX_DISABLEIF
DISABLEHINT
=
if
[
-n
"
$DISABLEIF
"
]
;
then
_str
=
`
echo
$DISABLEIF
|
sed
-E
-e
's/^([a-zA-Z0-9]*[a-zA-Z])([0-9]+)/hint.\1.\2.disabled/'
`
if
[
"
$_str
"
=
"
$DISABLEIF
"
]
;
then
echo
"WARNING: unparsable define name
\"
$DISABLEIF
\"
ignored"
else
DISABLEHINT
=
$_str
fi
fi
#
# Find out what our console should be:
# if $CONSOLE is set and valid, use that
...
...
@@ -320,6 +336,11 @@ dofreebsd() {
fixit
=
1
fi
# Disable mgmt interface?
if
[
-n
"
$DISABLEHINT
"
]
;
then
fixit
=
1
fi
# If our disk/part does not appear anywhere in fstab, we need to fix it
grep
"^/dev/
${
freebsd_disk
}
s
${
part
}
"
/mnt/etc/fstab
>
/dev/null 2>&1
case
$?
in
...
...
@@ -640,6 +661,16 @@ EOF2
fi
fi
#
# Disable the management interface in the OS.
#
if
[
-n
"
$DISABLEHINT
"
]
;
then
cat
<<
EOF0
# disable dedicated management interface
$DISABLEHINT
="1"
EOF0
fi
#
# Fix up console.
# null and vga are easy, just set console={null,vid}console
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment