diff options
| author |   Andrew Savchenko <bircoph@gmail.com> | 2011-01-21 16:50:49 +0300 |
|---|---|---|
| committer | Andrew Savchenko <bircoph@gmail.com> | 2011-01-21 16:50:49 +0300 |
| commit | 3d5e9b65faef6a0218eb4c2dd03f8bb2e384dfb6 (patch) | |
| tree | e46882b95cb8a17f3bd741cd86b68e4e5e5ad782 /net-dialup/openl2tp | |
| parent | virtual/jpeg: remove packages fixed upstream (diff) | |
| download | bircoph-3d5e9b65faef6a0218eb4c2dd03f8bb2e384dfb6.tar.gz bircoph-3d5e9b65faef6a0218eb4c2dd03f8bb2e384dfb6.tar.bz2 bircoph-3d5e9b65faef6a0218eb4c2dd03f8bb2e384dfb6.zip | |
openl2tpd: update init script
Use intelligent delay for l2tpconfig config restore option.
Diffstat (limited to 'net-dialup/openl2tp')
| -rw-r--r-- | net-dialup/openl2tp/ChangeLog | 9 | ||||
| -rw-r--r-- | net-dialup/openl2tp/Manifest | 6 | ||||
| -rw-r--r-- | net-dialup/openl2tp/files/openl2tpd.initd | 13 | ||||
| -rw-r--r-- | net-dialup/openl2tp/openl2tp-1.8-r2.ebuild (renamed from net-dialup/openl2tp/openl2tp-1.8-r1.ebuild) | 0 |
4 files changed, 21 insertions, 7 deletions
diff --git a/net-dialup/openl2tp/ChangeLog b/net-dialup/openl2tp/ChangeLog index f6568d2..b66d413 100644 --- a/net-dialup/openl2tp/ChangeLog +++ b/net-dialup/openl2tp/ChangeLog @@ -1,7 +1,14 @@ # ChangeLog for dev-util/symlookup -# Copyright 2000-2010 Gentoo Foundation; Distributed under the GPL v2 +# Copyright 2000-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*openl2tp-1.8-r2.ebuild (21 Jan 2011) + + 21 Jan 2011; Andrew Savchenko <bircoph@gmail.com> + +openl2tp-1.8-r2.ebuild, -openl2tp-1.8-r1.ebuild, + files/openl2tpd.initd: + Use intelligent delay for l2tp config restore. + 07 Nov 2010; Andrew Savchenko <bircoph@gmail.com> openl2tp-1.8-r1.ebuild: Use examples by default, as most people will need that. diff --git a/net-dialup/openl2tp/Manifest b/net-dialup/openl2tp/Manifest index 3d31818..894be18 100644 --- a/net-dialup/openl2tp/Manifest +++ b/net-dialup/openl2tp/Manifest @@ -10,12 +10,12 @@ AUX openl2tp-1.8-pppd.patch 846 RMD160 8ac9afbee793d60a1682364a00e1e2d409d17fae AUX openl2tp-1.8-werror.patch 1466 RMD160 85df32f171301bce175557ef078ae681d2b51d3d SHA1 c7e36dbe97a8c4fff199cb6a769fa7bb17f6bfc4 SHA256 5da5272f697d803c71256f298070c3a9783c1e8e43c890576a4615a407e069aa AUX openl2tpd.conf.sample 678 RMD160 34f2e81c2e1f810041eebf6859fb661105643428 SHA1 540606a185775d86137faff790bc54b905a297e0 SHA256 8f6b6bd8150b2275e3b0886fbe38fe79dc83870fc6d6ae848bdebda42e70d4a4 AUX openl2tpd.confd 627 RMD160 c98ef7bdcca067cab855b43f4c28d7db5651dbee SHA1 ab72ca17e0f3b1d8839bc1a644c11f160529bc9d SHA256 9bea610cf2614bdd6c2f371987f98f8c9b854dd8332d33647505c895ae9a7314 -AUX openl2tpd.initd 1453 RMD160 14e2cdb45f0ecdea34f6900c48fd4408ab1df13d SHA1 f35b1573a7c07ed12e6e47c57267436d84aae21e SHA256 94360b8d62f5b1544132fa75601f75252da58371d100bb3aaa6e633996d468b5 +AUX openl2tpd.initd 1688 RMD160 41179b0e7a1640aab545f85cd5d5dfbf2a0ff0b2 SHA1 590d8698344ea540301855a492c272d021257229 SHA256 09b5bfc7a5ade30dd7ebb4b87af09a28e3a7e9c65c09fd066c24528b1d29ba1e DIST openl2tp-1.7.tar.gz 501698 RMD160 5a85297060338fc24230582fc3674638d1778634 SHA1 f79e5229b8501664e98bac8229a6d8547b43467b SHA256 f6ae19e19340144ba28c31c55f4667fb180b61ee76ccef2bf63fa62f297ca9da DIST openl2tp-1.8.tar.gz 491160 RMD160 29913730809f7ea670c994c175551f31f2ba1e6f SHA1 314a8bb70f9f06bac840200fac0916e80d8d06b3 SHA256 1c97704d4b963a87fbc0e741668d4530933991515ae9ab0dffd11b5444f4860f EBUILD openl2tp-1.7-r2.ebuild 4524 RMD160 f6178d15b08792bd903380608afbcf219f7ad135 SHA1 2f48ed0226a069686e52fbaf652ce78b29e29a5c SHA256 bfec8d97b9c2e3d4dcaa0530ef1c9e03deae0dcb483f413cd28f0f38d80c7a87 EBUILD openl2tp-1.7.ebuild 4023 RMD160 02a1e7c3d22fd527a4345d0081d1db5b913f1251 SHA1 dade51741323c117dda0ec7a65e1dca4f7ff4a6a SHA256 8dbb74457a705b07470b24f7dcc18968ac6d039aef57e8363341cfb3418b9865 -EBUILD openl2tp-1.8-r1.ebuild 4292 RMD160 1fdbb0db2f0a026433eb6aeeb3e3d17bfafed88b SHA1 7b2aedf2704ba8309192b93385672a525017ce25 SHA256 6543aafaa4cde10c776bf48e5cc37734fa52b46e66ce7d421846db836bdee014 +EBUILD openl2tp-1.8-r2.ebuild 4292 RMD160 1fdbb0db2f0a026433eb6aeeb3e3d17bfafed88b SHA1 7b2aedf2704ba8309192b93385672a525017ce25 SHA256 6543aafaa4cde10c776bf48e5cc37734fa52b46e66ce7d421846db836bdee014 EBUILD openl2tp-1.8.ebuild 4291 RMD160 7f50b82a01275bf8cc1617572d489541d933e042 SHA1 6c36f42f784c6130fc223359f88f821063f98b77 SHA256 241b407ea1f753bde73313fdd308a39e72139a35f86c1d01d5fc0d81f1c3e70e -MISC ChangeLog 1742 RMD160 e4ce54812f7640d2c5e50ce0be6eb0baf86ab314 SHA1 4ac3745b292c858ac12b422933943bdfa5b2df39 SHA256 e24ed1366aab39b34301db686d4c3e26f1bc20c1dfb88ae75a2870a9e8b75b08 +MISC ChangeLog 1961 RMD160 9d67aadb7131c9fb178dd9e99ebe9f29081ee39f SHA1 29b424bb1363b1411d5790fd1c6b9dd34f7bfb04 SHA256 c8877671d7188049623094b04eccd087a2ccd661f3c4fa416f9812bfad972f45 MISC metadata.xml 762 RMD160 416cd2087fe041e02046f07bb6c1677908542c37 SHA1 302dc937814f7d4c32ad16c0300020794f519c0e SHA256 e765957111816f91553fd3db2fef165babdd02ee82d923da6f5b455b684afd72 diff --git a/net-dialup/openl2tp/files/openl2tpd.initd b/net-dialup/openl2tp/files/openl2tpd.initd index a549ad0..08e9e06 100644 --- a/net-dialup/openl2tp/files/openl2tpd.initd +++ b/net-dialup/openl2tp/files/openl2tpd.initd @@ -4,6 +4,8 @@ opts="start stop restart" userpc="yes" +retry_count="40" +retry_delay="0.5" bin=/usr/sbin/openl2tpd pid=/var/run/openl2tpd.pid @@ -40,10 +42,15 @@ start() { # it is possible to not to have config at all if [[ $userpc == "yes" ]] && [[ -r "${OPENL2TPD_CONFIG_FILE}" ]]; then - sleep 0.5 - l2tpconfig config restore file="${OPENL2TPD_CONFIG_FILE}" + # on system startup it may take some time to load daemon + for (( i=0; i<$retry_count; i++ )); do + l2tpconfig config restore file="${OPENL2TPD_CONFIG_FILE}" >/dev/null 2>&1 + retcode=$? + [[ $retcode == 0 ]] && break + sleep $retry_delay + done fi - eend $? + eend $retcode } stop() { diff --git a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild b/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild index 2450510..2450510 100644 --- a/net-dialup/openl2tp/openl2tp-1.8-r1.ebuild +++ b/net-dialup/openl2tp/openl2tp-1.8-r2.ebuild |