From 22f82a0fb8ad3ed890c82a7a568390a29cf5116e Mon Sep 17 00:00:00 2001
From: Stephen Hemminger <stephen.hemminger@vyatta.com>
Date: Fri, 15 Oct 2010 15:54:50 -0700
Subject: Handle error cases on console update

If inittab doesn't exist or console not configured, just
do nothing.
---
 scripts/system/vyatta_update_console.pl | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/system/vyatta_update_console.pl b/scripts/system/vyatta_update_console.pl
index 3c3b7d2d..2ee57583 100644
--- a/scripts/system/vyatta_update_console.pl
+++ b/scripts/system/vyatta_update_console.pl
@@ -41,7 +41,7 @@ sub update_inittab {
     my ($inpath, $outpath) = @_;
 
     open (my $inittab, '<', $inpath)
-	or die "Can't open $inpath: $!";
+	or return;
 
     open (my $tmp, '>', $outpath)
 	or die "Can't open $outpath: $!";
@@ -81,7 +81,10 @@ sub update_grub {
     my ($inpath, $outpath) = @_;
 
     my $config = new Vyatta::Config;
-    my $speed = $config->returnValue("system console device ttyS0 speed");
+    $config->setlevel("system console device");
+    return unless $config->exists("ttyS0");
+
+    my $speed = $config->returnValue("ttyS0 speed");
     $speed = "9600" unless defined($speed);
 
     open (my $grub, '<', $inpath)
-- 
cgit v1.2.3