- Arch-projects - lists.archlinux.org

[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

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

05 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.6rc1 has been created at d6e60f155d57e415f83bb7793e4727ac707af606 (tag) tagging 1e9a74b2179da26d194f28a6854641bab2e4d505 (commit) replaces 2.8.5 tagged by Jouke Witteveen on Thu Jul 5 17:31:44 2012 +0200 - Log ----------------------------------------------------------------- Release Candidate 1 for 2.8.6 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) iQEcBAABAgAGBQJP9bOJAAoJEFa2H7+CSSwVdiwIALdKDhAcGSurB35mLeSs5Z5R E4bb7RNiCYvIgoBeQmH2FJYsfrLzedYK5hvxDvZw8lnHTt0iQGbzxzrETQ08bAoD D068nOgX2iIaG9E8BdNMdhkUB4FSim/WUG3QbE4JRlue8nkrYLp/KxDsHsRPRZSZ 0rsbMgJgz1+7OQnhla9K2aSoEBMk/Uoc4YDieoaYaaXW0iA1bZqb88crWRuvNIcj pOj1rrbYI8k4ewvzwDSQFUw3PAdtYAdH46UNyOj5eDpqogalH3vSaPQB+MZ3Qyen lfCvPGiMjRgbLkfANCPFbcTI5TLUXJ9RUrI5O5ZCr/8mCbBxwf27XrpWqyxrFAs= =BKWL -----END PGP SIGNATURE----- Henrik Hallberg (2): Wait actively in {start, stop}_wpa Lower latency in timeout_wait Jouke Witteveen (10): Don't be cryptic Better file handling in wifi-menu Revert "Don't rely on wpa_cli reconfigure to reload wpa.conf" Better grep usage Cleanup src/network Changes needed after b0373 Rethink management of socket location for wpa_supplicant Remove unused status functions Don't try to kill a dead wpa_actiond (FS#29963) 2.8.6 release candidate 1 updates Tasos Latsas (1): wifi-menu: fix name of wireless key variable ----------------------------------------------------------------------- hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.5-13-g1e9a74b
by jouke＠archlinux.org 05 Jul '12

