diff options
| author | Rick Balocca <rbalocca@vyatta.com> | 2008-11-05 09:51:41 -0800 |
|---|---|---|
| committer | Rick Balocca <rbalocca@vyatta.com> | 2008-11-05 09:51:41 -0800 |
| commit | 15edfc57c1d9de898d79d723ce72d51f6ac7dedf (patch) | |
| tree | 882525933cd181a719a737cffff22c0d66f6cf0f | |
| parent | 07b1c95171167979e43e1505093442669195e540 (diff) | |
| parent | 5e61fa587c5765672204398a49bef01088a4c743 (diff) | |
| download | vyatta-cfg-system-15edfc57c1d9de898d79d723ce72d51f6ac7dedf.tar.gz vyatta-cfg-system-15edfc57c1d9de898d79d723ce72d51f6ac7dedf.zip | |
Merge branch 'islavista' into jenner
| -rwxr-xr-x | scripts/install-system | 4 | ||||
| -rw-r--r-- | scripts/snmp/vyatta-snmp.pl | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/scripts/install-system b/scripts/install-system index 2ac202f2..6b5519a5 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -718,7 +718,9 @@ install_root_filesystem () { output=$(mount /live/image/boot/$version/$version.squashfs /mnt/squashfs -t squashfs -o loop) status=$? else - echo -e "Error: Unable to find a squash image. \nExiting..." + echo -e "Error: Unable to find a squash image. To install natively\nthe install media must be a livecd or a union install.\nExiting...\n\n" + echo -e "Error: Unable to find a squash image. To install natively\nthe install media must be a livecd or a union install.\nExiting...\n\n" >> $INSTALL_LOG + exit 1 fi if [ "$status" != 0 ]; then diff --git a/scripts/snmp/vyatta-snmp.pl b/scripts/snmp/vyatta-snmp.pl index 58dc374f..65247788 100644 --- a/scripts/snmp/vyatta-snmp.pl +++ b/scripts/snmp/vyatta-snmp.pl @@ -62,6 +62,8 @@ sub snmp_get_constants { my $date = `date`; chomp $date; $output = "#\n# autogenerated by vyatta-snmp.pl on $date\n#\n"; + $output .= "sysDescr Vyatta\n"; + $output .= "sysObjectID 1.3.6.1.4.1.30803\n"; $output .= "sysServices 14\n"; $output .= "smuxpeer .1.3.6.1.4.1.3317.1.2.2\n"; # ospfd $output .= "smuxpeer .1.3.6.1.4.1.3317.1.2.5\n"; # bgpd |