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

[arch-projects] [archweb] [RFCv2] Add releng netboot to archweb
by Thomas Bächler 02 Aug '13

02 Aug '13

This is the second WIP patch series to add the netboot environment to archweb. I improved a few minor issues compared to the last version. - I have no idea if django properly caches this page, or if this requires extra configuration, as regenerating it every time seems like overkill. - All files that iPXE needs to access must be served without SSL as far as I know. To test it, set your archweb test environment to run on http://localhost:8000/ Download ipxe.lkrn from https://paste.xinu.at/OX7oU8/ and execute qemu-system-x86_64 -enable-kvm -kernel bin/ipxe.lkrn or qemu-system-x86_64 -enable-kvm -kernel bin/ipxe.lkrn -cpu kvm32 (I hope this still works, cannot test right now)

1 5

[arch-projects] [devtools][PATCH] arch-nspawn: remove leading - from the machine name/hostname
by Florian Pritz 25 Jul '13

25 Jul '13

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- This makes perl build again. arch-nspawn.in | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/arch-nspawn.in b/arch-nspawn.in index 8ef39ed..441b502 100644 --- a/arch-nspawn.in +++ b/arch-nspawn.in @@ -98,8 +98,11 @@ copy_hostconf eval $(grep '^CARCH=' "$working_dir/etc/makepkg.conf") +machine_name="${working_dir//\//-}" +machine_name="${machine_name#-}" + exec ${CARCH:+setarch "$CARCH"} systemd-nspawn 2>/dev/null \ -D "$working_dir" \ - --machine "${working_dir//\//-}" \ + --machine "$machine_name" \ "${mount_args[@]}" \ "$@" -- 1.8.3

1 1

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.14.0-9-g3f56800
by dreisner＠archlinux.org 27 Jun '13

27 Jun '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 "The official mkinitcpio repository". The branch, master has been updated via 3f56800753e1e0c3db0e6c4ac77b0c4dc95a8491 (commit) via 8c40f930f6b491e95abd1e853c31330b2e6ca6af (commit) via c61d4791d34591bb0fed558494a52d517d900b44 (commit) via d6e92394a4c133eb652714bb9aa13008c808301b (commit) via 2e4666a3c0c69e4f8ff5d8533893c7b6f15d5414 (commit) via 601aab2477f5cb6fc3298216625b9804d6a18dad (commit) via d662258b8769af81a036b7d4cd0af0a66e33dbb2 (commit) via 40a62e9c5fb70b02ade89965dea6d2cb96672017 (commit) via cccc4fd2a1747cd77e43e9da6935b30f9a61b348 (commit) from 5294b462aec63257182059a4fb79d07b1ec895e6 (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 3f56800753e1e0c3db0e6c4ac77b0c4dc95a8491 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 20 11:26:59 2013 -0400 init: remove unneeded intermediate variable Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 8c40f930f6b491e95abd1e853c31330b2e6ca6af Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Jun 20 09:45:40 2013 -0400 init: merge duped code, use bitfield_has_bit in fsck_root Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit c61d4791d34591bb0fed558494a52d517d900b44 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jun 17 10:06:58 2013 -0400 init: allow for logging of early userspace This introduces support for the rd.log and rd.debug kernel command line options, which log early userspace activity to /run/initramfs/init.log. Code is largely inspired by Dracut's implementation of early userspace logging, but without needless complexity and redundancies. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit d6e92394a4c133eb652714bb9aa13008c808301b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jun 19 16:13:44 2013 -0400 init: throw error on unknown fsck.mode Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 2e4666a3c0c69e4f8ff5d8533893c7b6f15d5414 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 30 13:22:51 2012 -0500 move install_modules to functions to allow for testing Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 601aab2477f5cb6fc3298216625b9804d6a18dad Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 23 16:25:19 2012 -0500 remove "arbitrary" limit from index_of() Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit d662258b8769af81a036b7d4cd0af0a66e33dbb2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 23 13:58:36 2012 -0500 init: redirect /proc/cmdline to parse_cmdline This makes it easier to test parse_cmdline. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 40a62e9c5fb70b02ade89965dea6d2cb96672017 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue May 7 10:56:50 2013 -0400 README: its 2013, year of the pony Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit cccc4fd2a1747cd77e43e9da6935b30f9a61b348 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue May 7 09:55:39 2013 -0400 lsinitcpio: remove unused variables Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: README | 2 +- functions | 54 +++++++++++++-- init | 8 ++- init_functions | 187 +++++++++++++++++++++++++++++++++++++++++++++------ lsinitcpio | 3 - man/mkinitcpio.8.txt | 25 +++++++ mkinitcpio | 52 ++------------ 7 files changed, 252 insertions(+), 79 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [PATCH] Add options for logging of early userspace
by Dave Reisner 18 Jun '13

18 Jun '13

