diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/dns-forwarding/vyatta-dns-forwarding.pl | 18 | ||||
| -rwxr-xr-x | scripts/install-system | 4 | ||||
| -rw-r--r-- | scripts/snmp/vyatta-snmp.pl | 2 | ||||
| -rwxr-xr-x | scripts/system/vyatta_update_login.pl | 2 |
4 files changed, 15 insertions, 11 deletions
diff --git a/scripts/dns-forwarding/vyatta-dns-forwarding.pl b/scripts/dns-forwarding/vyatta-dns-forwarding.pl index 6cdcfaa0..d0d7e36c 100644 --- a/scripts/dns-forwarding/vyatta-dns-forwarding.pl +++ b/scripts/dns-forwarding/vyatta-dns-forwarding.pl @@ -57,7 +57,7 @@ sub dnsforwarding_get_constants { sub dnsforwarding_get_values { - my $dhclient_script = shift; + my $outside_cli = shift; my $output = ''; my $config = new VyattaConfig; @@ -66,7 +66,7 @@ sub dnsforwarding_get_values { $config->setLevel("service dns forwarding"); - if ($dhclient_script == 1){ + if ($outside_cli == 1){ $config->{_active_dir_base} = "/opt/vyatta/config/active/"; @listen_interfaces = $config->returnOrigValues("listen-on"); $cache_size = $config->returnOrigValue("cache-size"); @@ -104,7 +104,7 @@ sub dnsforwarding_get_values { my $sys_config = new VyattaConfig; $sys_config->setLevel("system"); my @system_nameservers; - if ($dhclient_script == 1){ + if ($outside_cli == 1){ $sys_config->{_active_dir_base} = "/opt/vyatta/config/active/"; @system_nameservers = $sys_config->returnOrigValues("name-server"); } else { @@ -255,12 +255,12 @@ sub check_dhcp_interface { # main # -my ($update_dnsforwarding, $stop_dnsforwarding, $system_nameserver, $dhcp_interface, $dhclient_script); +my ($update_dnsforwarding, $stop_dnsforwarding, $system_nameserver, $dhcp_interface, $outside_cli); GetOptions("update-dnsforwarding!" => \$update_dnsforwarding, "stop-dnsforwarding!" => \$stop_dnsforwarding, "system-nameserver!" => \$system_nameserver, - "dhclient-script!" => \$dhclient_script, + "outside-cli!" => \$outside_cli, "dhcp-interface=s" => \$dhcp_interface); if (defined $system_nameserver) { @@ -293,12 +293,12 @@ if (defined $update_dnsforwarding) { } } - my $called_from_dhclient_script = 0; - if (defined $dhclient_script){ - $called_from_dhclient_script = 1; + my $called_from_outside_cli = 0; + if (defined $outside_cli){ + $called_from_outside_cli = 1; } $config = dnsforwarding_get_constants(); - $config .= dnsforwarding_get_values($called_from_dhclient_script); + $config .= dnsforwarding_get_values($called_from_outside_cli); dnsforwarding_write_file($config); dnsforwarding_restart(); } diff --git a/scripts/install-system b/scripts/install-system index ee0ebb5f..8993ab10 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 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 diff --git a/scripts/system/vyatta_update_login.pl b/scripts/system/vyatta_update_login.pl index dbe4e338..1f71434b 100755 --- a/scripts/system/vyatta_update_login.pl +++ b/scripts/system/vyatta_update_login.pl @@ -53,7 +53,7 @@ my %reasons = ( # Map of level to additional groups my %level_map = ( - 'admin' => [ 'quaggavty', 'vyattacfg', 'sudo', 'adm', 'dip', ], + 'admin' => [ 'quaggavty', 'vyattacfg', 'sudo', 'adm', 'dip', 'disk'], 'operator' => [ 'quaggavty', 'operator', 'adm', 'dip', ], ); |