diff options
| -rwxr-xr-x | debian/vyatta-cfg-system.postinst.in | 1 | ||||
| -rwxr-xr-x | scripts/vyatta-grub-setup | 2 | ||||
| -rw-r--r-- | templates/interfaces/l2tpv3/node.def | 4 |
3 files changed, 4 insertions, 3 deletions
diff --git a/debian/vyatta-cfg-system.postinst.in b/debian/vyatta-cfg-system.postinst.in index 37c19275..8888aa60 100755 --- a/debian/vyatta-cfg-system.postinst.in +++ b/debian/vyatta-cfg-system.postinst.in @@ -11,6 +11,7 @@ for init in ntp ssh snmpd openhpid logd \ ipvsadm dnsmasq ddclient radvd hostapd conntrackd do update-rc.d -f ${init} remove >/dev/null + systemctl disable ${init} >/dev/null done # remove extra call to clock setup only need one. this speeds up boot diff --git a/scripts/vyatta-grub-setup b/scripts/vyatta-grub-setup index f4c18f2c..7a5d3891 100755 --- a/scripts/vyatta-grub-setup +++ b/scripts/vyatta-grub-setup @@ -178,7 +178,7 @@ fi echo "" echo -e "insmod mdraid09" echo -e "insmod mdraid1x" - echo -e "set root=(md/$ROOT_PARTITION)" + echo -e "set root=(md/${ROOT_PARTITION#md})" fi echo "" diff --git a/templates/interfaces/l2tpv3/node.def b/templates/interfaces/l2tpv3/node.def index 4fce9536..03c677ad 100644 --- a/templates/interfaces/l2tpv3/node.def +++ b/templates/interfaces/l2tpv3/node.def @@ -48,9 +48,9 @@ create: delete: ip link set $VAR(@) down - if [ -n "$VAR(./tunnel-id@/)" ] && [ -n "$VAR(./session-id@/)" ] ; then + if [ -n "$VAR(./tunnel-id/@)" ] && [ -n "$VAR(./session-id/@)" ] ; then ip l2tp del session $VAR(./tunnel-id/@) session_id $VAR(./session-id/@) fi - if [ -n "$VAR(./tunnel-id@/)" ] ; then + if [ -n "$VAR(./tunnel-id/@)" ] ; then ip l2tp del tunnel tunnel_id $VAR(./tunnel-id/@) fi |