February 2013 - Arch-projects - lists.archlinux.org

[arch-projects] [MKINITCPIO][PATCH 1/2] Fix colors display in some options
by Sébastien Luttringer 05 Feb '13

05 Feb '13

Colors initialization was called after arg parsing. This disallow error messages and options called directly from arg parser to use colors. By example, call `mkinitcpio -k toto' or `mkinitcpio -L'. This patch initialize colors when terminal is able to support it but disable it if users don't wants it (with -n). Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- functions | 4 ++++ mkinitcpio | 11 ++++++----- 2 files changed, 10 insertions(+), 5 deletions(-) diff --git a/functions b/functions index 4df91bc..b747f40 100644 --- a/functions +++ b/functions @@ -693,4 +693,8 @@ try_enable_color() { fi } +disable_colors() { + unset "${!_color_@}" +} + # vim: set ft=sh ts=4 sw=4 et: diff --git a/mkinitcpio b/mkinitcpio index 9802fd5..0863f3f 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -348,6 +348,10 @@ parseopts "$_opt_short" "${_opt_long[@]}" -- "$@" || exit 1 set -- "${OPTRET[@]}" unset _opt_short _opt_long OPTRET +if [[ -t 1 ]]; then + try_enable_color +fi + while :; do case $1 in # --add remains for backwards compat @@ -380,7 +384,8 @@ while :; do shift _optpreset=$1 ;; -n|--nocolor) - _optcolor=0 ;; + _optcolor=0 + disable_colors ;; -v|--verbose) _optquiet=0 ;; -S|--skiphooks) @@ -413,10 +418,6 @@ while :; do shift done -if [[ -t 1 ]] && (( _optcolor )); then - try_enable_color -fi - # insist that /proc and /dev be mounted (important for chroots) # NOTE: avoid using mountpoint for this -- look for the paths that we actually # use in mkinitcpio. Avoids issues like FS#26344. -- Sébastien "Seblu" Luttringer

2 4

[arch-projects] [MKINITCPIO][PATCH 1/4] Allow mkinitcpio to generate all preset
by Sébastien Luttringer 05 Feb '13

05 Feb '13

