From 04ff16ae2bad256b0990fbe970a168817c3b051b Mon Sep 17 00:00:00 2001
From: An-Cheng Huang <ancheng@vyatta.com>
Date: Wed, 24 Oct 2007 13:51:15 -0700
Subject: move default config to vyatta-cfg-system. if vyatta-cfg-system is not
 installed, an empty config is used.

---
 etc/config.boot.default | 29 -----------------------------
 etc/init.d/vyatta-ofr   |  6 +++++-
 2 files changed, 5 insertions(+), 30 deletions(-)
 delete mode 100644 etc/config.boot.default

(limited to 'etc')

diff --git a/etc/config.boot.default b/etc/config.boot.default
deleted file mode 100644
index 941507f..0000000
--- a/etc/config.boot.default
+++ /dev/null
@@ -1,29 +0,0 @@
-system {
-    ntp-server "69.59.150.135"
-    login {
-        user root {
-            authentication {
-                encrypted-password: "$1$$Ht7gBYnxI1xCdO/JOnodh."
-            }
-        }
-        user vyatta {
-            authentication {
-                encrypted-password: "$1$$Ht7gBYnxI1xCdO/JOnodh."
-            }
-        }
-    }
-    package {
-        repository community {
-            component: "main"
-            url: "http://archive.vyatta.com/vyatta"
-        }
-    }
-}
-
-interfaces {
-    loopback lo {
-    }
-}
-
-/* Warning: Do not remove the following line. */
-/* === vyatta-config-version: "cluster@1:dhcp-relay@1:dhcp-server@1:firewall@1:nat@2:serial@1:webgui@1" === */
diff --git a/etc/init.d/vyatta-ofr b/etc/init.d/vyatta-ofr
index 0c71b20..488babc 100755
--- a/etc/init.d/vyatta-ofr
+++ b/etc/init.d/vyatta-ofr
@@ -127,7 +127,11 @@ init_bootfile () {
         if [ ! -d $vyatta_sysconfdir/config ]; then
             mkdir -p $vyatta_sysconfdir/config
         fi
-	cp $vyatta_sysconfdir/config.boot.default $BOOTFILE
+	if [ -f $vyatta_sysconfdir/config.boot.default ]; then
+	  cp $vyatta_sysconfdir/config.boot.default $BOOTFILE
+        else
+          $vyatta_sbindir/vyatta_current_conf_ver.pl > $BOOTFILE
+        fi
     fi
     chgrp ${GROUP} $BOOTFILE 
     chmod 660 $BOOTFILE
-- 
cgit v1.2.3