diff options
| author | An-Cheng Huang <ancheng@vyatta.com> | 2007-10-24 13:51:15 -0700 |
|---|---|---|
| committer | An-Cheng Huang <ancheng@vyatta.com> | 2007-10-24 13:51:15 -0700 |
| commit | 04ff16ae2bad256b0990fbe970a168817c3b051b (patch) | |
| tree | f286027c88db013f49258a44c1e38fff6c967439 /etc | |
| parent | aded3ffd12620dd0fab59538b4fced05a7739987 (diff) | |
| download | vyatta-cfg-04ff16ae2bad256b0990fbe970a168817c3b051b.tar.gz vyatta-cfg-04ff16ae2bad256b0990fbe970a168817c3b051b.zip | |
move default config to vyatta-cfg-system. if vyatta-cfg-system is not
installed, an empty config is used.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/config.boot.default | 29 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-ofr | 6 |
2 files changed, 5 insertions, 30 deletions
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 |