projects / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| a373e543 SS |
1 | From b4ef433be936c90e356da7a590b032cdee219a3f Mon Sep 17 00:00:00 2001 |
| 2 | From: Michal Sekletar <msekleta@redhat.com> | |
| 3 | Date: Fri, 4 Apr 2014 19:06:05 +0200 | |
| 4 | Subject: [PATCH 11/25] build-sys: don't put connect-errors log to /etc/ppp/ | |
| 5 | ||
| 6 | Resolves: #118837 | |
| 7 | --- | |
| 8 | chat/chat.8 | 2 +- | |
| 9 | linux/Makefile.top | 8 +++++++- | |
| 10 | pppd/pathnames.h | 4 ++-- | |
| 11 | 3 files changed, 10 insertions(+), 4 deletions(-) | |
| 12 | ||
| 13 | diff --git a/chat/chat.8 b/chat/chat.8 | |
| 14 | index 6d10836..78d6939 100644 | |
| 15 | --- a/chat/chat.8 | |
| 16 | +++ b/chat/chat.8 | |
| 17 | @@ -200,7 +200,7 @@ The \fBSAY\fR directive allows the script to send strings to the user | |
| fa4c11b5 MT |
18 | at the terminal via standard error. If \fBchat\fR is being run by |
| 19 | pppd, and pppd is running as a daemon (detached from its controlling | |
| 20 | terminal), standard error will normally be redirected to the file | |
| 21 | -/etc/ppp/connect\-errors. | |
| 22 | +/var/log/ppp/connect\-errors. | |
| 23 | .LP | |
| 24 | \fBSAY\fR strings must be enclosed in single or double quotes. If | |
| 25 | carriage return and line feed are needed in the string to be output, | |
| a373e543 SS |
26 | diff --git a/linux/Makefile.top b/linux/Makefile.top |
| 27 | index f63d45e..f42efd5 100644 | |
| 28 | --- a/linux/Makefile.top | |
| 29 | +++ b/linux/Makefile.top | |
| fa4c11b5 MT |
30 | @@ -5,6 +5,8 @@ BINDIR = $(DESTDIR)/sbin |
| 31 | INCDIR = $(DESTDIR)/include | |
| 32 | MANDIR = $(DESTDIR)/share/man | |
| 33 | ETCDIR = $(INSTROOT)@SYSCONF@/ppp | |
| 34 | +RUNDIR = $(DESTDIR)/var/run/ppp | |
| 35 | +LOGDIR = $(DESTDIR)/var/log/ppp | |
| 36 | ||
| 37 | # uid 0 = root | |
| 38 | INSTALL= install | |
| 39 | @@ -16,7 +18,7 @@ all: | |
| 40 | cd pppstats; $(MAKE) $(MFLAGS) all | |
| 41 | cd pppdump; $(MAKE) $(MFLAGS) all | |
| 42 | ||
| 43 | -install: $(BINDIR) $(MANDIR)/man8 install-progs install-devel | |
| 44 | +install: $(BINDIR) $(RUNDIR) $(LOGDIR) $(MANDIR)/man8 install-progs install-devel | |
| 45 | ||
| 46 | install-progs: | |
| 47 | cd chat; $(MAKE) $(MFLAGS) install | |
| 48 | @@ -44,6 +46,10 @@ $(MANDIR)/man8: | |
| 49 | $(INSTALL) -d -m 755 $@ | |
| 50 | $(ETCDIR): | |
| 51 | $(INSTALL) -d -m 755 $@ | |
| 52 | +$(RUNDIR): | |
| 53 | + $(INSTALL) -d -m 755 $@ | |
| 54 | +$(LOGDIR): | |
| 55 | + $(INSTALL) -d -m 755 $@ | |
| 56 | ||
| 57 | clean: | |
| 58 | rm -f `find . -name '*.[oas]' -print` | |
| a373e543 SS |
59 | diff --git a/pppd/pathnames.h b/pppd/pathnames.h |
| 60 | index a427cb8..bef3160 100644 | |
| 61 | --- a/pppd/pathnames.h | |
| 62 | +++ b/pppd/pathnames.h | |
| 63 | @@ -28,9 +28,9 @@ | |
| 64 | #define _PATH_AUTHUP _ROOT_PATH "/etc/ppp/auth-up" | |
| 65 | #define _PATH_AUTHDOWN _ROOT_PATH "/etc/ppp/auth-down" | |
| 66 | #define _PATH_TTYOPT _ROOT_PATH "/etc/ppp/options." | |
| 67 | -#define _PATH_CONNERRS _ROOT_PATH "/etc/ppp/connect-errors" | |
| 68 | +#define _PATH_CONNERRS _ROOT_PATH "/var/log/ppp/connect-errors" | |
| 69 | #define _PATH_PEERFILES _ROOT_PATH "/etc/ppp/peers/" | |
| 70 | -#define _PATH_RESOLV _ROOT_PATH "/etc/ppp/resolv.conf" | |
| 71 | +#define _PATH_RESOLV _ROOT_PATH "/var/run/ppp/resolv.conf" | |
| 72 | ||
| 73 | #define _PATH_USEROPT ".ppprc" | |
| 74 | #define _PATH_PSEUDONYM ".ppp_pseudonym" | |
| 75 | -- | |
| 76 | 1.8.3.1 | |
| 77 |