This introduces support for the rd.log and rd.debug kernel command line options, which log early userspace activity to /run/initramfs/init.log. Code is largely inspired by Dracut's implementation of early userspace logging, but without needless complexity and redundancies. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- init | 5 ++ init_functions | 147 +++++++++++++++++++++++++++++++++++++++++++++------ install/base | 2 +- man/mkinitcpio.8.txt | 25 +++++++++ 4 files changed, 162 insertions(+), 17 deletions(-) diff --git a/init b/init index dfebd53..7859aa3 100644 --- a/init +++ b/init @@ -19,6 +19,9 @@ mkdir -m755 /run/initramfs # parse the kernel command line parse_cmdline </proc/cmdline +# setup logging as early as possible +rdlogger_start + for d in ${disablehooks//,/ }; do [ -e "/hooks/$d" ] && chmod 644 "/hooks/$d" done @@ -72,6 +75,8 @@ if [ "${break}" = "postmount" ]; then launch_interactive_shell fi +rdlogger_stop + exec env -i \ "TERM=$TERM" \ "RD_TIMESTAMP=$RD_TIMESTAMP" \ diff --git a/init_functions b/init_functions index dc4361a..707f37c 100644 --- a/init_functions +++ b/init_functions @@ -1,5 +1,11 @@ # This file contains common functions used in init and in hooks +# logging targets +_rdlog_file=$(( 1 << 0 )) +_rdlog_kmsg=$(( 1 << 1 )) +_rdlog_cons=$(( 1 << 2 )) +_rdlog_all=$(( (1 << 3) - 1 )) + msg () { [ "${quiet}" != "y" ] && echo $@ } @@ -41,6 +47,10 @@ launch_interactive_shell() { sh -i } +bitfield_has_bit() { + [ $(( $1 & $2 )) -gt 0 ] +} + major_minor_to_device() { local dev @@ -70,6 +80,30 @@ run_hookfunctions() { done } +set_log_option() { + local opt words + + for opt in ${1//|/ }; do + case $opt in + all) + rd_log=$_rdlog_all + ;; + kmsg) + rd_log=$(( rd_log | _rdlog_kmsg )) + ;; + file) + rd_log=$(( rd_log | _rdlog_file )) + ;; + console) + rd_log=$(( rd_log | _rdlog_cons )) + ;; + *) + err "unknown rd.log parameter: '$opt'" + ;; + esac + done +} + parse_cmdline() { local _w _quoted _lhs _rhs _cmdline read -r _cmdline @@ -82,8 +116,25 @@ parse_cmdline() { rw|ro) rwopt=$_w ;; fsck.mode=*) case ${_w#*=} in - force) forcefsck=y ;; - skip) fastboot=y ;; + force) + forcefsck=y + ;; + skip) + fastboot=y + ;; + esac + ;; + rd.*) + case ${_w#rd.} in + debug) + rd_debug=1 + ;; + log) + rd_log=$_rdlog_all + ;; + log=*) + set_log_option "${_w#rd.log=}" + ;; esac ;; # abide by shell variable naming rules @@ -140,16 +191,10 @@ fsck_root() { fsck_device "$root" fsckret=$? - fsck_ret() { - [ -z "$fsckret" ] && return 1 - [ "$fsckret" -eq "$1" ] && return 0 - [ "$(( fsckret & $1 ))" -eq "$1" ] - } - - if [ "$fsckret" -ne 255 ]; then - if [ "$fsckret" = '0' ] || fsck_ret 1; then + if [ -n "$fsckret" ] && [ "$fsckret" -ne 255 ]; then + if [ "$fsckret" = '0' ] || bitfield_has_bit $fsckret 1; then echo "$fsckret" > /run/initramfs/root-fsck - elif fsck_ret 4; then + elif bitfield_has_bit $fsckret 4; then err "Bailing out. Run 'fsck $root' manually" printf '%s\n' \ "********** FILESYSTEM CHECK FAILED **********" \ @@ -163,7 +208,7 @@ fsck_root() { echo ":: Automatic reboot in progress" sleep 2 reboot -f - elif fsck_ret 2; then + elif bitfield_has_bit $fsckret 2; then printf '%s\n' \ "************** REBOOT REQUIRED **************" \ "* *" \ @@ -172,13 +217,13 @@ fsck_root() { "*********************************************" sleep 10 reboot -f - elif fsck_ret 8; then + elif bitfield_has_bit $fsckret 8; then err "fsck failed on '$root'" - elif fsck_ret 16; then + elif bitfield_has_bit $fsckret 16; then err "Failed to invoke fsck: usage or syntax error" - elif fsck_ret 32; then + elif bitfield_has_bit $fsckret 32; then echo ":: fsck cancelled on user request" - elif fsck_ret 128; then + elif bitfield_has_bit $fsckret 128; then err "fatal error invoking fsck" fi fi @@ -254,4 +299,74 @@ default_mount_handler() { fi } +rdlogger_start() { + [ -n "$rd_log" ] || return + mkfifo /run/initramfs/rdlogger.pipe + rdlogger </run/initramfs/rdlogger.pipe >/dev/console 2>&1 & + exec >/run/initramfs/rdlogger.pipe 2>&1 + [ -n "$rd_debug" ] && set -x +} + +rdlogger_stop() { + local i=0 + + [ -e /run/initramfs/rdlogger.pipe ] || return + + [ -n "$rd_debug" ] && { set +x; } 2>/dev/null + + # signal logger to exit by redirecting FDs back to /dev/console + exec 0<>/dev/console 1<>/dev/console 2<>/dev/console + + # wait up to 1 second for rdlogger to exit gracefully + while [ -e /run/initramfs/rdlogger.pipe ] && [ $i -lt 10 ]; do + sleep 0.1 + i=$(( i + 1 )) + done + + [ $i -eq 10 ] && kill %1 2>/dev/null +} + +rdlogger() { + local line + + # always cleanup on exit + trap 'rm -f /run/initramfs/rdlogger.pipe' EXIT + + # establish log targets. Either redirect to an appropriate file descriptor, + # or to /dev/null. This way, logging can Just Happen and the attached FD + # will Do The Right Thing™. + + # rd.log=kmsg + if [ -c /dev/kmsg ] && bitfield_has_bit "$rd_log" "$_rdlog_kmsg"; then + exec 5>/dev/kmsg + else + exec 5>/dev/null + fi + + # rd.log=file + if bitfield_has_bit "$rd_log" "$_rdlog_file"; then + exec 6>/run/initramfs/init.log + else + exec 6>/dev/null + fi + + # rd.log=console + if ! bitfield_has_bit "$rd_log" "$_rdlog_cons" || [ -n "$quiet" ]; then + exec >/dev/null + fi + + while read -r line; do + # rd.log=kmsg + printf '<31>initramfs: %s\n' "$line" >&5 + + # rd.log=file + printf '%s\n' "$line" >&6 + + # rd.log=console + printf '%s\n' "$line" + done + + # EOF, shutting down... +} + # vim: set ft=sh ts=4 sw=4 et: diff --git a/install/base b/install/base index ad0e5f2..397168f 100644 --- a/install/base +++ b/install/base @@ -3,7 +3,7 @@ build() { local applet - add_binary /usr/lib/initcpio/busybox /bin/busybox + add_binary /usr/lib/initcpio/busybox /usr/bin/busybox for applet in $(/usr/lib/initcpio/busybox --list); do add_symlink "/usr/bin/$applet" busybox diff --git a/man/mkinitcpio.8.txt b/man/mkinitcpio.8.txt index 56ac571..4f2db59 100644 --- a/man/mkinitcpio.8.txt +++ b/man/mkinitcpio.8.txt @@ -248,6 +248,31 @@ the kernel command line: device to show up, if it is not available immediately. This defaults to 5 seconds. If an invalid integer is passed, this variable will have no effect. +*rd.debug*:: + Enables shell debug (xtrace). This option is only useful in combination with + the 'rd.log' option. + +*rd.log*['=<console|file|kmsg|all>']:: + Enables logging of early userspace messages. If specified, the optional + parameter describes where this information is logged. Multiple options can be + OR'd together using the pipe (|) character. Messages are always logged + to the console unless the 'quiet' parameter is passed. + + *console*;; + Writes log output to '/dev/console'. + + *file*;; + Writes log output to '/run/initramfs/init.log' + + *kmsg*;; + Writes output to the kernel ring buffer using the '/dev/kmsg' device + (introduced in Linux 3.5). This option is a no-op if your kernel does + not support this device. + + *all*;; + Writes output to all known log targets. This is the default if no option + is specified. + These are only the variables that the core of mkinitcpio honor. Additional hooks may look for other environment variables and should be documented by the help output for the hook. -- 1.8.3.1

