summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlin Năstac <mrness@gentoo.org>2004-11-11 06:20:53 +0000
committerAlin Năstac <mrness@gentoo.org>2004-11-11 06:20:53 +0000
commitdaa550cc387b858b56df6bf0bf1e067f9d030450 (patch)
treed6bfe2e2df3ea32b1c53155cdc4aa4f43d0912a1 /net-dialup/isdn4k-utils
parentcreate resolv.conf with world readable (Manifest recommit) (diff)
downloadgentoo-2-daa550cc387b858b56df6bf0bf1e067f9d030450.tar.gz
gentoo-2-daa550cc387b858b56df6bf0bf1e067f9d030450.tar.bz2
gentoo-2-daa550cc387b858b56df6bf0bf1e067f9d030450.zip
merge with scripts from ppp ebuild; create resolv.conf with world readable
Diffstat (limited to 'net-dialup/isdn4k-utils')
-rw-r--r--net-dialup/isdn4k-utils/ChangeLog6
-rw-r--r--net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down8
-rw-r--r--net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up26
3 files changed, 22 insertions, 18 deletions
diff --git a/net-dialup/isdn4k-utils/ChangeLog b/net-dialup/isdn4k-utils/ChangeLog
index b6ff9436a98c..d98ead973de3 100644
--- a/net-dialup/isdn4k-utils/ChangeLog
+++ b/net-dialup/isdn4k-utils/ChangeLog
@@ -1,6 +1,10 @@
# ChangeLog for net-dialup/isdn4k-utils
# Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.27 2004/11/10 21:30:05 mrness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/isdn4k-utils/ChangeLog,v 1.28 2004/11/11 06:20:53 mrness Exp $
+
+ 11 Nov 2004; Alin Nastac <mrness@gentoo.org>
+ files/3.5_p20041024/ip-down, files/3.5_p20041024/ip-up:
+ Merge with ppp scripts: ip-up create resolv.conf with world readable.
*isdn4k-utils-3.5_p20041024-r1 (10 Nov 2004)
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down
index ab5264cd361e..52ae93395c14 100644
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-down
@@ -19,10 +19,10 @@ if [ "$USEPEERDNS" ]; then
if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
- # if an old resolv.conf file exists, restore it
- if [ -e $REALRESOLVCONF.pppd-backup ]; then
- mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
- fi
+ # if an old resolv.conf file exists, restore it
+ if [ -e $REALRESOLVCONF.pppd-backup ]; then
+ mv $REALRESOLVCONF.pppd-backup $REALRESOLVCONF
+ fi
fi
diff --git a/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up
index 760a4e57846d..4f16ae3220f6 100644
--- a/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up
+++ b/net-dialup/isdn4k-utils/files/3.5_p20041024/ip-up
@@ -21,19 +21,19 @@ if [ "$USEPEERDNS" ]; then
if [ "$REALRESOLVCONF" != "/etc/ppp/resolv.conf" ]; then
- # merge the new nameservers with the other options from the old configuration
- {
- grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
- cat /etc/ppp/resolv.conf
- } > $REALRESOLVCONF.tmp
-
- # backup the old configuration and install the new one
- cp -a $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
- mv $REALRESOLVCONF.tmp $REALRESOLVCONF
-
- # correct permissions
- chmod 640 /etc/resolv.conf
- chown root:users /etc/resolv.conf
+ # merge the new nameservers with the other options from the old configuration
+ {
+ grep --invert-match '^nameserver[[:space:]]' $REALRESOLVCONF
+ cat /etc/ppp/resolv.conf
+ } > $REALRESOLVCONF.tmp
+
+ # backup the old configuration and install the new one
+ cp -a $REALRESOLVCONF $REALRESOLVCONF.pppd-backup
+ mv $REALRESOLVCONF.tmp $REALRESOLVCONF
+
+ # correct permissions
+ chmod 644 /etc/resolv.conf
+ chown root:root /etc/resolv.conf
fi