- Arch-projects - lists.archlinux.org

[arch-projects] [netcfg][PATCH] Better error handling in automatic connect scripts
by Tasos Latsas 09 Aug '12

09 Aug '12

Signed-off-by: Tasos Latsas <tlatsas2000(a)gmail.com> --- rc.d/net-auto-wired | 8 +++----- rc.d/net-auto-wireless | 8 +++----- 2 files changed, 6 insertions(+), 10 deletions(-) diff --git a/rc.d/net-auto-wired b/rc.d/net-auto-wired index 859e57d..d3c4c5a 100755 --- a/rc.d/net-auto-wired +++ b/rc.d/net-auto-wired @@ -6,14 +6,12 @@ . /etc/conf.d/netcfg if [[ ! -x /usr/sbin/ifplugd ]]; then - echo "Please install 'ifplugd' to use net-auto-wired" - exit 1 + exit_stderr "Please install 'ifplugd' to use net-auto-wired" fi if [[ -z "${WIRED_INTERFACE}" ]]; then - echo "No interface name set. Add to /etc/conf.d/netcfg a line" - echo " WIRED_INTERFACE=\"your_interface\"" - exit 1 + exit_stderr "No interface name set. Add to /etc/conf.d/netcfg a line \ +WIRED_INTERFACE=\"your_interface\"" fi CFG=/etc/ifplugd/ifplugd.conf diff --git a/rc.d/net-auto-wireless b/rc.d/net-auto-wireless index 79c43b0..6cfbd10 100755 --- a/rc.d/net-auto-wireless +++ b/rc.d/net-auto-wireless @@ -6,14 +6,12 @@ . /etc/conf.d/netcfg if [[ ! -x /usr/sbin/wpa_actiond ]]; then - echo "Please install 'wpa_actiond' to use net-auto-wireless" - exit 1 + exit_stderr "Please install 'wpa_actiond' to use net-auto-wireless" fi if [[ -z "${WIRELESS_INTERFACE}" ]]; then - echo "No interface name set. Add to /etc/conf.d/netcfg a line" - echo " WIRELESS_INTERFACE=\"your_interface\"" - exit 1 + exit_stderr "No interface name set. Add to /etc/conf.d/netcfg a line \ +WIRELESS_INTERFACE=\"your_interface\"" fi case "$1" in -- 1.7.11.4

2 2

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.8-7-g890a3c4
by jouke＠archlinux.org 09 Aug '12

