- Arch-projects - lists.archlinux.org

[arch-projects] [devtools][PATCH 4/4] lddd: Add /usr/local/lib to library directories
by Eric Bélanger 08 Jul '11

08 Jul '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- lddd | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/lddd b/lddd index de2145c..9695c9b 100755 --- a/lddd +++ b/lddd @@ -6,7 +6,7 @@ ifs=$IFS IFS="${IFS}:" -libdirs="/lib /usr/lib $(cat /etc/ld.so.conf.d/*)" +libdirs="/lib /usr/lib /usr/local/lib $(cat /etc/ld.so.conf.d/*)" extras= TEMPDIR=$(mktemp -d /tmp/lddd-script.XXXX) -- 1.7.6

1 0

[arch-projects] [INITSCRIPTS][PATCH] Remove usage of head in PKGBUILD
by Sebastien Luttringer 07 Jul '11

07 Jul '11

Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- PKGBUILD | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/PKGBUILD b/PKGBUILD index 5c9764c..d8b4717 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -1,6 +1,6 @@ pkgname=initscripts-git pkgver=$(date +%s) -pkgrel=$(git log --pretty=format:%h |head -n 1) +pkgrel=$(git log -1 --pretty=format:%h) pkgdesc="System initialization/bootup scripts" arch=('i686' 'x86_64') url="http://www.archlinux.org" -- Sebastien "Seblu" Luttringer

1 0

