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
92d1ef5d
Commit
92d1ef5d
authored
Apr 07, 2015
by
Mike Hibler
Browse files
Actually put the disable_if setting in loader.conf.
Also, fix string comparison.
parent
550faa2f
Changes
3
Hide whitespace changes
Inline
Side-by-side
clientside/tmcc/freebsd/rc.frisbee
View file @
92d1ef5d
...
...
@@ -202,6 +202,7 @@ loadone() {
_NUM
=
$4
echo
"Loading image #
$_NUM
"
echo
" LOADINFO=
\"
$_LOADINFO
\"
"
ADDR
=
`
getvar ADDR
"
$_LOADINFO
"
`
;
SERVER
=
`
getvar SERVER
"
$_LOADINFO
"
$BOSSIP
`
;
...
...
clientside/tmcc/freebsd/slicefix
View file @
92d1ef5d
...
...
@@ -617,7 +617,8 @@ EOF2
# Disable the management interface in the OS.
#
if
[
-n
"
$DISABLEHINT
"
]
;
then
cat
<<
EOF0
echo
" disabling interface
$DISABLEIF
"
cat
<<
EOF0
>>/mnt/boot/loader.conf
# disable dedicated management interface
$DISABLEHINT
="1"
EOF0
...
...
@@ -663,6 +664,7 @@ EOF0
# spit out the name
cat
<<
EOF1
>>/mnt/boot/loader.conf
# setting console to
$CONSOLE
console="
$cname
"
EOF1
...
...
@@ -1022,7 +1024,7 @@ dolinux() {
grep
-q
-E
'[br]oot=UUID=[^ ]+ '
$tgconf
2>/dev/null
;
then
OUUID
=
`
grep
-E
-m
1
'[br]oot=UUID=[^ ]+ '
$tgconf
|
\
sed
-e
's;.*UUID=\([^ ]*\) .*;\1;'
`
if
[
-n
"
$OUUID
"
-a
$RUUID
-ne
$OUUID
]
;
then
if
[
-n
"
$OUUID
"
-a
$RUUID
!=
$OUUID
]
;
then
echo
" fixing root (UUID)"
sed
-i
''
-e
"s;
$OUUID
;
$RUUID
;g"
$tgconf
fi
...
...
clientside/tmcc/linux/slicefix
View file @
92d1ef5d
...
...
@@ -662,7 +662,8 @@ EOF2
# Disable the management interface in the OS.
#
if
[
-n
"
$DISABLEHINT
"
]
;
then
cat
<<
EOF0
echo
" disabling interface
$DISABLEIF
"
cat
<<
EOF0
>>/mnt/boot/loader.conf
# disable dedicated management interface
$DISABLEHINT
="1"
EOF0
...
...
@@ -708,6 +709,7 @@ EOF0
# spit out the name
cat
<<
EOF1
>>/mnt/boot/loader.conf
# setting console to
$CONSOLE
console="
$cname
"
EOF1
...
...
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