09 Aug '12

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 "netcfg network scripts repository". The branch, master has been updated via 890a3c483644858615027c4f0358bbfb4e51f05f (commit) via 7b8dee2209da8a0db1722562fc33fad336eafc8d (commit) via 11ba258a774f72818b4c79fbc61596fe5880e837 (commit) via 0b35da2fde29d7cafceb205523df130903645b72 (commit) via 1dd23ef9398433b38c488b6ef24660a8931be870 (commit) via ec0fb097b62d5861d382f56ce03246a51076bdfe (commit) from fd096b445062eea02c20595ed863ce891b313779 (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 890a3c483644858615027c4f0358bbfb4e51f05f Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Aug 9 17:22:03 2012 +0200 2.8.9 release updates commit 7b8dee2209da8a0db1722562fc33fad336eafc8d Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Aug 8 12:36:30 2012 +0200 Fix key handling in netcfg Mainly a regression (7e2ff). commit 11ba258a774f72818b4c79fbc61596fe5880e837 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Aug 8 12:35:02 2012 +0200 Small code review commit 0b35da2fde29d7cafceb205523df130903645b72 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Aug 8 12:31:24 2012 +0200 End initscripts compatibility The recent ovrhaul of rc.conf in initscripts is a good point to enforce using the proper configuration files for netcfg as well. commit 1dd23ef9398433b38c488b6ef24660a8931be870 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Aug 8 12:27:33 2012 +0200 Set the IPv6 gateway after DAD Using gateways for which NDP used to discover routes during the latency of netcfg no longer works (https://bbs.archlinux.org/viewtopic.php?id=145923) Such routes can now be added manually. commit ec0fb097b62d5861d382f56ce03246a51076bdfe Author: Tasos Latsas <tlatsas2000(a)gmail.com> Date: Wed Aug 8 11:30:05 2012 +0300 Better error handling in automatic connect scripts Signed-off-by: Tasos Latsas <tlatsas2000(a)gmail.com> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 5 +++++ contrib/PKGBUILD | 7 +++++-- rc.d/net-auto-wired | 8 +++----- rc.d/net-auto-wireless | 8 +++----- scripts/netcfg | 1 + scripts/wifi-menu | 10 +++++----- src/8021x | 17 ++++------------- src/connections/ethernet | 18 ++++++++++-------- src/hooks/initscripts | 15 +-------------- 10 files changed, 38 insertions(+), 53 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [abs] [PATCH] PKGBUILD-perl.proto: Download sources by module instead of by author
by jstjohn＠purdue.edu 07 Aug '12

07 Aug '12

From: "Jason St. John" <jstjohn(a)purdue.edu> CPAN apparently changed the by-authors download URL structures because http://cpan.perl.org/modules/by-authors/id/$_author/ does not work anymore. The directory structure appears to be 'by-authors/id/<first letter>/<first two letters>/$_author', which significantly reduces the usefulness of _author in the default PKGBUILD. I changed the source array to download by module instead of by author to make things simple. The _author variable is no longer needed, and I added a _modnamespace variable to handle CPAN's URL format. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- prototypes/PKGBUILD-perl.proto | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/prototypes/PKGBUILD-perl.proto b/prototypes/PKGBUILD-perl.proto index c4260fb..fb90023 100644 --- a/prototypes/PKGBUILD-perl.proto +++ b/prototypes/PKGBUILD-perl.proto @@ -8,16 +8,20 @@ # # In most cases, 'arch' should be 'any' because most Perl packages are # architecture independent. +# +# _modnamespace is for the module's namespace. For example, use "Text" if the +# module name is Text::CSV::Unicode. +# # Maintainer: Your Name <youremail(a)domain.com> -_author=AUTHOR_NAME _perlmod=MODNAME +_modnamespace=MODULE-NAMESPACE pkgname=perl-$_perlmod pkgver=VERSION pkgrel=1 pkgdesc="" arch=('any') -url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/" +url="http://search.cpan.org/dist/$_perlmod" license=('GPL' 'PerlArtistic') groups=() depends=('perl>=5.10.0') @@ -28,7 +32,7 @@ replaces=() backup=() options=('!emptydirs') install= -source=("http://cpan.perl.org/modules/by-authors/id/$_author/$_perlmod-$pkgver.tar.gz") +source=("http://cpan.perl.org/modules/by-module/$_modnamespace/$_perlmod-$pkgver.tar…") md5sums=() build() { -- 1.7.11.4

1 0

[arch-projects] [PATCH] [abs] PKGBUILD-perl.proto: Set default arch=('any')
by jstjohn＠purdue.edu 07 Aug '12

07 Aug '12

From: "Jason St. John" <jstjohn(a)purdue.edu> Most Perl modules are going to be architecture independent, so to make packge listings clearer in the long run (less unnecessary architecture-specific packages), setting arch=('any') by default seems to make sense. Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- prototypes/PKGBUILD-perl.proto | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/prototypes/PKGBUILD-perl.proto b/prototypes/PKGBUILD-perl.proto index c32a65a..c4260fb 100644 --- a/prototypes/PKGBUILD-perl.proto +++ b/prototypes/PKGBUILD-perl.proto @@ -2,9 +2,12 @@ # and remove these comments. For more information, see 'man PKGBUILD'. # NOTE: Please fill out the license field for your package! If it is unknown, # then please put 'unknown'. - -# See http://wiki.archlinux.org/index.php/Perl_Package_Guidelines for more +# +# See https://wiki.archlinux.org/index.php/Perl_Package_Guidelines for more # information on Perl packaging. +# +# In most cases, 'arch' should be 'any' because most Perl packages are +# architecture independent. # Maintainer: Your Name <youremail(a)domain.com> _author=AUTHOR_NAME @@ -13,7 +16,7 @@ pkgname=perl-$_perlmod pkgver=VERSION pkgrel=1 pkgdesc="" -arch=() +arch=('any') url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/" license=('GPL' 'PerlArtistic') groups=() @@ -23,9 +26,9 @@ provides=() conflicts=() replaces=() backup=() -options=(!emptydirs) +options=('!emptydirs') install= -source=(http://cpan.perl.org/modules/by-authors/id/$_author/$_perlmod-$pkgver.tar.gz) +source=("http://cpan.perl.org/modules/by-authors/id/$_author/$_perlmod-$pkgver.tar.gz") md5sums=() build() { -- 1.7.11.4

1 0

[arch-projects] [dbscripts] [GIT] Official repo DB scripts annotated tag 20120805 created. 20120805
by pierre＠archlinux.org 05 Aug '12

05 Aug '12

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 "Official repo DB scripts". The annotated tag, 20120805 has been created at c1913555a6baafbc55f9bc05eb0a0f0a1717b0e7 (tag) tagging 332346d06375c1272bee6dce2c91d31a027fe212 (commit) replaces 20120616 tagged by Pierre Schmitz on Sun Aug 5 12:19:53 2012 +0200 - Log ----------------------------------------------------------------- tagging -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJQHkjNAAoJEH8tQ0uXQeisnJYH/3TXqjkOIt91N4qq+jXG9l/J HB6DhCl8qjfjHX1OIP1ZJEsWJb+ZyJn2pfFfqsvSFcwJQ6pfIkXCztt2z+s1u7Vp Gdhc3Fb0DXGZ1AcJZER0vChnX875b5GcNYQcf14fZ3BbLuwN5vwQs1+vCH54iY9K IYVlQRSq6kzV44qGLn/MgMwldZi0jvfYDNIFbtsdfY06BEOx4/u6kAQeePNAupEy 8kKExkQjEPmWkz0y4vn+Jw8mZ8dGMzxJ2LPUr2XJi2nrNC+UtDjjJNW+goWA//S1 a8YOEjFj7aUG3nHccOAiS4Wc4krej2Uofyd09WjLjOCJ/LxNCHAc5WsvHAZvKKs= =Q0ji -----END PGP SIGNATURE----- Florian Pritz (1): db-move: Remove double space in tag_list Pierre Schmitz (1): grep has been moved to /usr ----------------------------------------------------------------------- hooks/post-receive -- Official repo DB scripts

1 0

[arch-projects] [dbscripts] [GIT] Official repo DB scripts branch master updated. 20120616-2-g332346d
by pierre＠archlinux.org 05 Aug '12

05 Aug '12

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 "Official repo DB scripts". The branch, master has been updated via 332346d06375c1272bee6dce2c91d31a027fe212 (commit) from ce6e51f159fb1b0d292ac0f3d5edfaa0f0f6be2e (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 332346d06375c1272bee6dce2c91d31a027fe212 Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Sun Aug 5 12:19:28 2012 +0200 grep has been moved to /usr ----------------------------------------------------------------------- Summary of changes: db-functions | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Official repo DB scripts

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.5-13-ga6c6009
by tomegun＠archlinux.org 04 Aug '12

04 Aug '12

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 a6c6009011f3544ff737c2078b44aff20396a539 (commit) from e060bec18062ae0a0f719200523880476017c1e0 (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 a6c6009011f3544ff737c2078b44aff20396a539 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Aug 4 16:11:06 2012 +0200 systemd: mask netfs.service The compat layer might attempt to start this, but that is never necessary, as systemd deals with remote-fs internally. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: Makefile | 1 + 1 file changed, 1 insertion(+) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.5-12-ge060bec
by tomegun＠archlinux.org 03 Aug '12

03 Aug '12

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 e060bec18062ae0a0f719200523880476017c1e0 (commit) from feb7b6e36af0bcf05c20abbaa548ecae170903a8 (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 e060bec18062ae0a0f719200523880476017c1e0 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Aug 4 00:43:42 2012 +0200 modprobe: pass everything to systemd-modules-load Unify this as much as possible, write out MODULES to a modules-load.d file in /run before calling systemd-modules-load, rather than using modprobe directly. This should not make any difference to the functionality. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts][RFC] cryptsetup: deprecate old syntax and default to the systemd one
by teg＠jklm.no 03 Aug '12

03 Aug '12

From: Tom Gundersen <teg(a)jklm.no> We detect if the old syntax is used, and if so print a warning and use the old parsing code. Otherwise, we pass everything on to systemd-cryptsetup. Similarly to what was done with the network syntax, we intend to keep the legacy stuff working for a long time. See crypttab(5) for the new syntax[0]. The main reason for this change, is to be closer to what other distros do. The systemd syntax is based on Debian's format, and is essentially what is being used by at least Debian, Ubuntu, Fedora and Suse. Such widespread use means that it will be better documented in non-Arch-specific documentation, and is more likely to see integration with third-party tools. It is also surely appreciated by admins who use more than one distro, that they don't have to know more than one config format for these sorts of basic things. Furthermore, by actually sharing the code with systemd we get to rely on their much more widespread testing and review compared to what we are able to do ourselves. This is particularly important for the encryption code, as it is the most obscure code in initscripts and any bugs in it would have potentially very severe consequences. Lastly, there are a few (albeit minor) issues I see with our current format: /etc/crypttab is not a plaintext file, but needs to be parsed through bash. The (deprecated) embedded passwords have been a source of problems in the past. And, there is no level of abstraction between the crypttab options and cryptsetup, we just pass them on blindly. The new format and the old one cover roughly the same usecases. To the best of my knowledge, the only use-case not (yet) supported by systemd-cryptsetup, is mounting a removable device and reading the key from a file on that device. For this, stick with the old syntax (though be careful, it is inherently racy). [0]: <http://0pointer.de/public/systemd-man/systemd.unit.html> (note that keyfile-offset support is coming in the next systemd version). --- functions | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 58 insertions(+), 4 deletions(-) diff --git a/functions b/functions index 16f8d8f..7fd5258 100644 --- a/functions +++ b/functions @@ -381,12 +381,13 @@ activate_vgs() { (( $? == 0 )) && stat_done || stat_fail } -do_unlock() { +do_unlock_legacy() { # $1 = requested name # $2 = source device # $3 = password # $4 = options stat_append "${1}.." + printf "${C_FAIL}Using legacy crypttab format. This will stop working in the future. See crypttab(5).${C_OTHER}\n" local open=create a=$1 b=$2 failed=0 # Ordering of options is different if you are using LUKS vs. not. # Use ugly swizzling to deal with it. @@ -448,7 +449,6 @@ do_unlock() { /*) cryptsetup -d "$3" $4 $open "$a" "$b" >/dev/null;; *) - printf "${C_FAIL}crypttab contains a literal encryption key. This will stop working in the future.${C_OTHER}\n" echo "$3" | cryptsetup $4 $open "$a" "$b" >/dev/null;; esac if (( $? )); then @@ -460,10 +460,64 @@ do_unlock() { return $failed } +do_unlock_systemd() { + stat_append "${1}.." + local failed=0 + if ! /usr/lib/systemd/systemd-cryptsetup attach "$1" "$2" "$3" $4; then + failed=1 + else + IFS=, + if in_array swap ${options[@]}; then + if ! mkswap /dev/mapper/$name >/dev/null; then + failed=1 + fi + elif in_array tmp ${options[@]}; then + if ! mke2fs /dev/mapper/$name >/dev/null; then + failed=1 + fi + fi + fi + if (( $failed )); then + stat_append "failed " + else + stat_append "ok " + fi + return $failed +} + +do_unlock() { + local name=$1 device=$2 password=$3 options=$4 + + if [[ ${options:0:2} =~ -. ]]; then + do_unlock_legacy "$name" "$device" "$password" "$options" + return $? + fi + + case $password in + ASK|SWAP) + do_unlock_legacy "$name" "$device" "$password" "$options" + ;; + /dev/*) + if [[ ${password##*:} == $password ]]; then + do_unlock_systemd "$name" "$device" "$password" "$options" + else + do_unlock_legacy "$name" "$device" "$password" "$options" + fi + ;; + /*|none|-) + do_unlock_systemd "$name" "$device" "$password" "$options" + ;; + *) + do_unlock_legacy "$name" "$device" "$password" "$options" + ;; + esac + return $? +} + read_crypttab() { # $1 = function to call with the split out line from the crypttab local line nspo failed=0 - while read line; do + while read line <&3; do [[ $line && $line != '#'* ]] || continue eval nspo=("${line%#*}") if $1 "${nspo[0]}" "${nspo[1]}" "${nspo[2]}" "${nspo[*]:3}"; then @@ -471,7 +525,7 @@ read_crypttab() { else failed=1 fi - done < /etc/crypttab + done 3< /etc/crypttab return $failed } -- 1.7.11.1

7 23

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.07.5-11-gfeb7b6e
by tomegun＠archlinux.org 03 Aug '12

03 Aug '12

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 feb7b6e36af0bcf05c20abbaa548ecae170903a8 (commit) from 3858aec656fc4fbfff3c296ca39148e7bea6f83d (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 feb7b6e36af0bcf05c20abbaa548ecae170903a8 Author: Tom Gundersen <teg(a)jklm.no> Date: Fri Aug 3 19:31:11 2012 +0200 network: fix warning on trying to start a running network Reported-by: Ali Kaasinen <ali.kaasinen(a)gmail.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: network | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- Arch Linux initscripts repository

1 0