[arch-projects] [INITSCRIPTS][PATCH] changing _rd.d to _rc_d to avoid: /etc/bash_completion.d/rc.d: line 19: `_rc.d': not a valid identifier
by Sebastien Luttringer 07 Jul '11

07 Jul '11

From: derhoch <derhoch(a)googlemail.com> Signed-off-by: Sebastien Luttringer <seblu(a)seblu.net> --- bash-completion | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bash-completion b/bash-completion index e63e880..d78484e 100644 --- a/bash-completion +++ b/bash-completion @@ -1,6 +1,6 @@ # rc.d bash completion by Seblu <seblu(a)seblu.net> -_rc.d () +_rc_d() { local action cur prev action="help list start stop reload restart" @@ -19,6 +19,6 @@ _rc.d () COMPREPLY=($(cd /etc/rc.d && compgen -f -X 'functions*' "$cur"|sort)) fi } -complete -F _rc.d rc.d +complete -F _rc_d rc.d # vim: set ts=2 sw=2 ft=sh noet: -- Sebastien "Seblu" Luttringer

1 0

[arch-projects] [devtools][PATCH 3/3] lddd: Replace hardcoded list of library directories by those listed in /etc/ld.so.conf.d
by Eric Bélanger 07 Jul '11

07 Jul '11

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- lddd | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lddd b/lddd index 1bd69a8..de2145c 100755 --- a/lddd +++ b/lddd @@ -4,9 +4,9 @@ # ifs=$IFS -IFS=':' +IFS="${IFS}:" -libdirs='/lib:/usr/lib:/opt/qt/lib:/opt/kde/lib:/usr/lib/libfakeroot:/opt/NX/lib' +libdirs="/lib /usr/lib $(cat /etc/ld.so.conf.d/*)" extras= TEMPDIR=$(mktemp -d /tmp/lddd-script.XXXX) -- 1.7.6

1 0

[arch-projects] [PATCH 1/2] Ensure all variables are unset before loading profile
by Dan McGee 06 Jul '11

06 Jul '11

There is a possible leak of profile info from one to the next if profiles are loaded in sequence, due to the fact that we are running all of this in a shared environment. Unset all currently known variables at the start of load_profile(). This is most apparent in several functions in `src/network` which do looping calls of profile_up or profile_down (which in turn call load_profile). The script `wpa_actiond/netcfg-wpa_actiond` is safe due to its use of subshells. Signed-off-by: Dan McGee <dan(a)archlinux.org> --- This sucks a bit, but is a big failing of netcfg I found when writing my next patch. It screams "there must be a better way", but at the moment I'm not sure what that may be. The biggest problem is there is no central collection of these variables which I had to scrape from the various setup scripts. Thoughts? -Dan src-wireless/netcfg-auto-wireless | 1 - src/network | 9 ++++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src-wireless/netcfg-auto-wireless b/src-wireless/netcfg-auto-wireless index a3e3fb9..671d34e 100644 --- a/src-wireless/netcfg-auto-wireless +++ b/src-wireless/netcfg-auto-wireless @@ -37,7 +37,6 @@ wifi_auto() while read ap essid; do echo $AUTO_PROFILES | while read network; do ( - unset CONNECTION INTERFACE AP ESSID load_profile "$network" case "$CONNECTION" in wireless-old|wireless|wireless-dbus) diff --git a/src/network b/src/network index 87c0e77..316183e 100644 --- a/src/network +++ b/src/network @@ -8,6 +8,13 @@ # source profile, checking whether it exists and is usable load_profile() { + unset ADDR AP AUTH8021X CONNECTION DESCRIPTION + unset DHCP_OPTIONS DHCP_TIMEOUT DHCLIENT DNS DNS1 DNS2 DOMAIN + unset ESSID GATEWAY HIDDEN IFOPTS INTERFACE IP IPCFG + unset IWCONFIG + unset KEY NETMASK RFKILL RFKILL_NAME SCAN SEARCH TIMEOUT + unset VLAN_ID VLAN_PHYS_DEV + unset WPA_CONF WPA_COUNTRY WPA_DRIVER WPA_GROUP WPA_OPTS [[ -z "$1" ]] && return 1 if [[ ! -f "$PROFILE_DIR/$1" ]]; then report_err "Profile \"$1\" does not exist" @@ -24,7 +31,7 @@ load_profile() report_debug "Interface level configuration enabled: $IFACE_DIR/$INTERFACE" . "$IFACE_DIR/$INTERFACE" fi - . "$PROFILE_DIR/$1" # we want profile settings to override, so need to source profile again + . "$PROFILE_DIR/$1" if [[ ! -f "$CONN_DIR/$CONNECTION" ]]; then report_err "$CONNECTION is not a valid connection, check spelling or look at examples" return 1 -- 1.7.5.2

4 7

[arch-projects] [PATCH] Give net-auto-wired the same treatment as auto-wireless
by Dan McGee 06 Jul '11

06 Jul '11

Following in the footsteps of commit 5ac9b45f. * Support WIRED_INTERFACE in /etc/conf.d/netcfg * Check that WIRED_INTERFACE is defined else abort when starting * Add EnvironmentFile to systemd auto-wired service * Documentation typos and fixups Signed-off-by: Dan McGee <dan(a)archlinux.org> --- config/netcfg | 2 ++ docs/features | 6 +++--- ifplugd/net-auto-wired | 7 +++++++ ifplugd/net-auto-wired.service | 1 + wpa_actiond/net-auto-wireless | 2 +- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/config/netcfg b/config/netcfg index 055a87d..600062a 100644 --- a/config/netcfg +++ b/config/netcfg @@ -1,5 +1,7 @@ ## Define to the name of your wireless interface for net-auto-wireless WIRELESS_INTERFACE="wlan0" +## Define to the name of your wireless interface for net-auto-wired +WIRED_INTERFACE="eth0" ## List of profiles that can be started by net-auto-wireless ## defaults to the list of all wireless profiles diff --git a/docs/features b/docs/features index 3a7f3c3..6a93d75 100644 --- a/docs/features +++ b/docs/features @@ -36,13 +36,13 @@ Through the use of wpa_actiond which calls commands on a wpa_supplicant event, n To use this: 1. Install core/wpa_actiond -2. In /etc/rc.conf set WIRELESS_INTERFACE to your wireless interface, eg: +2. In /etc/conf.d/netcfg set WIRELESS_INTERFACE to your wireless interface, eg: - WIRELESS_INTERFACE="wlan0" + WIRELESS_INTERFACE="wlan0" 3. Run /etc/rc.d/net-auto-wireless start -To run on boot, add 'net-auto-wireles' to your DAEMONS line. +To run on boot, add 'net-auto-wireless' to your DAEMONS line. ## Per interface configuration diff --git a/ifplugd/net-auto-wired b/ifplugd/net-auto-wired index 9af8505..d81ee0e 100755 --- a/ifplugd/net-auto-wired +++ b/ifplugd/net-auto-wired @@ -2,12 +2,19 @@ . /etc/rc.conf . /etc/rc.d/functions +. /etc/conf.d/netcfg if [[ ! -x /usr/sbin/ifplugd ]]; then echo "Please install 'ifplugd' to use net-auto-wired" exit 1 fi +if [ -z "${WIRED_INTERFACE}" ]; then + echo "No interface name set. Add a line to /etc/conf.d/netcfg:" + echo " WIRED_INTERFACE=\"your_interface\"" + exit 1 +fi + CFG=/etc/ifplugd/ifplugd.conf ACTION=/etc/ifplugd/netcfg.action PIDFILE=/var/run/ifplugd.$WIRED_INTERFACE.pid diff --git a/ifplugd/net-auto-wired.service b/ifplugd/net-auto-wired.service index b356fef..321a62e 100644 --- a/ifplugd/net-auto-wired.service +++ b/ifplugd/net-auto-wired.service @@ -4,6 +4,7 @@ Before=network.target [Service] EnvironmentFile=/etc/rc.conf +EnvironmentFile=/etc/conf.d/netcfg EnvironmentFile=-/etc/ifplugd/ifplugd.conf ExecStart=-/usr/sbin/ifplugd -i $WIRED_INTERFACE -r /etc/ifplugd/netcfg.action -fIn -u0 -d10 ExecStop=-/usr/sbin/ifplugd -k -i $WIRED_INTERFACE -r /etc/ifplugd/netcfg.action diff --git a/wpa_actiond/net-auto-wireless b/wpa_actiond/net-auto-wireless index d6a3c44..4f45dc4 100755 --- a/wpa_actiond/net-auto-wireless +++ b/wpa_actiond/net-auto-wireless @@ -11,7 +11,7 @@ if [[ ! -x /usr/sbin/wpa_actiond ]]; then fi if [ -z "${WIRELESS_INTERFACE}" ]; then - echo "No interface name set. Add to /etc/conf.d/netcfg a line" + echo "No interface name set. Add a line to /etc/conf.d/netcfg:" echo " WIRELESS_INTERFACE=\"your_interface\"" exit 1 fi -- 1.7.6

1 0

[arch-projects] [initscripts] [PATCH 00/11] A new rag rug roll
by Kurt J. Bosch 03 Jul '11

03 Jul '11

* Clean up positions of hooks the way suggested by Tom Note: I eliminated the reason for the fsck_all exception in fbsplash-extras by simply duplicating the stat_busy message text. * Some more cleanup * Two nice and fresh tweaks for kill_everything * Finally the old two of three again Kurt J. Bosch (11): functions/rc.single: Clean up whitespace functions: Clean up positions of hooks relative to status functions: Use status in mount_all() functions: Get rid of superfluous braces in udevd_modprobe() functions/rc.sysinit: Use $1 for determining hooks in fsck_all/mount_all functions/rc.multi: Strip paths from binaries functions: Simplify ck_autostart() by refactoring using in_array() functions: Add stop_all_daemons() and related *_prestopdaemons hook functions: Speed up reboot/shutdown by recognizing killall5 exit code 2 Add install_file() for readability functions: Simplify LC_* unsetting functions | 137 ++++++++++++++++++++++++++++++++++++----------------------- rc.multi | 2 +- rc.shutdown | 2 +- rc.single | 4 +- rc.sysinit | 15 +++--- 5 files changed, 95 insertions(+), 65 deletions(-)

3 24

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository annotated tag 0.7.1 created. 0.7.1
by thomas＠archlinux.org 03 Jul '11

03 Jul '11

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 annotated tag, 0.7.1 has been created at 5fa995d1e98b03b4d802e78dcded279b03f682cd (tag) tagging c262a6dd486070018351b776d8612373590c2f74 (commit) replaces 0.7 tagged by Thomas Bächler on Sun Jul 3 14:25:30 2011 +0200 - Log ----------------------------------------------------------------- Release version 0.7 Dave Reisner (17): bash-completion: complete -k on kernel images bash-completion: match style to rest of code bash-completion: use a PE instead of sed function: return with 0 if we reach the end of add_binary functions: reduce calls to modinfo avoid touching the linker directly mkinitcpio: use msg instead of echo for hook help lsinitcpio: append, not overwrite found hooks lsinitcpio: add optional colorized output function: fix whitespace errors functions: call _add_file directly from add_module always exit from cleanup functions: reorg, no code changes install modules all at once base/install: rewrite the config to sanitize it cleanup rarely and unused variable declarations functions: remove cruft from in_array Gerardo Exequiel Pozzi (1): Fix -k /path when -b is used Thomas Bächler (4): init_functions/default_mount_handler: use -l option for blkid to avoid syntax errors in a later mount command Trim leading spaces in MODULES and earlymodules to prevent error messages when one is set to " " Merge branch 'working' of https://github.com/falconindy/mkinitcpio into working Release version 0.7.1 ----------------------------------------------------------------------- hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7-22-gc262a6d
by thomas＠archlinux.org 03 Jul '11

03 Jul '11

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 c262a6dd486070018351b776d8612373590c2f74 (commit) via 179d4d5db40ec89144fbb11b0ef2e23105466890 (commit) via a079f4f2b3607ae4fcfe72dba913d6589fa35f4c (commit) via 127517d9c3cecbab255c2e1247bc12ccc72c914e (commit) via 320ef8bdebf867f18cf475bcf46dd578c6295fd7 (commit) via 08d7abb0769701e3c14053b1b2406147ef9dd021 (commit) from da81935dbb203340e9f3b394d4f6f4e5b3aa63c4 (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 c262a6dd486070018351b776d8612373590c2f74 Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sun Jul 3 14:25:20 2011 +0200 Release version 0.7.1 commit 179d4d5db40ec89144fbb11b0ef2e23105466890 Merge: 320ef8b a079f4f Author: Thomas Bächler <thomas(a)archlinux.org> Date: Sun Jul 3 14:11:09 2011 +0200 Merge branch 'working' of https://github.com/falconindy/mkinitcpio into working commit a079f4f2b3607ae4fcfe72dba913d6589fa35f4c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 16:43:58 2011 -0400 functions: remove cruft from in_array the for loop is already a NOOP when the haystack is empty, so it already falls through to the return 1. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 127517d9c3cecbab255c2e1247bc12ccc72c914e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 16:34:31 2011 -0400 cleanup rarely and unused variable declarations Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 320ef8bdebf867f18cf475bcf46dd578c6295fd7 Author: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> Date: Sat Jul 2 11:56:38 2011 -0300 Fix -k /path when -b is used Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> commit 08d7abb0769701e3c14053b1b2406147ef9dd021 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 2 10:18:22 2011 -0400 base/install: rewrite the config to sanitize it Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- functions | 5 ++--- install/base | 17 +++++++++++++++-- mkinitcpio | 9 +++------ 4 files changed, 21 insertions(+), 12 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [initscripts] [PATCH 07/12] functions: Deprecate in_array(), Add replacement is_in_array()
by Kurt J. Bosch 03 Jul '11

03 Jul '11

* in_array() strips '@' and therefore the name is missleading. * For checking DAEMONS, ck_autostart() should be used. --- functions | 19 ++++++++++++++++--- 1 files changed, 16 insertions(+), 3 deletions(-) diff --git a/functions b/functions index 11f8317..375efbf 100644 --- a/functions +++ b/functions @@ -164,10 +164,23 @@ status() { return 1 } -# usage : in_array( $needle, $haystack ) +# usage : is_in_array( $needle, $haystack ) # return : 0 - found # 1 - not found +# Note: For checking DAEMONS, ck_autostart() should be used! +is_in_array() { + local needle=$1; shift + local item + for item; do + [[ $item = $needle ]] && return 0 + done + return 1 # Not Found +} + +# This is deprecated! +# It strips '@' and therefore the name is missleading. in_array() { + echo "WARNING: Call to deprecated function in_array() from $0" >&2 local needle=$1; shift local item for item; do @@ -274,7 +287,7 @@ kill_everything() { for daemon in /run/daemons/*; do [[ -f $daemon ]] || continue daemon=${daemon##*/} - in_array "$daemon" "${DAEMONS[@]}" || stop_daemon "$daemon" + ck_autostart "$daemon" && stop_daemon "$daemon" done # Shutdown daemons in reverse order @@ -371,7 +384,7 @@ fsck_all() { FSCK_ERR=/dev/stdout FSCK_FD= FORCEFSCK= - [[ -f /forcefsck ]] || in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f" + [[ -f /forcefsck ]] || is_in_array forcefsck $(< /proc/cmdline) && FORCEFSCK="-- -f" run_hook "$1_prefsck" -- 1.7.1

1 0