3 2

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 1.1-4-gfeb669f
by jouke＠archlinux.org 17 Jun '13

17 Jun '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 feb669f4b2a15e6ea1d84be336f12be4650f9d2d (commit) via 4d8cb707b1fc1947030e312c66c73fd012038c20 (commit) via 277b1cf277e0d6c6cc439d0684954503f6b2ed14 (commit) via c3f16e68c8476357370131547c22f4dcc6b9e2ff (commit) from 6e48f6b70d2c1921c9d71114bd28c390273e20e1 (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 feb669f4b2a15e6ea1d84be336f12be4650f9d2d Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sun Jun 16 12:45:43 2013 +0200 Fix default interface bindings (third time) The declare builtin defaults to making variables local. Previous attempts: 711c46457ae9fef52c7c529d89c67d0d526f73ef e8210827fd59e4539a70af55cb452b211633fedd commit 4d8cb707b1fc1947030e312c66c73fd012038c20 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sun Jun 16 12:15:15 2013 +0200 Ordering improvements in IP configuration - Add static routes prior to setting the default IP4 gateway (github/pull/43) - Set sysctl property net.ipv6.conf.<interface>.accept_ra earlier (FS#35788) commit 277b1cf277e0d6c6cc439d0684954503f6b2ed14 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sun Jun 16 11:40:49 2013 +0200 Documentation updates commit c3f16e68c8476357370131547c22f4dcc6b9e2ff Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jun 4 15:29:43 2013 +0200 Expose version information Profiles now have access to it. ----------------------------------------------------------------------- Summary of changes: Makefile | 6 ++--- docs/netctl.1.txt | 2 +- docs/netctl.profile.5.txt | 21 +++++++++++----- src/lib/connections/bond | 2 +- src/lib/connections/bridge | 6 ++--- src/lib/connections/tunnel | 2 +- src/lib/connections/tuntap | 2 +- src/lib/globals | 1 + src/lib/ip | 63 ++++++++++++++++++++++------------------------ src/netctl.in | 2 -- 10 files changed, 56 insertions(+), 51 deletions(-) hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl] Regarding commit fe5f0d6fe - "Restrict dhcpcd to IPv4"
by Thomas Bächler 16 Jun '13