05 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 1e9a74b2179da26d194f28a6854641bab2e4d505 (commit) via 046f9da64727f08ae243c1aac8ccdb46b95847ac (commit) via b05d29e34ac3e870c5ae384ae63545a547440dd5 (commit) via 0f5eb3ef064c4a62a5ba3c8f4733f8e61556687b (commit) from c2036ac1ab643040d6cf98e682ed171114d87090 (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 1e9a74b2179da26d194f28a6854641bab2e4d505 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jul 5 17:31:01 2012 +0200 2.8.6 release candidate 1 updates commit 046f9da64727f08ae243c1aac8ccdb46b95847ac Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jul 5 13:50:04 2012 +0200 Don't try to kill a dead wpa_actiond (FS#29963) wpa_actiond kills itself when wpa_supplicant propagates its termination. commit b05d29e34ac3e870c5ae384ae63545a547440dd5 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jul 5 13:30:23 2012 +0200 Remove unused status functions commit 0f5eb3ef064c4a62a5ba3c8f4733f8e61556687b Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Thu Jul 5 13:17:13 2012 +0200 Rethink management of socket location for wpa_supplicant This may be set in a custom supplicant configuration file. All this is needed to cater for that. The new name of the tracking variable is WPA_CTRL_DIR, conform the environment variable of wpa_cli -a. ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- NEWS | 8 ++++- scripts/netcfg-wpa_actiond | 4 +-- scripts/wifi-menu | 6 +--- src/8021x | 73 ++++++++++++++++++++++++++++---------------- src/connections/bond | 8 ----- src/connections/bridge | 5 --- src/connections/ethernet | 13 +------- src/connections/tunnel | 4 --- src/connections/tuntap | 8 ----- src/connections/vlan | 8 ----- src/connections/wireless | 23 +++----------- 12 files changed, 62 insertions(+), 100 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [netcfg] Reviewing old code: custom control paths
by Jouke Witteveen 05 Jul '12

05 Jul '12

Dear Rémy, I came across commit a1fc1 to netcfg. It refers FS#24949 both in the commit message and the comments. That bug looks completely unrelated. Can you elaborate why it was/is needed to support custom control paths? Dealing with WPA_CTRL_PATH makes for messy code, currently. I guess if we want to go with supporting it, someone should write a wpa_cli wrapper that 1) uses WPA_CTRL_PATH if it is set, or extract it (currently connections/ethernet and connections/wireless duplicate code) 2) else determines WPA_CTRL_PATH from th profile that is active on the interface 3) else uses a default value I'd rather go back to the situation with a fixed control path (but please, convince me of the need of custom paths). Additionally, extraction from the profile is not always right as it could interpret ctrl_interface values that are not directories as directories. Regards, - Jouke

2 1

[arch-projects] [initscripts][PATCH] remove /run/nologin before leaving rc.multi
by Dave Reisner 04 Jul '12

04 Jul '12

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> --- Tom: I've applied this to initscripts and released a new pkg just to avoid any pain that this would otherwise undoubtedly cause. There's a few solutions to this problem but I thought that this would be the most straightforward. Feel free to disagree and we can work out an alternative. rc.multi | 2 ++ 1 file changed, 2 insertions(+) diff --git a/rc.multi b/rc.multi index daf2372..7d4acaa 100755 --- a/rc.multi +++ b/rc.multi @@ -31,4 +31,6 @@ run_hook multi_end bootlogd_stop +rm -f /run/nologin + # vim: set ts=2 sw=2 noet: -- 1.7.11.1

2 1

[arch-projects] [netcfg] [PATCH 0/4] Connecting to wireless speedups
by Henrik Hallberg 03 Jul '12

03 Jul '12

Hi, A couple of patches that speeds up connecting to wireless networks. Connecting to my home WPA DHCP, I went from ~12s to ~8s, the meat of which in patch 0004. Henrik Hallberg (4): Include timestamp in DEBUG message Remove extra start_wpa/stop_wpa when not scanning Lower latency in timeout_wait Wait actively in {start,stop}_wpa src/8021x | 17 +++++++++++------ src/connections/wireless | 17 +++++++++-------- src/globals | 5 +++-- 3 files changed, 23 insertions(+), 16 deletions(-) -- 1.7.11.1

3 18

[arch-projects] [netcfg] [GIT] netcfg network scripts repository branch master updated. 2.8.5-9-gc2036ac
by jouke＠archlinux.org 03 Jul '12

03 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 c2036ac1ab643040d6cf98e682ed171114d87090 (commit) via ca3e0f60d834d1d9fa57440c134a5ca4332ba394 (commit) via 6ed493eed48764ba532c0c365db0e281e8bcd17d (commit) via 7e2ff917a67573ed957d57d2fd077b4c219c0d86 (commit) via b0373830cd79e35ea0d266726109c36a57122857 (commit) via 58ea28491738bdc7f351083ee838955f475e4405 (commit) via 2a97de914054140b93e5eb163c2da73ec5001ee3 (commit) from 294a65132b88324d3ed917635fa84cf42f0a90f7 (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 c2036ac1ab643040d6cf98e682ed171114d87090 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jul 3 13:25:05 2012 +0200 Changes needed after b0373 The reverted state wasn't entirely compatible with the current code. The WPA_CTRL_PATH handling throughout netcfg is ugly. commit ca3e0f60d834d1d9fa57440c134a5ca4332ba394 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jul 3 12:18:37 2012 +0200 Cleanup src/network quirk() is not used anymore, inarray() doesn't belong in src/network. commit 6ed493eed48764ba532c0c365db0e281e8bcd17d Author: Henrik Hallberg <henrik(a)k2h.se> Date: Mon Jul 2 23:07:19 2012 +0200 Lower latency in timeout_wait commit 7e2ff917a67573ed957d57d2fd077b4c219c0d86 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jul 3 12:05:24 2012 +0200 Better grep usage When possible, fgrep is preferred. This prevents interpreting variable search patterns as expressions. In setting the control paths, the search expression was updated to match what wpa_supplicant uses. commit b0373830cd79e35ea0d266726109c36a57122857 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jul 3 12:01:41 2012 +0200 Revert "Don't rely on wpa_cli reconfigure to reload wpa.conf" This reverts commit 0d4c3ce797e688e146768bac07f6162d02634140. The reverted commit created a situation where wpa_supplicant is unnecessarily started and stopped in many cases, causing noticeable delay. If wpa_supplicant still fails to associate properly, wpa_reconfigure() should be modified in src/8021x. commit 58ea28491738bdc7f351083ee838955f475e4405 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Tue Jul 3 03:37:31 2012 +0200 Better file handling in wifi-menu - Prevent slashes from entering potential profile filenames - Remove scan results file in EXIT trap commit 2a97de914054140b93e5eb163c2da73ec5001ee3 Author: Henrik Hallberg <henrik(a)k2h.se> Date: Tue Jul 3 03:11:12 2012 +0200 Wait actively in {start, stop}_wpa Check .pid file regularly instead of waiting a second blindly. Saves up to a second of wall time per call. ----------------------------------------------------------------------- Summary of changes: scripts/wifi-menu | 19 ++++++++++--------- src/8021x | 20 +++++++++----------- src/connections/ethernet | 4 ++-- src/connections/wireless | 21 +++++++++------------ src/globals | 16 +++++++++++++++- src/network | 22 ---------------------- 6 files changed, 45 insertions(+), 57 deletions(-) hooks/post-receive -- netcfg network scripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch systemd-cryptsetup updated. 2012.06.2-8-g739ad91
by tomegun＠archlinux.org 30 Jun '12

30 Jun '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, systemd-cryptsetup has been updated discards 149deb014002e3ffc81a5dbbf26bc1d134edf6f4 (commit) via 739ad91ea776a23fdf7d9f27d1c6200fa46a1b3c (commit) This update added new revisions after undoing existing revisions. That is to say, the old revision is not a strict subset of the new revision. This situation occurs when you --force push a change and generate a repository containing something like this: * -- * -- B -- O -- O -- O (149deb014002e3ffc81a5dbbf26bc1d134edf6f4) \ N -- N -- N (739ad91ea776a23fdf7d9f27d1c6200fa46a1b3c) When this happens we assume that you've already had alert emails for all of the O revisions, and so we here report only the revisions in the N branch from the common base, B. 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 739ad91ea776a23fdf7d9f27d1c6200fa46a1b3c Author: Tom Gundersen <teg(a)jklm.no> Date: Thu Jun 28 01:55:40 2012 +0200 cryptsetup: use systemd-cryptsetup rather than rolling our own WORK IN PROGRESS; MOSTLY UNTESTED! We support the Arch syntax and the systemd syntax for specifying passwords. There are a few edgecases where there is ambiguity: * non-random devices under /dev are assumed to be blockdevices that we want to mount. This is not necessarily the case (could be you want to treat them as raw keyfiles), and we can certainly make better assumptions here. * the previously valid inline passwords '-' and 'none' are now considered acronyms for ASK. We map our 'options' syntax to systemd's to the extent possible. This should cover all usecases, but needs more review (compare with cryptsetup(8)). We complain loudly about 'legacy' syntax, but almost everything should still continue to work. Fixes-by: Dave Reisner <d(a)falconindy.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: functions | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) hooks/post-receive -- Arch Linux initscripts repository

1 0