From fee80e618f4d96078811eaf1efb5d0ae27df433a Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Mon, 3 Nov 2008 14:39:43 -0500 Subject: bug 1587: add error message when user tries native install from non-union media --- scripts/install-system | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/install-system b/scripts/install-system index e4464ede..3ed14af2 100755 --- a/scripts/install-system +++ b/scripts/install-system @@ -735,7 +735,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 -- cgit v1.2.3 From 5e61fa587c5765672204398a49bef01088a4c743 Mon Sep 17 00:00:00 2001 From: Robert Bays Date: Tue, 4 Nov 2008 17:34:23 -0500 Subject: bug 3791: set sysObjectID and sysDescr --- scripts/snmp/vyatta-snmp.pl | 2 ++ 1 file changed, 2 insertions(+) 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 -- cgit v1.2.3