16 Jun '13

The behaviour introduced by commit fe5f0d6fe is undesirable. To quote the manpage: "dhcpcd is also an implementation of an IPv6 Router Solicitor as specified in RFC 4861 and RFC 6106. dhcpcd can optionally handle address and route management itself, and will do so by default if Router Solicitation is disabled in the kernel. If dhcpcd is managing routes, dhcpcd sends Neighbor Solicitions to each advertising router periodically and will expire the ones that do not respond." What this doesn't mention is that it also reads DNS servers from Router Advertisements, which the kernel cannot do by itself. dhcpcd does not perform dhcpv6 as far as I know. IMO, we should remove the -4 flag from dhcpcd if IP6=stateless is set.

2 5

[arch-projects] [PATCH] [abs] Update shebangs to use /usr/bin instead of /bin due to merging of the "bin" directories
by Jason St. John 02 Jun '13

02 Jun '13

From: "Jason St. John" <jstjohn(a)purdue.edu> The "bin" directories are being merged into /usr/bin [1], so it is appropriate to update the shebangs as well. [1] https://mailman.archlinux.org/pipermail/arch-dev-public/2013-May/024908.html Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- abs.in | 2 +- makeworld.in | 2 +- scripts/svn2abs.in | 2 +- scripts/update-abs.sh | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/abs.in b/abs.in index 19d01d6..ad81499 100644 --- a/abs.in +++ b/abs.in @@ -1,4 +1,4 @@ -#!/bin/bash -e +#!/usr/bin/bash -e # # abs - download a PKGBUILD tree from a CVS repository # diff --git a/makeworld.in b/makeworld.in index e5d9f0f..0ac8447 100644 --- a/makeworld.in +++ b/makeworld.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # makeworld - a makepkg wrapper to build multiple packages # diff --git a/scripts/svn2abs.in b/scripts/svn2abs.in index 0d4c74d..d8a60c9 100644 --- a/scripts/svn2abs.in +++ b/scripts/svn2abs.in @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash # # svn2abs - convert svn repo to ABS structure # diff --git a/scripts/update-abs.sh b/scripts/update-abs.sh index ff3510e..54ba42c 100644 --- a/scripts/update-abs.sh +++ b/scripts/update-abs.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/bash SERVERS=('gerolde' 'sigurd') ARCHES=('i686' 'x86_64' 'any') -- 1.8.3

2 5

[arch-projects] [archweb] [RFC] Add releng netboot to archweb
by Thomas Bächler 01 Jun '13

01 Jun '13

This is a WIP patch series to add the netboot environment to archweb. I send it primarily to receive comments on the code and suggestions for the missing pieces: - Right now, the binary files needed by pxelinux are not served, but are redirects to the old releng site. Only the essential files are there, so not everything in the menu will work. - The files on the information page are not served yet, nor do they exist. - I have no idea if django properly caches this page, or if this requires extra configuration, as regenerating it every time seems like overkill. - All files that iPXE needs to access must be served without SSL as far as I know. To test it, set your archweb test environment to run on http://localhost:8000/ Download ipxe.lkrn from https://paste.xinu.at/OX7oU8/ and execute qemu-system-x86_64 -enable-kvm -kernel bin/ipxe.lkrn or qemu-system-x86_64 -enable-kvm -kernel bin/ipxe.lkrn -cpu kvm32

1 2