diff options
author | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-30 14:38:27 -0700 |
---|---|---|
committer | Stephen Hemminger <stephen.hemminger@vyatta.com> | 2009-03-30 14:38:27 -0700 |
commit | 5cb88ace0f9e2da94d3c535b69413b8cf6fa781c (patch) | |
tree | d34655f86fdfc95b64479a4bec04adfb912ad853 | |
parent | 131807f7dc6305b293bd1182d3499badb907a0dc (diff) | |
parent | ff5d01eb64f28caea37aff39c7d4c23d1c6a1325 (diff) | |
download | vyatta-cfg-qos-5cb88ace0f9e2da94d3c535b69413b8cf6fa781c.tar.gz vyatta-cfg-qos-5cb88ace0f9e2da94d3c535b69413b8cf6fa781c.zip |
Merge branch 'jenner' of 192.168.100.1:git/vyatta-cfg-qos into jenner
-rw-r--r-- | Makefile.am | 1 | ||||
-rwxr-xr-x[-rw-r--r--] | scripts/ppp/qos (renamed from etc/ppp/ip-up.d/20qos) | 0 |
2 files changed, 1 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 21b5a63..c4f1347 100644 --- a/Makefile.am +++ b/Makefile.am @@ -31,6 +31,7 @@ clean-local: install-exec-hook: mkdir -p $(DESTDIR)$(cfgdir) mkdir -p $(DESTDIR)/etc/ppp/ip-up.d + install -m 0755 scripts/ppp/qos $(DESTDIR)/etc/ppp/ip-up.d cd templates; $(cpiop) $(DESTDIR)$(cfgdir) cd $(gentmpdir); $(cpiop) $(DESTDIR)$(cfgdir) diff --git a/etc/ppp/ip-up.d/20qos b/scripts/ppp/qos index af5f9c4..af5f9c4 100644..100755 --- a/etc/ppp/ip-up.d/20qos +++ b/scripts/ppp/qos |