- Arch-projects - lists.archlinux.org

[arch-projects] [netcfg] [PATCH] Add PPPoE connection support
by Thomas Bächler 10 Dec '11

10 Dec '11

--- docs/examples/pppoe | 31 ++++++++++++++++++++ src/connections/pppoe | 75 +++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 106 insertions(+), 0 deletions(-) create mode 100644 docs/examples/pppoe create mode 100644 src/connections/pppoe diff --git a/docs/examples/pppoe b/docs/examples/pppoe new file mode 100644 index 0000000..2f50029 --- /dev/null +++ b/docs/examples/pppoe @@ -0,0 +1,31 @@ +CONNECTION='pppoe' +DESCRIPTION='Example PPPoE connection' +INTERFACE='eth0' +USER='example(a)yourprovider.com' +PASSWORD='very secret' + +# Always keep a connection established +CONNECTION_MODE='persist' +# Establish connection on demand +#CONNECTION_MODE='demand' +#IDLE_TIMEOUT=300 + +# Use default route provided by the peer (default: true) +#DEFAULTROUTE=1 +# Use DNS provided by the peer (default: true) +#USEPEERDNS=1 + +# Override default LCP parameters from /etc/ppp/options +#LCP_ECHO_INTERVAL=15 +#LCP_ECHO_FAILURE=10 + +# PPPoE options - experts only +# +# PPPoE service name +#PPPOE_SERVICE='' +# PPPoE access concentrator name +#PPPOE_AC='' +# Attach to existing session (sessid:macaddr) +#PPPOE_SESSION='' +# Only connect to specified MAC address +#PPPOE_MAC='' diff --git a/src/connections/pppoe b/src/connections/pppoe new file mode 100644 index 0000000..07eb9ae --- /dev/null +++ b/src/connections/pppoe @@ -0,0 +1,75 @@ +#! /bin/bash +. /usr/lib/network/network + +_quotestring() { + echo "\"${1/\"/\\\"}\"" +} + +pppoe_up() { + local cfg + load_profile "$1" + + mkdir -p "$STATE_DIR"/pppoe.eth0."$1"/ + chmod 700 "$STATE_DIR"/pppoe.eth0."$1"/ + cfg="$STATE_DIR"/pppoe.eth0."$1"/options + : > "${cfg}" + chmod 600 "${cfg}" + + echo "plugin rp-pppoe.so" >> "${cfg}" + echo "nic-${INTERFACE}" >> "${cfg}" + if checkyesno ${DEFAULTROUTE:-1}; then + echo "defaultroute" >> "${cfg}" + else + echo "nodefaultroute" >> "${cfg}" + fi + if checkyesno ${USEPEERDNS:-1}; then + echo "usepeerdns" >> "${cfg}" + fi + echo "linkname $(_quotestring "$1")" >> "${cfg}" + echo "maxfail 5" >> "${cfg}" + echo "updetach" >> "${cfg}" + if [[ ${CONNECTION_MODE} == demand ]]; then + echo "demand" >> "${cfg}" + echo "idle ${IDLE_TIMEOUT}" >> "${cfg}" + else + echo "persist" >> "${cfg}" + fi + echo "user $(_quotestring "${USER}")" >> "${cfg}" + echo "password $(_quotestring "${PASSWORD}")" >> "${cfg}" + [[ -n ${LCP_ECHO_INTERVAL} ]] && echo "lcp-echo-interval ${LCP_ECHO_INTERVAL}" >> "${cfg}" + [[ -n ${LCP_ECHO_FAILURE} ]] && echo "lcp-echo-failure ${LCP_ECHO_FAILURE}" >> "${cfg}" + [[ -n ${PPPOE_SERVICE} ]] && echo "rp_pppoe_service $(_quotestring "${PPPOE_SERVICE}")" >> "${cfg}" + [[ -n ${PPPOE_AC} ]] && echo "rp_pppoe_ac $(_quotestring "${PPPOE_AC}")" >> "${cfg}" + [[ -n ${PPPOE_SESSION} ]] && echo "rp_pppoe_sess $(_quotestring "${PPPOE_SESSION}")" >> "${cfg}" + [[ -n ${PPPOE_MAC} ]] && echo "pppoe-mac $(_quotestring "${PPPOE_MAC}")" >> "${cfg}" + + /sbin/ip link set dev ${INTERFACE} up + /usr/sbin/pppd file "${cfg}" + + if [[ $? -ne 0 ]]; then + rm "${cfg}" + rmdir "$STATE_DIR"/pppoe.eth0."$1"/ + report_fail "Couldn't make pppd connection." + return 1 + fi +} + +pppoe_down() { + load_profile "$1" + local cfg + cfg="$STATE_DIR"/pppoe.eth0."$1"/options + PIDFILE="/var/run/ppp-$1.pid" + + if [[ -e $PIDFILE ]]; then + PID=$(cat "$PIDFILE") + [[ -n "$PID" ]] && kill "$PID" + fi + + rm "${cfg}" + rmdir "$STATE_DIR"/pppoe.eth0."$1"/ +} + +pppoe_$1 "$2" +exit $? + +# vim: ft=sh ts=4 et sw=4: -- 1.7.8

