Commit 534cd1c7 authored by David Johnson's avatar David Johnson

Don't try to "replace" the kernel if using netem in Linux delaysetup.

(This is just about getting rid of spurious errors; of course we haven't
been trying to reboot into custom kernels for a long time.)
parent 9cd73568
......@@ -205,6 +205,7 @@ sub LinkDelaySetup()
if ($? == 0) {
print "Using sch_netem kernel module for delay/plr\n";
$usenetem = 1;
$checkreplace = 0;
print DEL "modprobe sch_netem\n";
}
else {
......@@ -502,14 +503,16 @@ sub LinkDelaySetup()
# node.
system("touch " . ISDELAYNODEPATH());
#
# Now do kernel configuration. All of the above work is wasted,
# but such is life.
#
if (!$gotjails) {
$kernel = $KERNELLDELAY;
if (!$usenetem) {
#
# Now do kernel configuration. All of the above work is wasted,
# but such is life.
#
if (!$gotjails) {
$kernel = $KERNELLDELAY;
}
$checkreplace = 1;
}
$checkreplace = 1;
}
if ($checkreplace) {
checkkernel($kernel);
......
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