Add options -a and --all which ask to mkinitcpio to generate all presets registered in /etc/mkinitcpio.d. This is usefull, by example, when you update mkinitcpio.conf and you want to rebuild all initramfs for your kernels. Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- bash-completion | 2 +- man/mkinitcpio.8.txt | 4 ++ mkinitcpio | 106 +++++++++++++++++++++++++++++---------------------- 3 files changed, 65 insertions(+), 47 deletions(-) diff --git a/bash-completion b/bash-completion index 0108863..b9dc888 100644 --- a/bash-completion +++ b/bash-completion @@ -62,7 +62,7 @@ _files_from_dirs() { _mkinitcpio() { local action cur prev opts - opts=(-A --addhooks -c --config -g --generate -H --hookhelp -h --help -k --kernel + opts=(-A --addhooks -a --all -c --config -g --generate -H --hookhelp -h --help -k --kernel -L --listhooks -M --automods -n --nocolor -p --preset -r --moduleroot -S --skiphooks -s --save -t --builddir -V --version -v --verbose -z --compress) diff --git a/man/mkinitcpio.8.txt b/man/mkinitcpio.8.txt index 2b0f524..cd7dd42 100644 --- a/man/mkinitcpio.8.txt +++ b/man/mkinitcpio.8.txt @@ -29,6 +29,10 @@ Options after all other hooks from the config file. Multiple hooks should be comma-separated. This option can be specified multiple times. +*-a, \--all*:: + Build all initramfs image(s) according to all specified presets in + /etc/mkinitcpio.d. See '-p' option for more details about presets. + *-c, \--config* 'config':: Use 'config' file to generate the ramdisk. Default: /etc/mkinitcpio.conf diff --git a/mkinitcpio b/mkinitcpio index 9802fd5..e932602 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -5,7 +5,7 @@ declare -r version=%VERSION% -shopt -s extglob +shopt -s extglob nullglob ### globals within mkinitcpio, but not intended to be used by hooks @@ -39,6 +39,7 @@ usage: ${0##*/} [options] Options: -A, --addhooks <hooks> Add specified hooks, comma separated, to image + -a, --all Build all presets in $_d_presets -c, --config <config> Use alternate config file. (default: /etc/mkinitcpio.conf) -g, --generate <path> Generate cpio image and write to specified path -H, --hookhelp <hookname> Display help for given hook and exit @@ -237,57 +238,65 @@ build_image() { } process_preset() { - local preset=$1 preset_image= preset_options= + local preset= preset_image= preset_options= ret=0 local -a preset_mkopts preset_cmd - # allow path to preset file, else resolve it in $_d_presets - if [[ $preset != */* ]]; then - printf -v preset '%s/%s.preset' "$_d_presets" "$preset" - fi + for preset; do + # here we need to use subshell to be sure sourcing files doesn't taint + # our shell context accross call + ( + # allow path to preset file, else resolve it in $_d_presets + if [[ $preset != */* ]]; then + printf -v preset '%s/%s.preset' "$_d_presets" "$preset" + fi - . "$preset" || die "Preset not found: \`%s'" "$preset" + . "$preset" || die "Preset not found: \`%s'" "$preset" - # Use -m and -v options specified earlier - (( _optquiet )) || preset_mkopts+=(-v) - (( _optcolor )) || preset_mkopts+=(-n) + # Use -m and -v options specified earlier + (( _optquiet )) || preset_mkopts+=(-v) + (( _optcolor )) || preset_mkopts+=(-n) - ret=0 - for p in "${PRESETS[@]}"; do - msg "Building image from preset: '$p'" - preset_cmd=("${preset_mkopts[@]}") + for p in "${PRESETS[@]}"; do + msg "Building image from preset '$p' in '$preset'" + preset_cmd=("${preset_mkopts[@]}") - preset_kver=${p}_kver - if [[ ${!preset_kver:-$ALL_kver} ]]; then - preset_cmd+=(-k "${!preset_kver:-$ALL_kver}") - else - warning "No kernel version specified. Skipping image \`%s'" "$p" - continue - fi + preset_kver=${p}_kver + if [[ ${!preset_kver:-$ALL_kver} ]]; then + preset_cmd+=(-k "${!preset_kver:-$ALL_kver}") + else + warning "No kernel version specified. Skipping image \`%s'" "$p" + continue + fi - preset_config=${p}_config - if [[ ${!preset_config:-$ALL_config} ]]; then - preset_cmd+=(-c "${!preset_config:-$ALL_config}") - else - warning "No configuration file specified. Skipping image \`%s'" "$p" - continue - fi + preset_config=${p}_config + if [[ ${!preset_config:-$ALL_config} ]]; then + preset_cmd+=(-c "${!preset_config:-$ALL_config}") + else + warning "No configuration file specified. Skipping image \`%s'" "$p" + continue + fi - preset_image=${p}_image - if [[ ${!preset_image} ]]; then - preset_cmd+=(-g "${!preset_image}") - else - warning "No image file specified. Skipping image \`%s'" "$p" - continue - fi + preset_image=${p}_image + if [[ ${!preset_image} ]]; then + preset_cmd+=(-g "${!preset_image}") + else + warning "No image file specified. Skipping image \`%s'" "$p" + continue + fi - preset_options=${p}_options - if [[ ${!preset_options} ]]; then - preset_cmd+=(${!preset_options}) # intentional word splitting - fi + preset_options=${p}_options + if [[ ${!preset_options} ]]; then + preset_cmd+=(${!preset_options}) # intentional word splitting + fi + + msg2 "${preset_cmd[*]}" + "$0" "${preset_cmd[@]}" + (( $? )) && ret=1 + done - msg2 "${preset_cmd[*]}" - "$0" "${preset_cmd[@]}" - (( $? )) && ret=1 + exit $ret + ) + (( $? )) && ret=1 done exit $ret @@ -339,8 +348,8 @@ install_modules() { trap 'cleanup 130' INT trap 'cleanup 143' TERM -_opt_short='A:c:g:H:hk:nLMp:r:S:st:Vvz:' -_opt_long=('add:' 'addhooks:' 'config:' 'generate:' 'hookhelp:' 'help' +_opt_short='aA:c:g:H:hk:nLMp:r:S:st:Vvz:' +_opt_long=('add:' 'addhooks:' 'all' 'config:' 'generate:' 'hookhelp:' 'help' 'kernel:' 'listhooks' 'automods' 'moduleroot:' 'nocolor' 'preset:' 'skiphooks:' 'save' 'builddir:' 'version' 'verbose' 'compress:') @@ -356,6 +365,11 @@ while :; do IFS=, read -r -a add <<< "$1" _optaddhooks+=("${add[@]}") unset add ;; + -a|--all) + _optpreset=("$_d_presets"/*.preset) + if ! (( ${#_optpreset} )); then + die "No preset files available in \`%s'." "$_d_presets" + fi ;; -c|--config) shift _f_config=$1 ;; @@ -378,7 +392,7 @@ while :; do cleanup 0 ;; -p|--preset) shift - _optpreset=$1 ;; + _optpreset=("$1") ;; -n|--nocolor) _optcolor=0 ;; -v|--verbose) @@ -424,7 +438,7 @@ fi [[ -e /dev/fd ]] || die "/dev must be mounted!" # use preset $_optpreset (exits after processing) -[[ $_optpreset ]] && process_preset "$_optpreset" +(( ${#_optpreset} )) && process_preset "${_optpreset[@]}" KERNELVERSION=$(resolve_kernver "$_optkver") || cleanup 1 _d_kmoduledir=$_optmoduleroot/lib/modules/$KERNELVERSION -- Sébastien "Seblu" Luttringer

3 10

[arch-projects] [netcfg] Call for testers: netctl
by Jouke Witteveen 02 Feb '13

02 Feb '13

Dear all, For little over a year now, I have maintained netcfg. In doing so I have encountered three major problems. 1. Despite best efforts, the code and control flow of netcfg remain rather messy. 2. Usage of netcfg has many corner cases. 3. Some wheels are invented by both systemd and netcfg, but it is not easy to have netcfg make use of systemd. In order to deal with these issues I have forked netcfg. In the end, it turned out to be more of a rewrite. The result[1] I have called netctl. The main purpose of netctl is to provide profile-based networking in a systemd environment. Here are some of the changes with respect to netcfg. a. Variables in profiles are CamelCase instead of UPPER_CASE to mimic systemd services. b. All configuration files are gone, configuration is done through the netctl utility, which interfaces systemd's systemctl. c. The only non-trivial usage that is provided is automatic configuration through ifplugd or wpa_actiond, formerly known as net-auto-wire{d,less}, now known as netctl-ifplugd and netctl-auto. Some of the bugs that are fixed: d. Bind to network interfaces during boot, thus preventing the lack of a connection after boot recently encountered by owners of slow hardware. e. Allow more complex nameserver setups by using resolvconf (openresv). Transition should not be hard. At any rate the three new man pages netctl(1), netctl.profile(5), and netctl.special(7) should answer all questions. Here is a basic outline of the changes required: - Rename variables in the profiles in /etc/network.d/ and unquote some of their values (mainly Interface=). - Run `netctl enable <profile>` for every profile in the old NETWORKS array. 'last' doesn't work this way, see netcfg.special(7). - Use `netctl list`/`netctl start <profile>` instead of `netcfg-menu`, wifi-menu remains available. As half of the total code base has been removed and almost every line in the other half has been touched, I expect some easy-to-fix bugs to be introduced. Therefore I need testers. Please test netctl: I. $ git clone git://github.com/joukewitteveen/netctl.git II. $ cd netctl; make pkgbuild III. copy netctl-*.tar.xz and PKGBUILD to an empty directory IV. run makepkg in that directory V. install (using `pacman -U`) the resulting package. During the 0.x series, I am not afraid of breaking compatibility. If all goes well, I would like to replace netcfg with netctl starting with a 1.0 release. I know many people don't like the idea of dropping netcfg or netcfg compatibility, but I think the situation of netctl is far easier to maintain. Personally, I don't see much future in netcfg besides an optional compatibility layer on top of netctl. Thanks to all testers! - Jouke [1] https://github.com/joukewitteveen/netctl

6 23

[arch-projects] [NAMCAP][PATCH] Fix missing import of sys in package.py
by Sébastien Luttringer 02 Feb '13

02 Feb '13

pkgver=$(date +%Y%m%d) line like this in PKGBUILD make parsepkgbuild PKGBUILD to return != 0 and namcap traceback Traceback (most recent call last): File "/usr/lib/python3.3/runpy.py", line 160, in _run_module_as_main "__main__", fname, loader, pkg_name) File "/usr/lib/python3.3/runpy.py", line 73, in _run_code exec(code, run_globals) File "/usr/lib/python3.3/site-packages/namcap.py", line 246, in <module> process_pkgbuild(package, active_modules) File "/usr/lib/python3.3/site-packages/namcap.py", line 141, in process_pkgbuild pkginfo = Namcap.package.load_from_pkgbuild(package) File "/usr/lib/python3.3/site-packages/Namcap/package.py", line 198, in load_from_pkgbuild print("Error:", err, file=sys.stdout) NameError: global name 'sys' is not defined Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- Namcap/package.py | 1 + 1 file changed, 1 insertion(+) diff --git a/Namcap/package.py b/Namcap/package.py index 47e84c4..83900c8 100644 --- a/Namcap/package.py +++ b/Namcap/package.py @@ -23,6 +23,7 @@ import os import subprocess import re import collections +import sys import pyalpm _pyalpm_version_tuple = tuple(int(n) for n in pyalpm.version().split('.')) -- Sébastien "Seblu" Luttringer

1 0

Re: [arch-projects] [netctl] stupid default netmask (Was: Call for testers: netctl)
by Jouke Witteveen 01 Feb '13

01 Feb '13

On Fri, Feb 1, 2013 at 12:37 AM, Thomas Bächler <thomas(a)archlinux.org> wrote: > To smaller criticism: > > ip has: [[ $addr == */* ]] || addr+="/24" > > This is a stupid default, and it is inconsistent to what is done in > IPv6. Just leave it out - every configuration needs both the IP and the > netmask, a network cannot be configured without it! > Agreed. Somehow I failed to notice this. The default survived for three years! Thanks, - Jouke

1 0

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 0.3-2-g0f7cec5
by jouke＠archlinux.org 01 Feb '13

01 Feb '13

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 "Network control utility based on systemd". The branch, master has been updated via 0f7cec5f9569be5eaae46faf8d76f06be7152ddb (commit) via 4a8465a1f308890c7f54eab8c0a7c270fc0246ed (commit) from 30f0608f61775f4de0a0afc645ccf74c479180c3 (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 0f7cec5f9569be5eaae46faf8d76f06be7152ddb Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Feb 1 16:27:42 2013 +0100 Improve completion - Add Bash completion for netctl-auto and wifi-menu - Add full (but basic) zsh completion commit 4a8465a1f308890c7f54eab8c0a7c270fc0246ed Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Feb 1 00:56:04 2013 +0100 Remove the default IPv4 netmask A default netmask makes no sense (except possibly /32). Spotted by: Thomas Bächler <thomas(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: contrib/PKGBUILD | 1 + contrib/bash-completion | 55 +++++++++++++++++++++++++++---------- contrib/zsh-completion | 64 +++++++++++++++++++++++++++++++++++++++++++ docs/examples/ethernet-static | 3 +- docs/netctl.profile.5.txt | 7 ++--- src/lib/ip | 1 - 6 files changed, 110 insertions(+), 21 deletions(-) create mode 100644 contrib/zsh-completion hooks/post-receive -- Network control utility based on systemd

1 0