- Arch-projects - lists.archlinux.org

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.7.2-28-gbeeb92c
by dreisner＠archlinux.org 01 Oct '11

01 Oct '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 beeb92cf3306a84f65ac62a6ca49424c62a6412d (commit) via 575c9c458264ca4e507a6a08eb104de5d1255556 (commit) via a831b86df5f1728acfd6bbf676b61cb962029a4d (commit) via 4a092cef75982e5bc4eb2e8c3f26016bdeec8e9a (commit) via e17f8d09ad9ef5f640d5397942221ed3ef290cdb (commit) via 0495018de76d5f18a14b3adf6522ff0421aa5d35 (commit) via 9794b3de943908858920e91bc54b4948b6d1468d (commit) via ef7c66b58b7947f1d06c9d8b8b170b5b84592c76 (commit) via 39d7c2925a71d631cdb7711898eaeefa93af816a (commit) via a0ea96ea0126814c518ffdc50449005b5b55d28e (commit) via e0549901aec53f3a0dc9577e88c4077d7bd9f6a7 (commit) via 1d7411e22a89da4aa57480fe6420d5dbfb2eca90 (commit) via 0cf23b50857da57971e4bf063ba3cf5bb2cf5477 (commit) via cc36db45aecb3c39cb5368c3cf2a1203a18daba7 (commit) via 84226d26c065b3c1eb6f2dcf551f416d284278d5 (commit) via 111abbd9fcab6b50ee43329f19560b674c6ac97f (commit) via 06331559487ccc6cca1b770b2e21c5e3f7bec5c3 (commit) via 5a0f7ebc8d2cede7532539268e0ffc0bd6816572 (commit) via ff557b25937b3511dd04e009a4735b73d1279d4c (commit) via 1ce14002289b676c54729e9d9dfaa7f6fd58024b (commit) via 1793ad71472d85912dd258cc6730e20a46dbbb17 (commit) via 7143433a883287b3dc74288e92100f78443f386f (commit) via d8505d4a4b646083ccdc959713951cb8174bbf47 (commit) from c9c9cb509f3718e6581f8789c2ae6efe57b189b1 (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 beeb92cf3306a84f65ac62a6ca49424c62a6412d Author: Florian Pritz <bluewind(a)xinu.at> Date: Sat Jul 9 16:46:23 2011 +0200 harden version generation If you run make dist, extract that tarball somewhere else and try to run makepkg it will fail because it can't find the git tree anymore. [Dave: removed --dirty flag, as this breaks makepkg] Signed-off-by: Florian Pritz <bluewind(a)xinu.at> commit 575c9c458264ca4e507a6a08eb104de5d1255556 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Sep 26 13:51:09 2011 -0400 init_functions: use constants on LHS of tests If we encounter a BOOT_IMAGE var taken from grub2, the first character could be a '(' which will throw off busybox's parser and error out. Reverse the comparison so that the LHS is always a constant, which can be compared to anything (including nothing at all). Fixes FS#26119. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a831b86df5f1728acfd6bbf676b61cb962029a4d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Sep 3 22:52:40 2011 -0400 use correct variable to reference compression method Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 4a092cef75982e5bc4eb2e8c3f26016bdeec8e9a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 9 17:54:18 2011 -0400 functions: fix output order in _add_symlink Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e17f8d09ad9ef5f640d5397942221ed3ef290cdb Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 7 16:39:09 2011 -0400 lsinitcpio: follow symlinks only when necessary If the image we're pointing to is a symlink, show the resolution as part of the name in -a's output. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 0495018de76d5f18a14b3adf6522ff0421aa5d35 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 2 13:24:04 2011 -0400 lsinitcpio: disable color when stdout isn't a tty This was a copypasta error when taking this from makepkg, which has special concerns in this regard. lsinitcpio should only concern itself with stdout. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 9794b3de943908858920e91bc54b4948b6d1468d Author: Dave Reisner <dreisner(a)archlinux.org> Date: Fri Jul 22 18:20:12 2011 -0400 init: allow /run to be mounted with exec perms This is already done in initscripts so we mirror it here. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ef7c66b58b7947f1d06c9d8b8b170b5b84592c76 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 16 23:34:43 2011 -0400 init: support breaks before and after mounting root Add in 'premount' and 'postmount' as trigger conditions, but also leave in the old 'y' value as a synonym for premount. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 39d7c2925a71d631cdb7711898eaeefa93af816a Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Aug 2 14:55:41 2011 -0400 mkinitcpio: insist that /dev and /proc be mounted This avoids errors with process substitutions in chroots, among other things. It's important that /proc be checked first as /etc/mtab might be a link to /proc/self/mounts. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit a0ea96ea0126814c518ffdc50449005b5b55d28e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 30 16:08:05 2011 -0400 mkinitcpio: keep going even when a hook isn't found Instead of bailing entirely, throw an error, and ensure that we exit with a non-zero status. The user might do something as simple as misspell a hook name which may or may not prevent a useful image from being created. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit e0549901aec53f3a0dc9577e88c4077d7bd9f6a7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 27 13:47:21 2011 -0400 mkinitcpio: explicitly create $BUILDROOT Avoids explosions if a user has no HOOKS in their config, as seen: https://bbs.archlinux.org/viewtopic.php?pid=966344 Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1d7411e22a89da4aa57480fe6420d5dbfb2eca90 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 18 08:35:38 2011 -0400 mkinitcpio: fix whitespace errors in error messages Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 0cf23b50857da57971e4bf063ba3cf5bb2cf5477 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 17 19:21:54 2011 -0400 mkinitcpio: simplify setting of SKIPHOOKS Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit cc36db45aecb3c39cb5368c3cf2a1203a18daba7 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 11 22:02:41 2011 -0400 ensure local scoping of variables Also make sure that simple variables are declared as null strings. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 84226d26c065b3c1eb6f2dcf551f416d284278d5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Aug 7 10:17:01 2011 -0400 functions: specify the delimiter to xargs Without specifying this, xargs will split arguments on whitespace as well as newlines, and will interpret quoting and backslashes. When the delimiter is specified, every character is taken literally and only the given delimiter in honored. This sidesteps issues with broken modalias files as evidenced by a MacBookAir3,1 or the bbs thread below: https://bbs.archlinux.org/viewtopic.php?pid=971853 Also fixes FS#25450. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 111abbd9fcab6b50ee43329f19560b674c6ac97f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Jul 23 12:20:42 2011 -0400 functions: perform path lookup for binaries if needed We used to do this, but it was lost somewhere along the way in fixing up basedir support. Add in a 'pathlookup' function which can do a search within any given basedir. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 06331559487ccc6cca1b770b2e21c5e3f7bec5c3 Author: Dave Reisner <d(a)falconindy.com> Date: Thu Jul 14 22:59:36 2011 -0400 functions: refactor get_{base,dir}name Make sure these are completely safe for user input. Use the same three step process in both cases: 1) Strip any trailing slash 2) Trim the string according to base/dir request 3) Print the result, defaulting to / if step 2 yielded an empty string Signed-off-by: Dave Reisner <d(a)falconindy.com> commit 5a0f7ebc8d2cede7532539268e0ffc0bd6816572 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 10 22:20:28 2011 -0400 functions: allow ignoring errors on module addition We conditionally, but naively, add modules in some of our install hooks, but the kernel may not have these. Note that these modules can fail silently by detecting a '?' suffix on the module name. In conjunction with this, the add_module function now takes a flag, -t or --try, which will ignore module not found errors from modinfo. The config file will also support this syntax. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ff557b25937b3511dd04e009a4735b73d1279d4c Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Jul 13 14:30:29 2011 -0400 base: remove superfluous leading / The doubled up leading slashes annoy me in the verbose output. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1ce14002289b676c54729e9d9dfaa7f6fd58024b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 10 22:44:04 2011 -0400 cleanup and bashify install hooks No logical code changes -- this is purely a syntactical cleanup and standardization across the build hooks along with ensuring that help messages are wrapped to 80 columns or less. All hooks get the same treatment, adhering to the following style: #!/bin/bash build() { COMMANDS } help() { cat <<HELPEOF This is a help message. HELPEOF } # vim: set ft=sh ts=4 sw=4 et: Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 1793ad71472d85912dd258cc6730e20a46dbbb17 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Jul 12 20:53:42 2011 -0400 keymap: simplify unicode detection Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7143433a883287b3dc74288e92100f78443f386f Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Jul 10 22:12:23 2011 -0400 keymap/consolefont: source rc.conf properly from $BASEDIR This is partially in response to FS#24685, which should hopefully cut back on configuration duplication on non-sysvinit systems. This does, however, also fix a bug with keymap/consolefont pulling the wrong rc.conf when BASEDIR is not '/' or unset. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit d8505d4a4b646083ccdc959713951cb8174bbf47 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Mon Jul 11 22:23:36 2011 -0400 install/consolefont: cleanup and refactor * Provide support for uncompressed font files as well as compressed * Avoiding using an unnecessary temp file * Support $BASEDIR * Warn when no font is found * Only add the runtime hook if a font is added Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 7 ++- PKGBUILD | 4 +- functions | 78 ++++++++++++++++----- hooks/keymap | 13 ++-- init | 12 +++- init_functions | 6 +- install/base | 4 +- install/btrfs | 15 ++-- install/consolefont | 56 ++++++++------- install/dsdt | 21 ++---- install/filesystems | 2 +- install/fw | 29 +++----- install/ide | 30 +++----- install/keymap | 24 ++++--- install/memdisk | 19 +++--- install/net | 195 +++++++++++++++++++++++++-------------------------- install/pata | 4 +- install/pcmcia | 29 ++++---- install/resume | 19 ++--- install/sata | 4 +- install/scsi | 4 +- install/sleep | 27 +++---- install/udev | 33 ++++----- install/usb | 32 ++++----- install/usbinput | 30 +++----- lsinitcpio | 8 ++- mkinitcpio | 27 ++++--- 27 files changed, 375 insertions(+), 357 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2011.09.2 created. 2011.09.2
by tomegun＠archlinux.org 29 Sep '11

