Commit 1b71a72d authored by Mike Hibler's avatar Mike Hibler

Fix fixup of /etc/init/ttyS0.conf.

We were expecting it to always contain "ttyS0", but it could be
"ttyS1" as well depending on where we last made the image.
parent 340f1861
......@@ -2011,7 +2011,7 @@ sub vnodePreConfig($$$$$){
" $vnoderoot/etc/inittab");
}
if (-f "$vnoderoot/etc/init/ttyS0.conf") {
mysystem2("sed -i.bak -e 's/ttyS0/hvc0/' ".
mysystem2("sed -i.bak -e 's/ttyS./hvc0/' ".
" $vnoderoot/etc/init/ttyS0.conf");
}
#
......@@ -4110,7 +4110,7 @@ sub disk_hacks($)
}
if (-f "$path/etc/init/ttyS0.conf") {
system("sed -i.bak -e 's/ttyS0/hvc0/' $path/etc/init/ttyS0.conf");
system("sed -i.bak -e 's/ttyS./hvc0/' $path/etc/init/ttyS0.conf");
}
if (-e "$BINDIR/tmcc-nossl.bin") {
......
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