July 2012 - Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio][PATCH 1/4] add 'strip' install hook
by Dave Reisner 15 Jul '12

15 Jul '12

Mostly a convenience for myself, and anyone else who runs builds of things like util-linux or kmod, where having debug symbols on these libraries can add a large amount of weight to the image. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- install/strip | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) create mode 100644 install/strip diff --git a/install/strip b/install/strip new file mode 100644 index 0000000..8ed9240 --- /dev/null +++ b/install/strip @@ -0,0 +1,32 @@ +#!/bin/bash + +build() { + find "$BUILDROOT" -type f -perm -u+w -print0 2>/dev/null | while read -d '' bin; do + case $(file -bi "$bin") in + *application/x-sharedlib*) + # Libraries (.so) + strip --strip-unneeded "$bin" + ;; + *application/x-archive*) + # Libraries (.a) + strip --strip-debug "$bin" + ;; + *application/x-executable*) + # Binaries + strip --strip-all "$bin" + ;; + esac + done +} + +help() { + cat <<HELPEOF +This hook will locate and strip binaries on your image before archival and +compression. This hook should be last, as any binaries added to the image after +this hook runs will not be stripped. This is mostly useful for users who run +local debug builds but whom do not want or need the extra weight of debug +symbols on their image. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: -- 1.7.11.2

1 3

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.7-2-ga0b9e69
by jouke＠archlinux.org 14 Jul '12