29 Sep '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 "Arch Linux initscripts repository". The annotated tag, 2011.09.2 has been created at d3147934285eb07e7066b999cb59de59594bc4bc (tag) tagging 4f4681a94923e69b9e078db6f2cae585ecbbb612 (commit) replaces 2011.09.1 tagged by Tom Gundersen on Thu Sep 29 15:27:44 2011 +0200 - Log ----------------------------------------------------------------- Minor fixes Dave Reisner (1): respect the user's choice for /etc/localtime Tom Gundersen (2): rc.conf: disable hwclock and netfs by default hooks: move shutdown_poweroff before remounting / ro ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.09.2
by tomegun＠archlinux.org 29 Sep '11

29 Sep '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 "Arch Linux initscripts repository". The branch, master has been updated via 4f4681a94923e69b9e078db6f2cae585ecbbb612 (commit) from 6358d9e6b1abd4514f7d342334d3a3e0d8b276a0 (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 4f4681a94923e69b9e078db6f2cae585ecbbb612 Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Sep 26 16:01:45 2011 +0200 hooks: move shutdown_poweroff before remounting / ro This will make sure the same hook is run regardless of whether you pivot to the shutdown ramfs or not. This is in order to run apcupsd --killpower as pointed out by Gerardo. Signed-off-by: Tom Gundersen <teg(a)jklm.no> ----------------------------------------------------------------------- Summary of changes: rc.shutdown | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] Buy Meds.Tramadol.well
by arch-projects＠archlinux.org 28 Sep '11

