diff options
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | etc/config.boot.default | 29 | ||||
| -rwxr-xr-x | etc/init.d/vyatta-ofr | 6 |
3 files changed, 5 insertions, 31 deletions
diff --git a/Makefile.am b/Makefile.am index d7186e9..3129eb7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -9,7 +9,6 @@ AM_LFLAGS = --prefix=yy_`basename $* .l`_ -olex.yy.c completion_DATA = etc/bash_completion.d/vyatta-cfg initd_SCRIPTS = etc/init.d/vyatta-ofr -sysconf_DATA = etc/config.boot.default lib_LTLIBRARIES = src/libvyatta-cfg.la src_libvyatta_cfg_la_LDFLAGS = -version-info 1:0:0 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 |