diff options
| -rwxr-xr-x | scripts/vyatta-grub-setup | 6 | ||||
| -rw-r--r-- | templates/interfaces/l2tpv3/node.def | 2 | ||||
| -rw-r--r-- | templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def | 6 |
3 files changed, 7 insertions, 7 deletions
diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index 9ee42801..63e3d987 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -60,9 +60,9 @@ ROOTFSDIR="$3" # Grub options if [ "$GRUB_OPTIONS" ] then - GRUB_OPTIONS="$GRUB_OPTIONS quiet systemd.show_status=1" + GRUB_OPTIONS="$GRUB_OPTIONS quiet" else - GRUB_OPTIONS="quiet systemd.show_status=1" + GRUB_OPTIONS=quiet fi # Path to standalone root password reset script @@ -103,7 +103,7 @@ else fi if eval "$UNION"; then - GRUB_OPTIONS="boot=live quiet systemd.show_status=1 vyos-union=/boot/$livedir" + GRUB_OPTIONS="boot=live quiet vyos-union=/boot/$livedir" union_xen_kernel_version=$(ls $ROOTFSDIR/boot/$livedir/vmlinuz*-xen* \ 2>/dev/null \ | awk -F/ '{ print $6 }' \ diff --git a/templates/interfaces/l2tpv3/node.def b/templates/interfaces/l2tpv3/node.def index fb3d1475..4fce9536 100644 --- a/templates/interfaces/l2tpv3/node.def +++ b/templates/interfaces/l2tpv3/node.def @@ -1,5 +1,5 @@ tag: -priority: 460 +priority: 800 type: txt help: L2TPv3 interface val_help: <l2tpethN>; L2TPv3 interface name diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def index b9ed181e..1142d2de 100644 --- a/templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def +++ b/templates/interfaces/tunnel/node.tag/parameters/ip/key/node.def @@ -1,8 +1,8 @@ type: u32 help: Tunnel key -syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 999999; \ - "Must be between 0-999999 for $VAR(../../../@)" -val_help: u32:0-999999; Tunnel key +syntax:expression: $VAR(@) >= 0 && $VAR(@) <= 4294967295; \ + "Must be between 0-4294967295 for $VAR(../../../@)" +val_help: u32:0-4294967295; Tunnel key syntax:expression: exec " \ if [ -n \"`ip tunnel show $VAR(../../../@) | grep $VAR(../../../@) `\" ]; then \ |