28 Sep '11

<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN"> <HTML><HEAD> <META http-equiv=Content-Type content="text/html; charset=iso-8859-1"> <STYLE></STYLE> </HEAD> <BODY> <a href="http://shopbuyauction.com.ua/">Start a therapy you need using our treatments! </a> </BODY></HTML>

1 0

[arch-projects] [mkinitcpio][PATCH 00/26] patchbomb (maybe some bug fixes)
by Dave Reisner 27 Sep '11

27 Sep '11

I'd like to get a mkinitcpio release out the door in the next few weeks, but first we need actual patches to do that, so... here we go. The majority of this is style tweaks and bug fixes, but there are a few small new features I'll point out: 1) Allowing soft failures on modules -- if a module ends with a '?' character and the module isn't found, this won't trigger an error. Folks building custom kernel and building in modules like ext4 or sd_mod will find this useful. 2) busybox is installed during the build process rather than doing the install at bootstrap. Tom and I thought this made sense since the initcpio should be a "build once, use many" sort of scenario. Do the repetitive work up front where feasible. 3) Allow the 'break' variable on the cmdline to provide a pre or post-mount shell prompt. The behavior of 'break' or 'break=y' remains untouched. 4) Better support for keymap/consolefont in non-sysvinit environments. This stems from FS#24685. Basically, I went with a middle ground and we now source /etc/rc.conf in these hooks which means a systemd user can simple source /etc/vconsole.conf, /etc/locale.conf and then remap the variables to the names expected under normal circumstances. sysvinit users should notice absolutely no change in behavior here. I'll be testing this throughout the week as I have time, but anyone who has feedback or wants to mention that I broke everything is more than welcome to. Easiest way to get all of this is pull from my 'for-thomas' branch on github: git://github.com/falconindy/mkinitcpio.git cheers! d Dave Reisner (25): install/consolefont: cleanup and refactor keymap/consolefont: source rc.conf properly from $BASEDIR keymap: simplify unicode detection cleanup and bashify install hooks base: remove superfluous leading / functions: allow ignoring errors on module addition functions: refactor get_{base,dir}name functions: perform path lookup for binaries if needed functions: specify the delimiter to xargs ensure local scoping of variables mkinitcpio: simplify setting of SKIPHOOKS mkinitcpio: fix whitespace errors in error messages mkinitcpio: explicitly create $BUILDROOT mkinitcpio: keep going even when a hook isn't found mkinitcpio: insist that /dev be mounted init: support breaks before and after mounting root init: allow /run to be mounted with exec perms init: extend PATH to include /usr/local bins init: pass PATH to real PID 1's environment setup busybox during image creation instead of runtime lsinitcpio: disable color when stdout isn't a tty lsinitcpio: follow symlinks only when necessary functions: fix output order in _add_symlink use correct variable to reference compression method init_functions: use constants on LHS of tests Florian Pritz (1): harden version generation Makefile | 7 ++- PKGBUILD | 4 +- functions | 77 ++++++++++++++++----- hooks/keymap | 11 +-- init | 19 +++--- init_functions | 6 +- install/base | 7 ++- install/btrfs | 15 ++-- install/consolefont | 56 ++++++++------- install/dsdt | 21 ++---- install/filesystems | 2 +- install/fw | 29 +++----- install/ide | 30 +++----- install/keymap | 24 ++++--- install/memdisk | 19 +++--- install/net | 195 +++++++++++++++++++++++++-------------------------- install/pata | 4 +- install/pcmcia | 29 ++++---- install/resume | 19 ++--- install/sata | 4 +- install/scsi | 4 +- install/sleep | 27 +++---- install/udev | 33 ++++----- install/usb | 32 ++++----- install/usbinput | 30 +++----- lsinitcpio | 8 ++- mkinitcpio | 26 ++++--- 27 files changed, 373 insertions(+), 365 deletions(-) -- 1.7.6.4

