diff options
17 files changed, 24 insertions, 102 deletions
diff --git a/Makefile.am b/Makefile.am index f67c9072..1dcacaf2 100644 --- a/Makefile.am +++ b/Makefile.am @@ -117,7 +117,7 @@ rsyslogdir = /etc/rsyslog.d #rsyslog_DATA = sysconf/vyatta-log.conf curver_DATA = cfg-version/vrrp@2 -curver_DATA += cfg-version/system@8 +curver_DATA += cfg-version/system@9 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@8 b/cfg-version/system@9 index e69de29b..e69de29b 100644 --- a/cfg-version/system@8 +++ b/cfg-version/system@9 diff --git a/etc/init.d/ec2-vyos-init b/etc/init.d/ec2-vyos-init index 271648bc..78d7be90 100644 --- a/etc/init.d/ec2-vyos-init +++ b/etc/init.d/ec2-vyos-init @@ -1,7 +1,7 @@ #!/bin/bash ### BEGIN INIT INFO # Provides: ec2-vyos-init -# Required-Start: vyatta-router +# Required-Start: vyos-router # Required-Stop: # Default-Start: 2 3 4 5 # Default-Stop: diff --git a/scripts/install/install-image b/scripts/install/install-image index fd10d0c3..1b482a19 100755 --- a/scripts/install/install-image +++ b/scripts/install/install-image @@ -123,7 +123,7 @@ fetch_iso_by_url () if [ $? -ne 0 ]; then echo "Signature check FAILED." echo -n "Do you want to continue anyway? (yes/no) [no] " - response=$(get_response "Yes" "Yes No Y N") + response=$(get_response "No" "Yes No Y N") if [ "$response" == "no" ] || [ "$response" == "n" ]; then fail_exit 'OK. Installation will not be performed.' fi diff --git a/scripts/install/install-image-existing b/scripts/install/install-image-existing index f38e3701..4fdfeda2 100755 --- a/scripts/install/install-image-existing +++ b/scripts/install/install-image-existing @@ -203,8 +203,6 @@ fi space_needed_configdata=`du -s ${VYATTA_NEW_CFG_DIR} | awk '{ print $1 }'` space_needed_config=$(($space_needed_configdata - $space_needed_data)) -DEMO_MIGRATE_SCRIPT=/opt/vyatta/sbin/demo-to-vse.pl - # save current config dir if needed if [ $space_avail -gt $space_needed_configdata ]; then resp='' @@ -218,11 +216,12 @@ if [ $space_avail -gt $space_needed_configdata ]; then mkdir -p $ndir find $VYATTA_NEW_CFG_DIR -maxdepth 1 -mindepth 1 \ -exec cp '-a' '{}' "$ndir/" ';' + + # Set the upgraded flag + touch $ndir/.upgraded + chgrp -R vyattacfg $ndir chmod -R 775 $ndir - if [ -x $DEMO_MIGRATE_SCRIPT ]; then - $DEMO_MIGRATE_SCRIPT $ndir/config.boot - fi fi done else diff --git a/templates/interfaces/bridge/node.def b/templates/interfaces/bridge/node.def index b6654f07..cda535d5 100644 --- a/templates/interfaces/bridge/node.def +++ b/templates/interfaces/bridge/node.def @@ -11,10 +11,8 @@ create: /sbin/brctl addbr $VAR(@) fi sudo ip link set $VAR(@) up -delete: if ! /opt/vyatta/sbin/vyatta-bridgegroup-depedency.pl \ - --no-interfaces-assigned \ - --bridge-interface="$VAR(@)"; then \ - exit 1 +delete: if ! ${vyos_conf_scripts_dir}/bridge_has_members.py $VAR(@); then + exit 1; fi sudo ip link set $VAR(@) down; sudo /sbin/brctl delbr $VAR(@); diff --git a/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/arp-cache-timeout/node.def b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/arp-cache-timeout/node.def new file mode 100644 index 00000000..054bc3b8 --- /dev/null +++ b/templates/interfaces/ethernet/node.tag/vif/node.tag/ip/arp-cache-timeout/node.def @@ -0,0 +1,10 @@ +help: ARP cache entry timeout in seconds + +type: u32 + +create:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh//$VAR(../../../@)\.$VAR(../../@)/base_reachable_time_ms\" " + +update:expression: "sudo sh -c \"echo $((1000*$VAR(@))) > /proc/sys/net/ipv4/neigh/$VAR(../../../@)\.$VAR(../../@)/base_reachable_time_ms\" " + +delete:expression: "sudo sh -c \"echo 30000 > /proc/sys/net/ipv4/neigh/$VAR(../../../@)\.$VAR(../../@)/base_reachable_time_ms\" " + diff --git a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def index 85666c41..84d2c983 100644 --- a/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def +++ b/templates/interfaces/tunnel/node.tag/parameters/ip/bridge-group/bridge/node.def @@ -13,4 +13,8 @@ create: echo interfaces tunnel $VAR(../../../../@) bridge-group bridge $VAR(@): tunnel encapsulation type must be gre-bridge exit 1 fi -delete: sudo brctl delif $VAR(@) $VAR(../../../../@) +delete: if [ -d /sys/class/net/$VAR(@) ]; then + sudo brctl delif $VAR(@) $VAR(../../../../@) + else + exit 0 + fi diff --git a/templates/system/package/auto-sync/node.def b/templates/system/package/auto-sync/node.def deleted file mode 100644 index 9eec0faa..00000000 --- a/templates/system/package/auto-sync/node.def +++ /dev/null @@ -1,18 +0,0 @@ -# this will set APT::Periodic::Update-Package-Lists in /etc/apt/apt.conf -# apt.conf is in turn read by the apt cron file loacted in /etc/cron.daily/apt -# the /etc/crontab file must have the daily line for daily to be run - -type: u32 - -default: 1 - -help: Update the the repository cache every n days (0 disables auto-update) - -syntax:expression: $VAR(@) >= 0 && $VAR(@) < 32 ; "auto-sync must be between 0 and 32 days" - -update:expression: "sudo sh -c \"touch /etc/apt/apt.conf && \ - sed -i '/APT::Periodic::Update-Package-Lists*/d' /etc/apt/apt.conf && \ - echo \\\"APT::Periodic::Update-Package-Lists \\\"$VAR(@)\\\";\\\" >> /etc/apt/apt.conf\" " - -delete:expression: "sudo sh -c \"touch /etc/apt/apt.conf && \ - sed -i '/APT::Periodic::Update-Package-Lists*/d' /etc/apt/apt.conf\" " diff --git a/templates/system/package/node.def b/templates/system/package/node.def deleted file mode 100644 index c19c92de..00000000 --- a/templates/system/package/node.def +++ /dev/null @@ -1,2 +0,0 @@ -priority: 400 -help: Package update repository parameters diff --git a/templates/system/package/repository/node.def b/templates/system/package/repository/node.def deleted file mode 100644 index c84060e2..00000000 --- a/templates/system/package/repository/node.def +++ /dev/null @@ -1,32 +0,0 @@ -tag: - -type: txt - -help: Debian archive name - -commit:expression: $VAR(./url/) != ""; "Must configure the repository URL" -commit:expression: $VAR(./distribution/) != ""; "Must configure the repository distribution" -commit:expression: $VAR(./components/) != ""; "Must configure the repository components" - -end: - if [ ${COMMIT_ACTION} = 'SET' -o ${COMMIT_ACTION} = 'ACTIVE' ]; then - if [ ${COMMIT_ACTION} = 'SET' ]; then - echo "Adding new entry to /etc/apt/sources.list..." - else - echo "Updating /etc/apt/sources.list..." - fi - sudo bash -c "touch /etc/apt/sources.list && \ - sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list && \ - echo \"deb $VAR(url/@) $VAR(distribution/@) $VAR(components/@) # $VAR(@) #\" >> /tmp/$$-sources.list && \ - if [ $VAR(password/@) ] || [ $VAR(username/@) ]; \ - then \ - sed -i "s!://.*@!://!" /tmp/$$-sources.list; \ - sed -i "s!://!://$VAR(username/@):$VAR(password/@)@!" /tmp/$$-sources.list; \ - fi && \ - cat /tmp/$$-sources.list>>/etc/apt/sources.list ; \ - rm -f /tmp/$$-sources.list" - elif [ ${COMMIT_ACTION} = 'DELETE' ]; then - echo "Removing entry from /etc/apt/sources.list..." - sudo sh -c "touch /etc/apt/sources.list && \ - sed -i '\\!# $VAR(@) #!d' /etc/apt/sources.list" - fi diff --git a/templates/system/package/repository/node.tag/components/node.def b/templates/system/package/repository/node.tag/components/node.def deleted file mode 100644 index 606f7bb6..00000000 --- a/templates/system/package/repository/node.tag/components/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: txt - -help: Repository component names - -# need to prohibit '!' in repo name (sed delimiter) -syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in component name" diff --git a/templates/system/package/repository/node.tag/description/node.def b/templates/system/package/repository/node.tag/description/node.def deleted file mode 100644 index 8b686f06..00000000 --- a/templates/system/package/repository/node.tag/description/node.def +++ /dev/null @@ -1,3 +0,0 @@ -type: txt - -help: Repository description diff --git a/templates/system/package/repository/node.tag/distribution/node.def b/templates/system/package/repository/node.tag/distribution/node.def deleted file mode 100644 index ae88cb42..00000000 --- a/templates/system/package/repository/node.tag/distribution/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: txt - -help: Distribution name - -# need to prohibit '!' in repo name (sed delimiter) -syntax:expression: pattern $VAR(@) "^[^!]+$" ; "Do not use '!' in distribution name" diff --git a/templates/system/package/repository/node.tag/password/node.def b/templates/system/package/repository/node.tag/password/node.def deleted file mode 100644 index 34ccff27..00000000 --- a/templates/system/package/repository/node.tag/password/node.def +++ /dev/null @@ -1,8 +0,0 @@ -type: txt - -help: Repository password - -default: "" - -# need to prohibit '!' in url (sed delimiter) -syntax:expression: pattern $VAR(@) "^[^!]*$" ; "Do not use '!' in url" diff --git a/templates/system/package/repository/node.tag/url/node.def b/templates/system/package/repository/node.tag/url/node.def deleted file mode 100644 index 3fad02e8..00000000 --- a/templates/system/package/repository/node.tag/url/node.def +++ /dev/null @@ -1,6 +0,0 @@ -type: txt - -help: Repository URL - -# need to prohibit '!' in url (sed delimiter) -syntax:expression: pattern $VAR(@) "^[^!]+$" ; "URL must not be null and must not contain '!'" diff --git a/templates/system/package/repository/node.tag/username/node.def b/templates/system/package/repository/node.tag/username/node.def deleted file mode 100644 index d22dd7cb..00000000 --- a/templates/system/package/repository/node.tag/username/node.def +++ /dev/null @@ -1,8 +0,0 @@ -type: txt - -help: Repository username - -default: "" - -# need to prohibit '!' in url (sed delimiter) -syntax:expression: pattern $VAR(@) "^[^!]*$" ; "Do not use '!' in url" |