14 Jul '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 a0b9e69f406ad7cbb7f50f9a044509471f3bd262 (commit) via a02fed0ee3f23bb468f1577a61f24ff289bf3a6b (commit) from b3ed84cf5a9166b0591488a2758c2bb1f19dc137 (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 a0b9e69f406ad7cbb7f50f9a044509471f3bd262 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Jul 14 15:44:21 2012 +0200 Revise simple connection scripts - make specifying IP optional for tuntap profiles (FS#30638) - ethernet_{up,down} takes care of bring_interface {up,down} - debugging updates: don't hide errors, they are useful commit a02fed0ee3f23bb468f1577a61f24ff289bf3a6b Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Jul 14 06:57:59 2012 +0200 Fix pid-based kills (FS#30664) The command argument to timeout_wait cannot reference positional parameters (they would become the positional parameters to timeout_wait). We kill wpa_actiond if it does not die with wpa_supplicant. ----------------------------------------------------------------------- Summary of changes: scripts/netcfg-wpa_actiond | 3 +++ src/8021x | 14 ++++++++------ src/connections/bond | 4 +--- src/connections/bridge | 2 -- src/connections/ethernet | 5 +++-- src/connections/tunnel | 3 --- src/connections/tuntap | 8 +++----- src/connections/vlan | 10 +++------- 8 files changed, 21 insertions(+), 28 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.06.3-6-g046d35b
by tomegun＠archlinux.org 14 Jul '12

14 Jul '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 046d35bac04022eab343e9e6e40a3056c5e653ad (commit) via c2f7b97924e2b5341cea667fbd1a2802e9cb8cd5 (commit) via 3779f7002c8417a77745e1e02273ed5e19ed75b7 (commit) via 27c29c2b95864e4844ef644400ebf59a08d08abd (commit) via 6f3b4c5edc6dfdd301d80929cb35e316fa742144 (commit) from 267d36a1c80a69342d9dda264b4b60f656ea20cf (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 046d35bac04022eab343e9e6e40a3056c5e653ad Merge: 3779f70 c2f7b97 Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Jul 12 02:15:28 2012 +0200 Merge branch 'spelling' Conflicts: rc.sysinit Had to manually fix up a conflict in some comments. commit c2f7b97924e2b5341cea667fbd1a2802e9cb8cd5 Author: Jason St. John <jstjohn(a)purdue.edu> Date: Fri Jul 6 16:03:09 2012 -0400 Correct spelling and grammar throughout This patch addresses the issues with my previous patch submission here: https://mailman.archlinux.org/pipermail/arch-projects/2012-June/002990.html The notable changes between this patch and the previous one are below: -- this patch does not rename set_timezone() -- 'filesystems' and 'bash' are left as-is -- everything is in one patch, not two -- the 'makedepends' change is no longer relevant because the duplication of it was already removed in a later commit Regarding the capitalization of "Btrfs", it seems that upstream prefers "Btrfs".[1][2] Regarding 'https://' vs. 'http://', I left this change in the patch because stating 'https://www.archlinux.org' in the start-up messages doesn't force anyone to use HTTPS over HTTP. It simply shows that HTTPS is available for use. If someone really doesn't want to use HTTPS, they don't have to. Finally, Dan McGee stated that HTTPS will be used all the time soon.[3] [1] https://oss.oracle.com/projects/btrfs/ [2] https://btrfs.wiki.kernel.org/index.php/Main_Page [3] https://bugs.archlinux.org/task/30486#comment96222 Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> commit 3779f7002c8417a77745e1e02273ed5e19ed75b7 Author: Tom Gundersen <teg(a)jklm.no> Date: Sun Jul 1 01:43:15 2012 +0200 cryptsetup: deprecate old syntax and default to the systemd one 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). commit 27c29c2b95864e4844ef644400ebf59a08d08abd Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 3 22:28:05 2012 -0400 remove /run/nologin before leaving rc.multi systemd-186 writes this file when running systemd-tmpfiles, but initscripts never removes it. This disallows all non-root logins. Reported-by: Dan McGee <dan(a)archlinux.org> Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 6f3b4c5edc6dfdd301d80929cb35e316fa742144 Author: Tom Gundersen <teg(a)jklm.no> Date: Tue Jul 3 00:46:19 2012 +0200 hwclock: warn on discrepancy between /etc/adjtime and /etc/rc.conf about the timezone of the RTC Also, move from /var/lib/hwclock/adjtime to /etc/adjtime. This must be fixed in util-linux too. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: PKGBUILD | 4 +-- functions | 100 ++++++++++++++++++++++++++++++++++++++++++++------------- netfs | 4 +-- network | 10 +++--- rc.conf.5.txt | 46 +++++++++++++------------- rc.d.8.txt | 2 +- rc.local | 2 +- rc.multi | 2 ++ rc.shutdown | 26 +++++++-------- rc.single | 4 +-- rc.sysinit | 71 ++++++++++++++++++++++++---------------- 11 files changed, 171 insertions(+), 100 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository annotated tag 2.8.7 created. 2.8.7
by jouke＠archlinux.org 10 Jul '12

10 Jul '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 annotated tag, 2.8.7 has been created at e426b952dfdccc589482ea44bc947eb2eaa3287a (tag) tagging b3ed84cf5a9166b0591488a2758c2bb1f19dc137 (commit) replaces 2.8.6 tagged by Jouke Witteveen on Tue Jul 10 15:35:00 2012 +0200 - Log ----------------------------------------------------------------- Release 2.8.7 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJP/C+SAAoJEFa2H7+CSSwVFE0IAJ/YOZTLtoxzNyHDo1Al6bax 2pIIq17FJOYNWyJsWn1X84APzf37fQXScBDlHFlJZf/HqgyUKCKYJVQeMsxVDxYe FMGLaGYcszBhTXMW8KB31ZBKC0e0PppyyxiWklAXOP2Bq8mYHLIlqu58dmCjqcnh K63pFOEalIfZjqFz/RHKlgX07iic9wuF6JPJ0wJofutrdr4Uq1o9hiJCf8/uf0Sx ajaAdFcwLo6wD2jkPYnAs3GQbU4twbHFd+J/H+0J2Jku8yyK+zPNUfsF22eBDPrt MRIxBRhH59B3c8taplQ+Lzxnd4Y5EPiDtmrsdwbRxRuOqpc0qcqjvd4qnAV7E5E= =p0wV -----END PGP SIGNATURE----- Jouke Witteveen (4): Use grep instead of fgrep (FS#30598) Fix match expression in ctrl_interface parsing (8021x) Remove duplicate code 2.8.7 release updates ----------------------------------------------------------------------- hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.6-4-gb3ed84c
by jouke＠archlinux.org 10 Jul '12

10 Jul '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 b3ed84cf5a9166b0591488a2758c2bb1f19dc137 (commit) via 129dec0a8e0d59f1221a44b3bc3f97e4fba03ac5 (commit) from 4fc69bcd399292e688d19dc3569c7e496419ecd6 (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 b3ed84cf5a9166b0591488a2758c2bb1f19dc137 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jul 10 15:32:08 2012 +0200 2.8.7 release updates commit 129dec0a8e0d59f1221a44b3bc3f97e4fba03ac5 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jul 10 15:26:18 2012 +0200 Remove duplicate code ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 3 +++ src/connections/ethernet | 6 ++---- 3 files changed, 6 insertions(+), 5 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.6-2-g4fc69bc
by jouke＠archlinux.org 08 Jul '12

08 Jul '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 4fc69bcd399292e688d19dc3569c7e496419ecd6 (commit) via 5511dc38c484d93fda0aaf57e30e6b82f8174918 (commit) from 3d9c37274e5b9bb620a7fd1ea24071aeed06deee (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 4fc69bcd399292e688d19dc3569c7e496419ecd6 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sun Jul 8 12:04:21 2012 +0200 Fix match expression in ctrl_interface parsing (8021x) In bash built-in substring matching, '*' does not signify repetition of the previous character. commit 5511dc38c484d93fda0aaf57e30e6b82f8174918 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sun Jul 8 11:42:54 2012 +0200 Use grep instead of fgrep (FS#30598) Direct invocation as fgrep is deprecated. ----------------------------------------------------------------------- Summary of changes: scripts/wifi-menu | 2 +- src/8021x | 17 ++++++++++------- src/connections/ethernet | 2 +- src/network | 2 +- 4 files changed, 13 insertions(+), 10 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository annotated tag 2.8.6 created. 2.8.6
by jouke＠archlinux.org 07 Jul '12

07 Jul '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 annotated tag, 2.8.6 has been created at 0d3e7ed892c71e3e82b24cb993a8f68e2502b92d (tag) tagging 3d9c37274e5b9bb620a7fd1ea24071aeed06deee (commit) replaces 2.8.6rc1 tagged by Jouke Witteveen on Sat Jul 7 17:37:38 2012 +0200 - Log ----------------------------------------------------------------- Release 2.8.6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJP+FfNAAoJEFa2H7+CSSwVHDMH/1hm9mrJIj5RVFzNYqaeMHW+ z3VjYsn19AadFFDo9M0U61F3PByKGX5fOAbkIcIppJZKXXEzd83HYB2pP4kH2Nwj IJzmnuNjurXczOM/UaWTRt2/3uHiiS358sCg6aRGGFmn4d2iNbeSIathdJkIhgIg PfrcW7p7R581h5b7j6j1SWRxBOr8sikztDL7DAm7YancI6wPwZ2ov9UL0OcHCPck yAxOv5DKWHMeMq5ilKMGyG5AwKq8Q28RcDJcKVyktDYu/5U1u5tBb2VZM3Cw4XtY PbZeAYrGHK348Jo6cLDx8CKU6N946bsTEUm79qcZODME2/HNL2yqtPQ/MvR1c90= =1oS4 -----END PGP SIGNATURE----- Jouke Witteveen (1): 2.8.6 release updates ----------------------------------------------------------------------- hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.6rc1-1-g3d9c372
by jouke＠archlinux.org 07 Jul '12

07 Jul '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 3d9c37274e5b9bb620a7fd1ea24071aeed06deee (commit) from 1e9a74b2179da26d194f28a6854641bab2e4d505 (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 3d9c37274e5b9bb620a7fd1ea24071aeed06deee Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Jul 7 17:37:02 2012 +0200 2.8.6 release updates ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [initscripts] [PATCH] Correct spelling and grammar throughout
by jstjohn＠purdue.edu 06 Jul '12

06 Jul '12

From: "Jason St. John" <jstjohn(a)purdue.edu> This patch addresses the issues with my previous patch submission here: https://mailman.archlinux.org/pipermail/arch-projects/2012-June/002990.html The notable changes between this patch and the previous one are below: -- this patch does not rename set_timezone() -- 'filesystems' and 'bash' are left as-is -- everything is in one patch, not two -- the 'makedepends' change is no longer relevant because the duplication of it was already removed in a later commit Regarding the capitalization of "Btrfs", it seems that upstream prefers "Btrfs".[1][2] Regarding 'https://' vs. 'http://', I left this change in the patch because stating 'https://www.archlinux.org' in the start-up messages doesn't force anyone to use HTTPS over HTTP. It simply shows that HTTPS is available for use. If someone really doesn't want to use HTTPS, they don't have to. Finally, Dan McGee stated that HTTPS will be used all the time soon.[3] [1] https://oss.oracle.com/projects/btrfs/ [2] https://btrfs.wiki.kernel.org/index.php/Main_Page [3] https://bugs.archlinux.org/task/30486#comment96222 Signed-off-by: Jason St. John <jstjohn(a)purdue.edu> --- PKGBUILD | 4 ++-- functions | 38 +++++++++++++++++++------------------- netfs | 4 ++-- network | 10 +++++----- rc.conf.5.txt | 46 +++++++++++++++++++++++----------------------- rc.d.8.txt | 2 +- rc.local | 2 +- rc.shutdown | 26 +++++++++++++------------- rc.single | 4 ++-- rc.sysinit | 46 +++++++++++++++++++++++----------------------- 10 files changed, 91 insertions(+), 91 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index e7429cd..e2e4f3d 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -3,7 +3,7 @@ pkgver=$(date +%Y%m%d) pkgrel=$(git log -1 --pretty=format:%h) pkgdesc="System initialization/bootup scripts" arch=('any') -url="http://www.archlinux.org" +url="https://www.archlinux.org" license=('GPL') groups=('base') conflicts=('initscripts') @@ -26,5 +26,5 @@ build() { package() { cd .. - make DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir/" install } diff --git a/functions b/functions index 16f8d8f..f5537b1 100644 --- a/functions +++ b/functions @@ -2,7 +2,7 @@ # initscripts functions # -# sanitize PATH (will be overridden later when /etc/profile is sourced, but is useful for UDev) +# sanitize PATH (will be overridden later when /etc/profile is sourced but is useful for udev) export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin" localevars=(LANG LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY @@ -13,7 +13,7 @@ vconsolevars=(KEYMAP KEYMAP_TOGGLE FONT FONT_MAP FONT_UNIMAP) if [[ $1 == "start" ]]; then if [[ $STARTING ]]; then - echo "A daemon is starting another daemon, this is unlikely to work as intended." + echo "A daemon is starting another daemon; this is unlikely to work as intended." else export STARTING=1 fi @@ -69,7 +69,7 @@ unset TERM_COLORS # clear the TZ envvar, so daemons always respect /etc/localtime unset TZ -# sanitize the locale settins +# sanitize the locale settings unset "${localevars[@]}" parse_envfile() { @@ -325,13 +325,13 @@ kill_all_wait() { } kill_all() { - stat_busy "Sending SIGTERM To Processes" + stat_busy "Sending SIGTERM to processes" kill_all_wait 15 40 if (( $? == 0 )); then stat_done else stat_fail - status "Sending SIGKILL To Processes" kill_all_wait 9 60 + status "Sending SIGKILL to processes" kill_all_wait 9 60 fi } @@ -349,23 +349,23 @@ load_modules() { return $rc } -# Start/trigger UDev, load MODULES and settle UDev +# Start/trigger udev, load MODULES, and settle udev udevd_modprobe() { # $1 = where we are being called from. # This is used to determine which hooks to run. - status "Starting UDev Daemon" /usr/lib/systemd/systemd-udevd --daemon + status "Starting udev daemon" /usr/lib/systemd/systemd-udevd --daemon run_hook "$1_udevlaunched" - stat_busy "Triggering UDev uevents" + stat_busy "Triggering udev uevents" udevadm trigger --action=add --type=subsystems udevadm trigger --action=add --type=devices stat_done # Load modules from the MODULES array and modules-load.d - status -v "Loading User-specified Modules" load_modules + status -v "Loading user-specified modules" load_modules - status "Waiting for UDev uevents to be processed" \ + status "Waiting for udev uevents to be processed" \ udevadm settle run_hook "$1_udevsettled" @@ -401,14 +401,14 @@ do_unlock() { local _overwriteokay=0 if [[ -b $2 && -r $2 ]]; then # This is DANGEROUS! If there is any known file system, - # partition table, RAID or LVM volume on the device + # partition table, RAID, or LVM volume on the device, # we don't overwrite it. # # 'blkid' returns 2 if no valid signature has been found. - # Only in this case we should allow overwriting the device. + # Only in this case should we allow overwriting the device. # # This sanity check _should_ be sufficient, but it might not. - # This may cause dataloss if it is not used carefully. + # This may cause data loss if it is not used carefully. blkid -p "$2" &>/dev/null (( $? == 2 )) && _overwriteokay=1 fi @@ -481,7 +481,7 @@ set_timezone() { [[ $tz ]] || return 1 if [[ ! -e $zonefile ]]; then - printf "error: \`%s' is not a valid timezone\n" "$tz" + printf "error: \`%s' is not a valid time zone\n" "$tz" return 1 fi @@ -529,8 +529,8 @@ fsck_reboot() { echo "* *" echo "* Please repair manually and reboot. Note that the root *" echo "* file system is currently mounted read-only. To remount *" - echo "* it read-write type: mount -o remount,rw / *" - echo "* When you exit the maintenance shell the system will *" + echo "* it read-write, type: mount -o remount,rw / *" + echo "* When you exit the maintenance shell, the system will *" echo "* reboot automatically. *" echo "* *" echo "************************************************************" @@ -553,12 +553,12 @@ umount_all() { findmnt -mrunRo TARGET,FSTYPE,OPTIONS / | { while read -r target fstype options; do - # match only targetted fstypes + # match only targeted fstypes if [[ $1 && $1 != "$fstype" ]]; then continue fi - # don't unmount API filesystems + # do not unmount API filesystems if [[ $target = /@(proc|sys|run|dev|dev/pts) ]]; then continue fi @@ -580,7 +580,7 @@ umount_all() { } remove_leftover() { - status -v 'Removing Leftover Files' systemd-tmpfiles --create --remove --clean + status -v 'Removing leftover files' systemd-tmpfiles --create --remove --clean } bootlogd_stop() { diff --git a/netfs b/netfs index bd459ef..0733eab 100755 --- a/netfs +++ b/netfs @@ -6,7 +6,7 @@ case "$1" in start) - stat_busy "Mounting Network Filesystems" + stat_busy "Mounting network filesystems" mount -a -t "$NETFS" rc=$? mount -a -O _netdev @@ -15,7 +15,7 @@ case "$1" in stat_done ;; stop) - stat_busy "Unmounting Network Filesystems" + stat_busy "Unmounting network filesystems" umount -a -f -O _netdev rc=$? umount -a -f -t "$NETFS" diff --git a/network b/network index 322082c..494a11f 100755 --- a/network +++ b/network @@ -235,15 +235,15 @@ case "$1" in # deprecation check need_legacy && deprecated if ! ck_daemon network; then - echo "Network is already running. Try 'network restart'" + echo "Network is already running. Try 'network restart'" exit fi - stat_busy "Starting Network" + stat_busy "Starting network" error=0 if need_legacy; then # bring up bridge interfaces bridge_up - # bring up ethernet interfaces + # bring up Ethernet interfaces for ifline in ${INTERFACES[@]}; do if [[ $ifline = ${ifline#!} ]]; then ifup $ifline || error=1 @@ -271,11 +271,11 @@ case "$1" in # deprecation check need_legacy && deprecated if [[ $NETWORK_PERSIST =~ yes|YES && $RUNLEVEL == [06] ]]; then - status "Skipping Network Shutdown" true + status "Skipping network shutdown" true exit 0 fi - stat_busy "Stopping Network" + stat_busy "Stopping network" rm_daemon network error=0 if need_legacy; then diff --git a/rc.conf.5.txt b/rc.conf.5.txt index 347aba7..debb789 100644 --- a/rc.conf.5.txt +++ b/rc.conf.5.txt @@ -16,21 +16,21 @@ DESCRIPTION ----------- The /etc/rc.conf file is the system configuration file for Arch-specific settings. The format is bash. It contains several commonly-edited settings such -as timezone; keymap; kernel modules; daemons to load at start-up; etc. It is +as time zone, keymap, kernel modules, daemons to load at start-up, etc. It is split up in a few sections to categorize configuration settings: localization, -hardware, networking and daemons. +hardware, networking, and daemons. LOCALIZATION[[L]] ----------------- *TIMEZONE=* -Specifies the timezone. The setting takes effect on boot by ensuring that /etc/localtime is a symlink -to the correct zoneinfo file. Possible timezones are the relative path to a zoneinfo file starting -from the directory /usr/share/zoneinfo. For example, a German timezone would be Europe/Berlin, +Specifies the time zone. The setting takes effect on boot by ensuring that /etc/localtime is a symlink +to the correct zoneinfo file. Possible time zones are the relative path to a zoneinfo file starting +from the directory /usr/share/zoneinfo. For example, a German time zone would be Europe/Berlin, which refers to the file /usr/share/zoneinfo/Europe/Berlin. -Note: if empty, /etc/localtime is not changed. This is useful if /etc/localtime is maintained manually -or by a third-party tool; or if there is no reason to change it from what was set during install. +Note: If empty, /etc/localtime is not changed. This is useful if /etc/localtime is maintained manually +or by a third-party tool, or if there is no reason to change it from what was set during install. Default: empty @@ -43,9 +43,9 @@ Options: - empty: fall back to the value in /var/lib/hwclock/adjtime, which defaults to UTC. This is recommended as other users of hwclock might change the adjtime file and hence cause rc.conf and adjtime to be out of sync. - "UTC": most robust, allows operating systems to abstract local time and ease DST. - - "localtime": apply timezone (and DST) in hardwareclock: discouraged. - Choose this if you dualboot with an OS which cannot handle UTC BIOS times correctly, like Windows (note - that recent Windows'es can use UTC, which is preferable). + - "localtime": apply time zone (and DST) in hardwareclock: discouraged. + Choose this if you dual-boot with an OS which cannot handle UTC BIOS times correctly, like Windows (note + that recent Windows versions can use UTC, which is preferable). - any other value will result in the hardware clock being left untouched (useful for virtualization) Default: empty @@ -87,14 +87,14 @@ Default: empty *DAEMON_LOCALE=* - - If set to 'yes', use $LOCALE as the locale during daemon startup and during the boot process. + - If set to 'yes', use $LOCALE as the locale during daemon start-up and during the boot process. - If set to 'no', the C locale is used. Default: "yes" *USECOLOR=* -Use ANSI color sequences in startup messages +Use ANSI color sequences in start-up messages Default: "yes" @@ -102,26 +102,26 @@ HARDWARE[[H]] ------------- *MODULES=* -Modules to load at boot-up. To blacklist modules, see "man modprobe.d". See also -"man modules-load.d". +Modules to load at boot-up. To blacklist modules, see 'man 5 modprobe.d'. See also +'man 5 modules-load.d'. Default: (). *USEDMRAID=* -Scan for FakeRAID (dmraid) Volumes at startup. +Scan for FakeRAID (dmraid) volumes at start-up. Default: "no" *USEBTRFS=* -Scan for BTRFS volumes at startup. +Scan for Btrfs volumes at start-up. Default: "no" *USELVM=* -Scan for LVM volume groups at startup, required if you use LVM. +Scan for LVM volume groups at start-up. This is required if you use LVM. Default: "no" @@ -138,7 +138,7 @@ The following settings help you setting up a wired network. *interface=* -Name of device. Use 'ip addr' or 'ls /sys/class/net/' to see all available interfaces. +Name of device. Use `ip addr` or `ls /sys/class/net/` to see all available interfaces. Default: empty @@ -191,7 +191,7 @@ Required for manual configuration, ignored for DHCP. netmask= gateway= -The following options might be needed for advanced use-cases. +The following options might be needed for advanced use cases. *NETWORK_PERSIST=* @@ -201,7 +201,7 @@ Default: "no" *NETWORKS=* -This functionality is deprecated, please refer to the 'netcfg' documentation. +This functionality is deprecated; please refer to 'man 8 netcfg'. DAEMONS[[D]] ------------ @@ -213,10 +213,10 @@ Daemons to start at boot-up (in this order) - prefix a daemon with a @ to start it up in the background If you are sure nothing else touches your hardware clock (such as ntpd or -a dual-boot), you might want to enable 'hwclock'. Note that this will only +by dual-booting), you might want to enable 'hwclock'. Note that this will only make a difference if the hwclock program has been calibrated correctly. -If you use a network filesystem you should enable 'netfs'. +If you use a network filesystem, you should enable 'netfs'. Default: (syslog-ng network crond) @@ -227,4 +227,4 @@ hostname(5), vconsole.conf(5), locale.conf(5), hwclock(8) AUTHORS ------- -Written by Dieter Plaetinck, Tom Gundersen and others. +Written by Dieter Plaetinck, Tom Gundersen, and others. diff --git a/rc.d.8.txt b/rc.d.8.txt index 0f35884..df226d3 100644 --- a/rc.d.8.txt +++ b/rc.d.8.txt @@ -25,7 +25,7 @@ The actions supported by a rc scripts may be different from script to script, bu commonly supported actions include: *start*:: - Starts the script if it's not already running. + Starts the script if it is not already running. *stop*:: Stops a running script. diff --git a/rc.local b/rc.local index 4950cba..21254f1 100755 --- a/rc.local +++ b/rc.local @@ -1,6 +1,6 @@ #!/bin/bash # -# /etc/rc.local: Local multi-user startup script. +# /etc/rc.local: Local multi-user start-up script. # diff --git a/rc.shutdown b/rc.shutdown index d10b2da..2d79379 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -10,7 +10,7 @@ stty onlcr echo " " -printhl "Initiating Shutdown..." +printhl "Initiating shutdown..." echo " " run_hook shutdown_start @@ -19,19 +19,19 @@ run_hook shutdown_start stop_all_daemons -status 'Saving Random Seed' /usr/lib/systemd/systemd-random-seed save +status 'Saving random seed' /usr/lib/systemd/systemd-random-seed save -[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE" +[[ $TIMEZONE ]] && status "Configuring time zone" set_timezone "$TIMEZONE" # Write to wtmp file before unmounting halt -w -# stop monitoring of lvm2 groups before unmounting filesystems +# stop monitoring of LVM2 groups before unmounting filesystems [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) ]] && status "Deactivating monitoring of LVM2 groups" vgchange --monitor n # any future uevents can and should be ignored -status "Shutting down UDev" udevadm control --exit +status "Shutting down udev" udevadm control --exit run_hook shutdown_prekillall @@ -41,15 +41,15 @@ run_hook shutdown_postkillall run_hook shutdown_preumount -# unmount any non-api partitions that are backed by swap, we don't want to +# unmount any non-API partitions that are backed by swap; we don't want to # move their contents into memory (waste of time and might caues OOM). -status "Unmounting Swap-backed Filesystems" umount_all "tmpfs" +status "Unmounting swap-backed filesystems" umount_all "tmpfs" # almost everything is dead now, so the swap should hopefully be relatively # empty, and quick to switch off -status "Deactivating Swap" swapoff -a +status "Deactivating swap" swapoff -a -status "Unmounting Non-API Filesystems" umount_all +status "Unmounting non-API filesystems" umount_all run_hook shutdown_postumount @@ -90,14 +90,14 @@ if [[ -x /run/initramfs/shutdown ]]; then fi fi - # make /run/initrafs a mount + # make /run/initramfs a mount mount --bind /run/initramfs /run/initramfs # in case someone has shared our mountpoints, unshare them mount --make-private /run/initramfs mount --make-private / - # bind all api mounts + # bind all API mounts mkdir -p /run/initramfs/{sys,proc,dev,run,oldroot} mount --bind /sys /run/initramfs/sys mount --bind /proc /run/initramfs/proc @@ -108,7 +108,7 @@ if [[ -x /run/initramfs/shutdown ]]; then cd /run/initramfs pivot_root . oldroot - #reexec init + # reexec init /oldroot/sbin/init u # run /shutdown in the new root @@ -116,7 +116,7 @@ if [[ -x /run/initramfs/shutdown ]]; then else - status "Remounting Root Filesystem Read-only" \ + status "Remounting root filesystem read-only" \ mount -o remount,ro / # Power off or reboot diff --git a/rc.single b/rc.single index aec026c..3697ac3 100755 --- a/rc.single +++ b/rc.single @@ -1,6 +1,6 @@ #!/bin/bash # -# /etc/rc.single: Single-user startup script. +# /etc/rc.single: Single-user start-up script. # . /etc/rc.conf @@ -18,7 +18,7 @@ if [[ $PREVLEVEL != N ]]; then run_hook single_postkillall - # Start/trigger UDev, load MODULES and settle UDev + # Start/trigger udev, load MODULES, and settle udev udevd_modprobe single # Removing leftover files diff --git a/rc.sysinit b/rc.sysinit index 1106503..2d7df3e 100755 --- a/rc.sysinit +++ b/rc.sysinit @@ -14,10 +14,10 @@ fi echo " " printhl "Arch Linux\n" -printhl "${C_H2}http://www.archlinux.org" +printhl "${C_H2}https://www.archlinux.org" printsep -# mount the api filesystems +# mount the API filesystems # /proc, /sys, /run, /dev, /run/lock, /dev/pts, /dev/shm mountpoint -q /proc || mount -t proc proc /proc -o nosuid,noexec,nodev mountpoint -q /sys || mount -t sysfs sys /sys -o nosuid,noexec,nodev @@ -34,7 +34,7 @@ if [[ ! -e /run/initramfs/root-fsck ]]; then # remount root ro to allow for fsck later on, we remount now to # make sure nothing can open files rw on root which would block a remount findmnt / --options ro &>/dev/null || - status "Mounting Root Read-Only" mount -o remount,ro / + status "Mounting root read-only" mount -o remount,ro / fi run_hook sysinit_start @@ -48,26 +48,26 @@ case $HARDWARECLOCK in esac if [[ $HWCLOCK_PARAMS ]]; then - stat_busy "Adjusting system time and setting kernel timezone" + stat_busy "Adjusting system time and setting kernel time zone" - # Adjust the system time for timezone offset if rtc is not in UTC + # Adjust the system time for time zone offset if rtc is not in UTC # 1. Make creation time on device nodes sane (FS#8665) # 2. Filesystem checks can depend on system time # 3. This also sets the kernel time zone, used by e.g. vfat - # If TIMEZONE is not set in rc.conf, the timezone stored in /etc/localtime - # is used. If HARDWARECLOCK is not set in rc.conf, the value in - # /var/lib/hwclock/adjfile is used (in this case /var can not be a separate + # If TIMEZONE is not set in /etc/rc.conf, the time zone stored in /etc/localtime + # is used. If HARDWARECLOCK is not set in /etc/rc.conf, the value in + # /var/lib/hwclock/adjfile is used (in this case, /var cannot be a separate # partition). [[ $TIMEZONE ]] && export TZ=$TIMEZONE hwclock $HWCLOCK_PARAMS && stat_done || stat_fail unset TZ fi -# Start/trigger UDev, load MODULES and settle UDev +# Start/trigger udev, load MODULES, and settle udev udevd_modprobe sysinit # this must be done after udev has loaded the KMS modules -status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup +status 'Configuring virtual consoles' /usr/lib/systemd/systemd-vconsole-setup # bring up the loopback interface [[ -d /sys/class/net/lo ]] && @@ -77,11 +77,11 @@ status 'Configuring Virtual Consoles' /usr/lib/systemd/systemd-vconsole-setup [[ $USEDMRAID = [Yy][Ee][Ss] && -x $(type -P dmraid) ]] && status "Activating FakeRAID arrays" dmraid -i -ay -# BTRFS devices detection +# Btrfs devices detection [[ $USEBTRFS = [Yy][Ee][Ss] && -x $(type -P btrfs) ]] && - status "Activating BTRFS volumes" btrfs device scan + status "Activating Btrfs volumes" btrfs device scan -# Activate LVM2 groups if any +# Activate LVM2 groups, if any activate_vgs # Set up non-root encrypted partition mappings @@ -96,7 +96,7 @@ fi # Check filesystems run_hook sysinit_prefsck if [[ -x $(type -P fsck) ]]; then - stat_busy "Checking Filesystems" + stat_busy "Checking filesystems" fsck_all >|"${FSCK_OUT:-/dev/stdout}" 2>|"${FSCK_ERR:-/dev/stdout}" declare -r fsckret=$? (( fsckret <= 1 )) && stat_done || stat_fail @@ -108,25 +108,25 @@ run_hook sysinit_postfsck # Single-user login and/or automatic reboot if needed fsck_reboot $fsckret -status "Remounting Root and API filesystems" \ +status "Remounting root and API filesystems" \ /usr/lib/systemd/systemd-remount-fs -# now mount all the local filesystems +# Now mount all the local filesystems run_hook sysinit_premount -status "Mounting Local Filesystems" \ +status "Mounting local filesystems" \ mount_all run_hook sysinit_postmount -# enable monitoring of lvm2 groups, now that the filesystems are mounted rw +# Enable monitoring of LVM2 groups, now that the filesystems are mounted rw [[ $USELVM = [Yy][Ee][Ss] && -x $(type -P lvm) && -d /sys/block ]] && status "Activating monitoring of LVM2 groups" \ vgchange --monitor y >/dev/null -status "Activating Swap" swapon -a +status "Activating swap" swapon -a -[[ $TIMEZONE ]] && status "Configuring Time Zone" set_timezone "$TIMEZONE" +[[ $TIMEZONE ]] && status "Configuring time zone" set_timezone "$TIMEZONE" -status 'Initializing Random Seed' /usr/lib/systemd/systemd-random-seed load +status 'Initializing random seed' /usr/lib/systemd/systemd-random-seed load # Remove leftover files remove_leftover @@ -135,11 +135,11 @@ if [[ -s /etc/hostname ]]; then HOSTNAME=$(< /etc/hostname) fi if [[ $HOSTNAME ]]; then - stat_busy "Setting Hostname: $HOSTNAME" + stat_busy "Setting hostname: $HOSTNAME" echo "$HOSTNAME" >| /proc/sys/kernel/hostname && stat_done || stat_fail fi -stat_busy "Saving dmesg Log" +stat_busy "Saving dmesg log" if [[ -e /proc/sys/kernel/dmesg_restrict ]] && (( $(< /proc/sys/kernel/dmesg_restrict) == 1 )); then install -Tm 0600 <( dmesg ) /var/log/dmesg.log -- 1.7.11.1

1 0

Re: [arch-projects] [netcfg] Request for testing (was: Remove extra start_wpa/stop_wpa when not scanning)
by Jouke Witteveen 05 Jul '12

05 Jul '12

On Tue, Jul 3, 2012 at 3:11 AM, Jouke Witteveen <j.witteveen(a)gmail.com> wrote: > On Tue, Jul 3, 2012 at 3:00 AM, Henrik Hallberg <henrik(a)k2h.se> wrote: >> On Tue, Jul 03, 2012 at 01:16:07AM +0200, Jouke Witteveen wrote: >>> These changes look fine to me, but shitty code remains shitty code. >>> I'm not a big fan of the current organization of the code and the >>> distribution across connections/wireless and 8021x. >> >> So far, it has seemed better to submit small patches rather than larger >> ones. I could very well have spent time doing a larger refactoring. It >> seems to me, however, that I am not yet enough versed in the code and >> its' style to make an attempt with reasonable chances to pass review. >> >> This solves the problem of the extra calls only. A small, easily >> reviewable patch. The code behaves better with it, than without it. >> >> / H > > There's some comments in lines 73-75. They were ignored in commit > 0d4c3. Reverting said commit would solve this problem too. Any > thoughts what would be better? I like the old code, but the commit > message suggests that wpa_supplicant doesn't reassociate properly (at > least, that it didn't back then). If wpa_supplicant has improved, I'm > in favor of restoring the old code, which looks more reasonable to me. > Otherwise, the proposed patch will do. > > - Jouke Hello all, After some code-shuffling without rewriting everything (something I don't have the time for), netcfg is in a new and exiting state that needs testing. I would like to just push 2.8.6 rc1 to [testing] for this, but Florian noted that we normally don't put release candidates in [testing]. Is this the case for arch-projects too? In that case, can people please test the new netcfg? There are two ways of installing: = Bleeding edge: git clone git://projects.archlinux.org/netcfg.git cd netcfg make install = 2.8.6 rc1 git clone git://projects.archlinux.org/netcfg.git cd netcfg git checkout tags/2.8.6rc1 make pkgbuild mv PKGBUILD netcfg-2.8.6rc1.tar.xz /tmp cd /tmp makepkg pacman -U netcfg-2.8.6rc1-1-any.pkg.tar.xz (the last step as root) Regards, - Jouke

1 0