diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2010-03-24 17:13:11 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2010-03-24 17:13:11 -0700 |
| commit | a4b59a1aaa10c4f78b5d854aa884decb17b8aea9 (patch) | |
| tree | d556d32de2cfae95e1be161b005ce4cf89c8849a /etc/init.d/vyatta-router | |
| parent | 7a9f88c587187ece112e47d7c4d077e44a6afe8a (diff) | |
| parent | 327ea4113cea590f4d2c33bb430421158ebf51fa (diff) | |
| download | vyatta-cfg-a4b59a1aaa10c4f78b5d854aa884decb17b8aea9.tar.gz vyatta-cfg-a4b59a1aaa10c4f78b5d854aa884decb17b8aea9.zip | |
Merge branch 'larkspur' of http://git.vyatta.com/vyatta-cfg into larkspur
Diffstat (limited to 'etc/init.d/vyatta-router')
| -rwxr-xr-x | etc/init.d/vyatta-router | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/etc/init.d/vyatta-router b/etc/init.d/vyatta-router index 3f64b9c..c41c48a 100755 --- a/etc/init.d/vyatta-router +++ b/etc/init.d/vyatta-router @@ -117,7 +117,13 @@ load_bootfile () { if [ -x $vyatta_sbindir/vyatta-config-loader.pl ]; then log_progress_msg configure - sg ${GROUP} -c "$vyatta_sbindir/vyatta-config-loader.pl $BOOTFILE" + ( + if [ -f /etc/default/vyatta-load-boot ]; then + # build-specific environment for boot-time config loading + source /etc/default/vyatta-load-boot + fi + sg ${GROUP} -c "$vyatta_sbindir/vyatta-config-loader.pl $BOOTFILE" + ) fi } |