diff options
16 files changed, 1 insertions, 130 deletions
diff --git a/Makefile.am b/Makefile.am index 042a8a0c..23d739a3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,8 +40,6 @@ sbin_SCRIPTS += scripts/system/vyatta_check_domainname.pl sbin_SCRIPTS += scripts/system/vyatta_interface_rescan sbin_SCRIPTS += scripts/system/vyatta_update_logrotate.pl sbin_SCRIPTS += scripts/system/vyatta_update_sysctl.pl -#sbin_SCRIPTS += scripts/system/vyatta_update_syslog.pl -sbin_SCRIPTS += scripts/system/vyatta_update_console.pl sbin_SCRIPTS += scripts/system/irq-affinity.pl sbin_SCRIPTS += scripts/snmp/if-mib-alias sbin_SCRIPTS += scripts/telnetd.init @@ -100,7 +98,7 @@ rsyslogdir = /etc/rsyslog.d #rsyslog_DATA = sysconf/vyatta-log.conf curver_DATA = cfg-version/vrrp@2 -curver_DATA += cfg-version/system@16 +curver_DATA += cfg-version/system@17 curver_DATA += cfg-version/broadcast-relay@1 curver_DATA += cfg-version/mdns@1 curver_DATA += cfg-version/dhcp-server@5 diff --git a/cfg-version/system@16 b/cfg-version/system@17 index e69de29b..e69de29b 100644 --- a/cfg-version/system@16 +++ b/cfg-version/system@17 diff --git a/templates/system/console/device/node.def b/templates/system/console/device/node.def deleted file mode 100644 index 00438947..00000000 --- a/templates/system/console/device/node.def +++ /dev/null @@ -1,16 +0,0 @@ -tag: -type: txt -help: Serial console device name - -val_help: <ttySN>; Serial device name -val_help: <ttyUSBX>; USB Serial device name -val_help: <hvc0>; Xen console - -syntax:expression: pattern $VAR(@) "^((tty[A-Z])|ttymxc|ttyUSB|(hvc)){1}[0-9]+$" \ - ; "console $VAR(@): not a valid tty name" - -end: sudo sh -c " - declare -a devices=( $VAR(@@) ) - if [ "\${#devices[*]}" == "0" ]; then - echo Warning: Access to system console is unconfigured - fi " diff --git a/templates/system/console/device/node.tag/modem/node.def b/templates/system/console/device/node.tag/modem/node.def deleted file mode 100644 index 30e24cf7..00000000 --- a/templates/system/console/device/node.tag/modem/node.def +++ /dev/null @@ -1,2 +0,0 @@ -help: Device is Hayes compatiable modem - diff --git a/templates/system/console/device/node.tag/speed/node.def b/templates/system/console/device/node.tag/speed/node.def deleted file mode 100644 index 2bd4d7f0..00000000 --- a/templates/system/console/device/node.tag/speed/node.def +++ /dev/null @@ -1,15 +0,0 @@ -type: u32 -help: Console baud rate. -allowed: echo 1200 2400 4800 9600 19200 38400 57600 115200 -syntax:expression: $VAR(@) in 1200, 2400, 4800, 9600, 19200, 38400, \ - 57600, 115200 ; "unknown baud rate" - -val_help: 1200; 1200 bps -val_help: 2400; 2400 bps -val_help: 4800; 4800 bps -val_help: 9600; 9600 bps -val_help: 19200; 19,200 bps -val_help: 38400; 38,400 bps (default for Xen console) -val_help: 57600; 57,600 bps -val_help: 115200; 115,200 bps (default for serial console) - diff --git a/templates/system/console/network/node.def b/templates/system/console/network/node.def deleted file mode 100644 index d8184461..00000000 --- a/templates/system/console/network/node.def +++ /dev/null @@ -1,33 +0,0 @@ -tag: -type: txt -help: Network based console logging -priority: 400 # After network interface -val_help: <netconXX>; Network console device name - -syntax:expression: pattern $VAR(@) "^netcon[0-9]+$" \ - ; "network console $VAR(@): not a valid name" - -begin: # Make configfs if not present - if [ ! -d /dev/config ] ; then - sudo mkdir /dev/config - sudo mount -t configfs none /dev/config - fi - # Add netconsole module if not already present - [ -d /dev/config/netconsole ] || sudo modprobe netconsole - # create network console object - NETCONS=/dev/config/netconsole/$VAR(@) - [ -d $NETCONS ] || sudo mkdir $NETCONS - # leave disabled until end of transaction - if [ $(cat $NETCONS/enabled) -ne 0 ]; then - sudo sh -c "echo 0 > $NETCONS/enabled" - fi - -commit:expression: $VAR(interface) != "" ; "interface must be specified" - -delete: sudo rmdir /dev/config/netconsole/$VAR(@) - -end: NETCONS=/dev/config/netconsole/$VAR(@) - # enable console if not deleted - if [ -d $NETCONS ]; then - sudo sh -c "echo 1 > $NETCONS/enabled" - fi diff --git a/templates/system/console/network/node.tag/interface/node.def b/templates/system/console/network/node.tag/interface/node.def deleted file mode 100644 index 4153ad36..00000000 --- a/templates/system/console/network/node.tag/interface/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: txt -help: Ethernet interface name [REQUIRED] -allowed: ${vyatta_sbindir}/vyatta-interfaces.pl --show=ethernet -val_help: Interface for network console - -update: NETCONS=/dev/config/netconsole/$VAR(../@) - sudo sh -c "echo $VAR(@) > $NETCONS/dev_name" diff --git a/templates/system/console/network/node.tag/local/address/node.def b/templates/system/console/network/node.tag/local/address/node.def deleted file mode 100644 index b14c7f6c..00000000 --- a/templates/system/console/network/node.tag/local/address/node.def +++ /dev/null @@ -1,10 +0,0 @@ -type: ipv4 -help: Local IP address for this console -val_help: ipv4; Local IPv4 address for this tunnel - -syntax:expression: exec \ - "/opt/vyatta/sbin/local_ip $VAR(@) || \ - echo Warning! IP address $VAR(@) doesn\\'t exist on this system" - -update: NETCONS=/dev/config/netconsole/$VAR(../../@) - sudo sh -c "echo $VAR(@) > $NETCONS/local_ip" diff --git a/templates/system/console/network/node.tag/local/node.def b/templates/system/console/network/node.tag/local/node.def deleted file mode 100644 index ad89cb49..00000000 --- a/templates/system/console/network/node.tag/local/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Local parameters for network console diff --git a/templates/system/console/network/node.tag/local/port/node.def b/templates/system/console/network/node.tag/local/port/node.def deleted file mode 100644 index 14783149..00000000 --- a/templates/system/console/network/node.tag/local/port/node.def +++ /dev/null @@ -1,10 +0,0 @@ -type: u32 -default: 6665 -help: Local UDP port for network console -val_help: u32:1-65535; Numeric IP port - -syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \ - "Port number must be in range 1 to 65535" - -update: NETCONS=/dev/config/netconsole/$VAR(../../@) - sudo sh -c "echo $VAR(@) > $NETCONS/local_port" diff --git a/templates/system/console/network/node.tag/remote/address/node.def b/templates/system/console/network/node.tag/remote/address/node.def deleted file mode 100644 index 97ac6ee1..00000000 --- a/templates/system/console/network/node.tag/remote/address/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: ipv4 -help: Remote IP address for this console -val_help: ipv4; Remote IPv4 address for this tunnel - -update: NETCONS=/dev/config/netconsole/$VAR(../../@) - sudo sh -c "echo $VAR(@) > $NETCONS/remote_ip" diff --git a/templates/system/console/network/node.tag/remote/mac/node.def b/templates/system/console/network/node.tag/remote/mac/node.def deleted file mode 100644 index e59081d7..00000000 --- a/templates/system/console/network/node.tag/remote/mac/node.def +++ /dev/null @@ -1,7 +0,0 @@ -type: macaddr -help: Remote Media Access Control (MAC) address -syntax:expression: exec "\ - /opt/vyatta/sbin/vyatta-interfaces.pl --dev $VAR(../@) --valid-mac $VAR(@)" - -update: NETCONS=/dev/config/netconsole/$VAR(../../@) - sudo sh -c "echo $VAR(@) > $NETCONS/remote_mac" diff --git a/templates/system/console/network/node.tag/remote/node.def b/templates/system/console/network/node.tag/remote/node.def deleted file mode 100644 index 869dd80e..00000000 --- a/templates/system/console/network/node.tag/remote/node.def +++ /dev/null @@ -1 +0,0 @@ -help: Remote parameters for network console diff --git a/templates/system/console/network/node.tag/remote/port/node.def b/templates/system/console/network/node.tag/remote/port/node.def deleted file mode 100644 index d193e20a..00000000 --- a/templates/system/console/network/node.tag/remote/port/node.def +++ /dev/null @@ -1,10 +0,0 @@ -type: u32 -default: 6666 -help: Remote UDP port for network console -val_help: u32:1-65535; Numeric IP port - -syntax:expression: $VAR(@) > 0 && $VAR(@) <= 65535 ; \ - "Port number must be in range 1 to 65535" - -update: NETCONS=/dev/config/netconsole/$VAR(../../@) - sudo sh -c "echo $VAR(@) > $NETCONS/remote_port" diff --git a/templates/system/console/node.def b/templates/system/console/node.def deleted file mode 100644 index d42f8cf6..00000000 --- a/templates/system/console/node.def +++ /dev/null @@ -1,3 +0,0 @@ -priority: 100 -help: Serial console configuration -end: sudo /opt/vyatta/sbin/vyatta_update_console.pl diff --git a/templates/system/console/powersave/node.def b/templates/system/console/powersave/node.def deleted file mode 100644 index 7ad3d1a1..00000000 --- a/templates/system/console/powersave/node.def +++ /dev/null @@ -1,6 +0,0 @@ -help: Enable screen blank powersaving on VGA console - -create: sudo sh -c \ - "/usr/bin/setterm -blank 15 -powersave powerdown -powerdown 60 -term linux </dev/console >/dev/console 2>&1" -delete: sudo sh -c \ - "/usr/bin/setterm -blank 0 -powersave off -powerdown 0 -term linux </dev/console >/dev/console 2>&1"
\ No newline at end of file |