summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeroen Roovers <jer@gentoo.org>2009-05-28 05:29:15 +0000
committerJeroen Roovers <jer@gentoo.org>2009-05-28 05:29:15 +0000
commit82d4e6fc53b44dab8d1ffe380629bfc8afcf94e5 (patch)
tree29e83fc06cf27db1f7e1a8a4023da3b9b74db37e /net-dialup/ppp
parentneeds -fno-strict-aliasing for proper function - reported by Cesar Garcia (bu... (diff)
downloadgentoo-2-82d4e6fc53b44dab8d1ffe380629bfc8afcf94e5.tar.gz
gentoo-2-82d4e6fc53b44dab8d1ffe380629bfc8afcf94e5.tar.bz2
gentoo-2-82d4e6fc53b44dab8d1ffe380629bfc8afcf94e5.zip
Stable for HPPA (bug #269127). Catch cases where /sbin/update-modules does not return 0 (like when /etc/modules.conf has not been automatically generated).
(Portage version: 2.2_rc33/cvs/Linux i686)
Diffstat (limited to 'net-dialup/ppp')
-rw-r--r--net-dialup/ppp/ChangeLog7
-rw-r--r--net-dialup/ppp/ppp-2.4.4-r22.ebuild10
2 files changed, 13 insertions, 4 deletions
diff --git a/net-dialup/ppp/ChangeLog b/net-dialup/ppp/ChangeLog
index 6b780a81c396..e19a4616c3d0 100644
--- a/net-dialup/ppp/ChangeLog
+++ b/net-dialup/ppp/ChangeLog
@@ -1,6 +1,11 @@
# ChangeLog for net-dialup/ppp
# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.240 2009/05/20 17:04:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ChangeLog,v 1.241 2009/05/28 05:29:15 jer Exp $
+
+ 28 May 2009; Jeroen Roovers <jer@gentoo.org> ppp-2.4.4-r22.ebuild:
+ Stable for HPPA (bug #269127). Catch cases where /sbin/update-modules does
+ not return 0 (like when /etc/modules.conf has not been automatically
+ generated).
20 May 2009; nixnut <nixnut@gentoo.org> ppp-2.4.4-r22.ebuild:
ppc stable #269127
diff --git a/net-dialup/ppp/ppp-2.4.4-r22.ebuild b/net-dialup/ppp/ppp-2.4.4-r22.ebuild
index 7378136082d5..8cb903ccf589 100644
--- a/net-dialup/ppp/ppp-2.4.4-r22.ebuild
+++ b/net-dialup/ppp/ppp-2.4.4-r22.ebuild
@@ -1,6 +1,6 @@
# Copyright 1999-2009 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r22.ebuild,v 1.7 2009/05/20 17:04:59 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dialup/ppp/ppp-2.4.4-r22.ebuild,v 1.8 2009/05/28 05:29:15 jer Exp $
EAPI="2"
@@ -14,7 +14,7 @@ SRC_URI="ftp://ftp.samba.org/pub/ppp/${P}.tar.gz
LICENSE="BSD GPL-2"
SLOT="0"
-KEYWORDS="alpha amd64 arm ~hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
IUSE="activefilter atm dhcp eap-tls gtk ipv6 mppe-mppc pam radius"
DEPEND="activefilter? ( >=virtual/libpcap-0.9.4 )
@@ -265,7 +265,11 @@ pkg_postinst() {
mknod "${ROOT}/dev/ppp" c 108 0
fi
if [ "$ROOT" = "/" ]; then
- [ -x /sbin/update-modules ] && /sbin/update-modules || /sbin/modules-update
+ if [ -x /sbin/update-modules ]; then
+ /sbin/update-modules
+ else
+ /sbin/modules-update
+ fi
fi
# create *-secrets files if not exists