5 51

[arch-projects] [devtools][PATCH] Always log builds in makechrootpkg
by Allan McRae 27 Sep '11

27 Sep '11

It is very helpful to always log the build output in makechrootpkg so pass "-L" as a standard option to makepkg. Signed-off-by: Allan McRae <allan(a)archlinux.org> --- makechrootpkg | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/makechrootpkg b/makechrootpkg index a60c9fe..5a35bbe 100755 --- a/makechrootpkg +++ b/makechrootpkg @@ -10,7 +10,7 @@ FORCE='n' RUN='' -MAKEPKG_ARGS='-s --noconfirm' +MAKEPKG_ARGS='-s --noconfirm -L' REPACK='' WORKDIR=$PWD -- 1.7.6.4

1 0

[arch-projects] [PATCH] [initscripts] Add hook shutdown_pivotroot
by Gerardo Exequiel Pozzi 26 Sep '11

26 Sep '11

This can be useful for run apcupsd --killpower Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- functions | 1 + rc.shutdown | 2 ++ 2 files changed, 3 insertions(+), 0 deletions(-) diff --git a/functions b/functions index ab6d9ae..34fd31b 100644 --- a/functions +++ b/functions @@ -501,6 +501,7 @@ bootlogd_stop() { # shutdown_postkillall: after all processes have been killed in rc.shutdown # single_postkillall: after all processes have been killed in rc.single # shutdown_postumount: after filesystems are unmounted +# shutdown_pivotroot: before pivot_root in rc.shutdown # shutdown_poweroff: directly before powering off in rc.shutdown # # Declare add_hook and run_hook as read-only to prevent overwriting them. diff --git a/rc.shutdown b/rc.shutdown index ea86f8f..1b35148 100755 --- a/rc.shutdown +++ b/rc.shutdown @@ -98,6 +98,8 @@ if [[ -x /run/initramfs/shutdown ]]; then mount --bind /dev /run/initramfs/dev mount --bind /run /run/initramfs/run + run_hook shutdown_pivotroot + # enter shutdownramfs cd /run/initramfs pivot_root . oldroot -- 1.7.6.4

2 2

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch stable deleted. 2011.06.4
by tomegun＠archlinux.org 26 Sep '11

26 Sep '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 "Arch Linux initscripts repository". The branch, stable has been deleted was f0717e3fff64817661946f7a2816cfd340450d16 ----------------------------------------------------------------------- f0717e3fff64817661946f7a2816cfd340450d16 hostname: echo to kernel directly ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2011.09.1-2-g6358d9e
by tomegun＠archlinux.org 26 Sep '11

26 Sep '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 "Arch Linux initscripts repository". The branch, master has been updated via 6358d9e6b1abd4514f7d342334d3a3e0d8b276a0 (commit) via 21f1a7c7eb961c5049fa6d05f95361bdad245dc9 (commit) from 71fe1590598381588502e58b60622b0b72d79454 (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 6358d9e6b1abd4514f7d342334d3a3e0d8b276a0 Author: Tom Gundersen <teg(a)jklm.no> Date: Mon Sep 26 12:16:39 2011 +0200 rc.conf: disable hwclock and netfs by default These are only useful to a minority of users. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 21f1a7c7eb961c5049fa6d05f95361bdad245dc9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Sep 24 19:43:39 2011 -0400 respect the user's choice for /etc/localtime This can be a symlink or a regular file, and rc.sysinit will preserve it as such. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: functions | 7 ++++++- rc.conf | 9 ++++++--- 2 files changed, 12 insertions(+), 4 deletions(-) hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [PATCH] [mkinitcpio] base: remove double slash /
by Gerardo Exequiel Pozzi 26 Sep '11

26 Sep '11

adding dir: //usr/bin adding dir: //usr/sbin Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386(a)yahoo.com.ar> --- install/base | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/install/base b/install/base index 64ef39a..b4f23d5 100644 --- a/install/base +++ b/install/base @@ -1,7 +1,7 @@ #!/bin/bash build() { - for dir in proc sys dev run /usr/{bin,sbin}; do + for dir in proc sys dev run usr/{bin,sbin}; do add_dir "/$dir" done -- 1.7.6.4

2 2