diff options
| author | rbalocca <rbalocca@vyatta.com> | 2008-03-29 13:22:56 -0700 |
|---|---|---|
| committer | rbalocca <rbalocca@vyatta.com> | 2008-03-29 13:22:56 -0700 |
| commit | d1fe1e3bd6f8fe3ca17bb186429ff5061dbdb069 (patch) | |
| tree | 335a1a1fdf32f7faf291337b0b7e0eb9d98e14dd | |
| parent | b882a56f1861a43881d7cd11e7c85dfdd04b6502 (diff) | |
| parent | 33436464fcf7f38e382a9d57c5cba8b761bf0b75 (diff) | |
| download | vyatta-op-d1fe1e3bd6f8fe3ca17bb186429ff5061dbdb069.tar.gz vyatta-op-d1fe1e3bd6f8fe3ca17bb186429ff5061dbdb069.zip | |
Merge branch 'glendale' into hollywood
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | scripts/vyatta-show-version | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/debian/control b/debian/control index 8912e58..757332b 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Depends: sed (>= 4.1.5), lsof, coreutils (>= 5.97-5.3), host, - vyatta-bash, + vyatta-bash | bash (>= 3.1), less Suggests: util-linux (>= 2.13-5), net-tools, diff --git a/scripts/vyatta-show-version b/scripts/vyatta-show-version index 5d4c4c3..587f17e 100755 --- a/scripts/vyatta-show-version +++ b/scripts/vyatta-show-version @@ -160,10 +160,10 @@ if (defined($booted) && $booted ne "") { } else { $booted="disk"; } -print "Boot via: $booted\n"; +print "Boot via : $booted\n"; my $uptime = `uptime`; if (defined $uptime && $uptime ne "") { - print "Uptime : $uptime\n"; + print "Uptime : $uptime\n"; } if (!(-e $debsfile)) { exit 0; |