3 3

[arch-projects] Handling interruptions
by Alexander Rødseth 09 Dec '11

09 Dec '11

Hi, Hope this is the right ml this time. ;) Added a few lines of code that handles the situation somewhat cleaner if a user presses ctrl-c while namcap is running. Best regards, Alexander Rødseth

2 2

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.11.3-9-g95dbc66
by tomegun＠archlinux.org 08 Dec '11

08 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via 95dbc66b2334e8d42bbc605d86e6526445cbf1e4 (commit) via 68c0d213401b6f8173248b69fe0a8459e7758ed8 (commit) from 88a671ee26112e779a455bdd266a7071e1db5a1f (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 95dbc66b2334e8d42bbc605d86e6526445cbf1e4 Merge: 88a671e 68c0d21 Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Dec 8 21:57:35 2011 +0100 Merge remote-tracking branch 'falconindy/master' commit 68c0d213401b6f8173248b69fe0a8459e7758ed8 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Nov 27 23:15:29 2011 -0500 locale.sh: unset LANG before sourcing {locale,rc}.conf If we source locale.sh with a LANG already set and locale.conf doesn't exist, we may never properly set the locale according rc.conf. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: locale.sh | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.11.3-7-g88a671e
by tomegun＠archlinux.org 08 Dec '11

08 Dec '11

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Arch Linux initscripts repository". The branch, master has been updated via 88a671ee26112e779a455bdd266a7071e1db5a1f (commit) via 90189ad959eb55fe959b4e8eaf7c7da5d9630cf5 (commit) from ed5cc9cb9ba777e2fe0d73a65c66d304f118dffc (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- commit 88a671ee26112e779a455bdd266a7071e1db5a1f Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Dec 8 21:08:32 2011 +0100 /run: move /var/{run,lock} to /run/{,lock} All packages in core/extra now supports this, and keeping them separated might soon cause problems (in particular, I submitted a patch to rpcbind that would cause problems if the symlinks are not in place). Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 90189ad959eb55fe959b4e8eaf7c7da5d9630cf5 Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Nov 27 01:09:49 2011 +0100 do not limit size on API fs These are all owned by root, so risk of DoS is low. Also, running out of space on the fs' would be more critical than running low on memory. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 15 +++++++++------ rc.sysinit | 6 +++--- tmpfiles.conf | 2 +- 3 files changed, 13 insertions(+), 10 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] Do we still need 'whoneeds'?
by Karol Blazewicz 08 Dec '11

08 Dec '11

pactree can print reverse dependency tree since pacman 3.4: http://projects.archlinux.org/pacman.git/tree/NEWS?id=v3.4.0 comm -12 <(pactree -lru $1|sort) <(pacman -Qqe|sort) | grep -v $1 is much faster than 'whoneeds $1' for bigger dep trees: 0.15 sec v. 10 sec. for 'whoneeds zlib' on my system (Pentium 4 @ 2 GHz). 'whoneeds' prints 'Packages that depend on [$1]' as the first line of output, the one-liner I came up with does not.

2 1

[arch-projects] arch-projects@archlinux.org Rolex Today -11%
by arch-projects＠archlinux.org 05 Dec '11

05 Dec '11

1 0

[arch-projects] [devtools] [PATCH] Sets usage message format to `usage: ...'
by Ricardo Catalinas Jiménez 04 Dec '11

04 Dec '11

Sets the same usage message format in all the tools. Signed-off-by: Ricardo Catalinas Jiménez <jimenezrick(a)gmail.com> --- archbuild.in | 2 +- archco.in | 2 +- archrelease.in | 2 +- archrm.in | 2 +- makechrootpkg.in | 2 +- mkarchroot.in | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/archbuild.in b/archbuild.in index 502654c..b309ae2 100644 --- a/archbuild.in +++ b/archbuild.in @@ -19,7 +19,7 @@ chroots='/var/tmp/archbuild' clean_first=false usage() { - echo "usage $cmd" + echo "usage: $cmd" echo ' -c Recreate the chroot before building' echo ' -r <dir> Create chroots in this directory' exit 1 diff --git a/archco.in b/archco.in index be026b1..9a7d258 100644 --- a/archco.in +++ b/archco.in @@ -5,7 +5,7 @@ m4_include(lib/common.sh) scriptname=${0##*/} if [ "$1" = '' ]; then - echo 'Usage: '$scriptname' <package name>...' + echo 'usage: '$scriptname' <package name>...' exit 1 fi diff --git a/archrelease.in b/archrelease.in index 40b6c09..b9f3378 100644 --- a/archrelease.in +++ b/archrelease.in @@ -3,7 +3,7 @@ m4_include(lib/common.sh) if [[ -z $1 ]]; then - echo 'Usage: archrelease <repo>...' + echo 'usage: archrelease <repo>...' exit 1 fi diff --git a/archrm.in b/archrm.in index a4830ee..ca33053 100644 --- a/archrm.in +++ b/archrm.in @@ -3,7 +3,7 @@ m4_include(lib/common.sh) if [ "$1" = '' ]; then - echo 'Usage: archrm <path to checkout>' + echo 'usage: archrm <path to checkout>' exit 1 fi diff --git a/makechrootpkg.in b/makechrootpkg.in index 8a4b143..625ee0f 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -26,7 +26,7 @@ default_copy=$USER [[ -z $default_copy || $default_copy = root ]] && default_copy=copy usage() { - echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]" + echo "usage: ${0##*/} [options] -r <chrootdir> [--] [makepkg args]" echo ' Run this script in a PKGBUILD dir to build a package inside a' echo ' clean chroot. All unrecognized arguments passed to this script' echo ' will be passed to makepkg.' diff --git a/mkarchroot.in b/mkarchroot.in index c35ba5b..051918f 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -20,7 +20,7 @@ APPNAME=$(basename "${0}") # usage: usage <exitvalue> usage() { - echo "usage ${APPNAME} [options] working-dir [package-list | app]" + echo "usage: ${APPNAME} [options] working-dir [package-list | app]" echo ' options:' echo ' -r <app> Run "app" within the context of the chroot' echo ' -u Update the chroot via pacman' -- 1.7.7.4

3 3

[arch-projects] [devtools][PATCH] archbuild: explicitly exit with makechrootpkg's return
by Dave Reisner 04 Dec '11

04 Dec '11

This fixes a compound command such as the one below from continuing even if the first fails. extra-x86_64-build && extra-i686-build The problem is that the EXIT trap is fired if we let the script run to completion. Instead, explicitly call cleanup with the return of the makechrootpkg call to properly exit with error. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- archbuild.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/archbuild.in b/archbuild.in index 502654c..733a79a 100644 --- a/archbuild.in +++ b/archbuild.in @@ -84,3 +84,4 @@ fi msg "Building in chroot for [${repo}] (${arch})..." setarch "${arch}" makechrootpkg -c -n -r "${chroots}/${repo}-${arch}" +cleanup $? -- 1.7.8

2 4

[arch-projects] [devtools] [PATCH] makearchroot: source /etc/profile before building
by Allan McRae 04 Dec '11

04 Dec '11

This ensures the PATH used when building is the default path and not the value set by the user calling makechrootpkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- makechrootpkg.in | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/makechrootpkg.in b/makechrootpkg.in index 8a4b143..c5d57e5 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -264,6 +264,7 @@ echo 'LANG=C' > "$copydir/etc/locale.conf" # working copy cat >"$copydir/chrootbuild" <<EOF #!/bin/bash +. /etc/profile export LANG=C export HOME=/build -- 1.7.7.4

2 1

[arch-projects] [devtools] [PATCH] Makefile: Remove output files before replacing them
by Lukas Fleischer 02 Dec '11

02 Dec '11

This one fixes all the "Permission denied" errors we got when invoking make(1) after modifying a source file and removes the need to delete the generated scripts manually. Signed-off-by: Lukas Fleischer <archlinux(a)cryptocrack.de> --- Makefile | 1 + 1 files changed, 1 insertions(+), 0 deletions(-) diff --git a/Makefile b/Makefile index cbc7402..d9cc82a 100644 --- a/Makefile +++ b/Makefile @@ -54,6 +54,7 @@ edit = sed -e "s|@pkgdatadir[@]|$(DESTDIR)$(PREFIX)/share/devtools|g" %: %.in Makefile lib/common.sh @echo "GEN $@" + @$(RM) "$@" @m4 -P $@.in | $(edit) >$@ @chmod a-w "$@" @chmod +x "$@" -- 1.7.7.4

1 0