- Arch-projects - lists.archlinux.org

[arch-projects] [PATCH] get console font from vconsole.conf too
by Peter A. Shevtsov 23 Mar '12

23 Mar '12

From: "Peter A. Shevtsov" <pshevtsov(a)severusweb.ru> Signed-off-by: Peter A. Shevtsov <pshevtsov(a)severusweb.ru> --- install/consolefont | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/install/consolefont b/install/consolefont index 7110c3c..0843718 100644 --- a/install/consolefont +++ b/install/consolefont @@ -5,7 +5,13 @@ build() { # subshell to avoid namespace pollution ( - . "$BASEDIR/etc/rc.conf" + if [[ -e "$BASEDIR/etc/vconsole.conf" ]]; then + source "$BASEDIR/etc/vconsole.conf" + fi + source "$BASEDIR/etc/rc.conf" + if [[ -n "$FONT" ]]; then + CONSOLEFONT=$FONT + fi if [[ -n "$CONSOLEFONT" ]]; then for file in "$BASEDIR/usr/share/kbd/consolefonts/$CONSOLEFONT".psf?(u)?(.gz); do if [[ -e $file ]]; then @@ -21,7 +27,7 @@ build() { error "consolefont: requested font not found: \`%s'" "$CONSOLEFONT" exit 1 else - warning "consolefont: no font found in %s/etc/rc.conf" "${BASEDIR%/}" + warning "consolefont: no font found in %s/etc/vconsole.conf or %s/etc/rc.conf" "${BASEDIR%/}" "${BASEDIR%/}" exit 1 fi ) @@ -31,7 +37,7 @@ build() { help() { cat <<HELPEOF -This hook loads consolefont specified in rc.conf during early userspace. +This hook loads consolefont specified in vconsole.conf or rc.conf during early userspace. HELPEOF } -- 1.7.9.4

2 1

[arch-projects] crypttab key syntax
by Matthew Monaco 23 Mar '12

23 Mar '12

Since we're going for systemd compatibility, we're going to need to change the key syntax. It seems like there are two supported syntaxes which are handled a little bit differently by the encrypt hook and initscripts. 1) <dev>:<fstype>:<file> I want to support this by adding a keydev= option. What remains is what to do when a key is not available and there is no keydev=. For a first go I think such a setup doesn't need to be supported, but eventually deriving a default will be good. The primary target here is to support having a keyfile for an encrypted /usr stored on root. This is a little tricky in the initcpio because it would be pretty undesirable from my perspective to tell the user such keys need to be /new_root/... One way to do this would be keydev=/dev/mapper/root, but this might mean mounting root to some temporary location, unmounting it, and then having initcpio pick up as normal after the hooks. Among other things, this would mount root before fsck. 2) <dev>:<offset>:<length> I want to drop support for this. The length field is supported by cryptsetup's --keyfile-size option. I don't see <offset> being widely used as its not even documented. Coupled with systemd not supporting anything like this, I'd like to cowardly refuse to implement it. I looked into adding a --keyfile-offset option to cryptsetup directly. It doesn't look too bad but does require and API change to libcryptsetup. We'll not worry about this now. So this means no more generating keyfiles with dd and piping them into cryptsetup, they can all just be passed via the --key-file=<real_filename> option. 3) -, none, and ASK will all mean interactive. 4) SWAP will be held onto for compatibility and will imply /dev/urandom. (This is probably pointless though because the options field won't be compatible and crypttab will need editing anyway) 5) *. We're dropping plaintext password support. Anything other than /*,-,none,ASK,SWAP will either be an error, or fall back to interactive.

3 3

[arch-projects] [ABS][PATCH] Bashify and quoting
by Sébastien Luttringer 22 Mar '12

22 Mar '12

Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- abs | 84 ++++++++++++++++++++++++------------------------- makeworld | 48 ++++++++++++++-------------- scripts/svn2abs | 80 +++++++++++++++++++++++----------------------- scripts/update-abs.sh | 22 ++++++------- 4 files changed, 117 insertions(+), 117 deletions(-) diff --git a/abs b/abs index 39d5798..d0d81e6 100755 --- a/abs +++ b/abs @@ -22,8 +22,8 @@ ## # Constants ## -ABS_VERSION="%%ABS_VERSION%%" -CONFDIR="%%CONF_DIR%%" +ABS_VERSION='%%ABS_VERSION%%' +CONFDIR='%%CONF_DIR%%' SYNCCMD='rsync' SYNCARGS='-mrtv --no-motd --delete-after --no-p --no-o --no-g' BUG_REPORT_EMAIL=pacman-dev(a)archlinux.org @@ -45,19 +45,19 @@ _E_INVALID_OPTION=3 # Consistent messaging format ## msg() { - local mesg=$1; shift + local mesg="$1"; shift printf "==> ${mesg}\n" "$@" } error() { - local mesg=$1; shift + local mesg="$1"; shift printf "==> ERROR: ${mesg}\n" "$@" >&2 } ## # Source configuration ## -if [ -f "$CONFDIR/abs.conf" ]; then +if [[ -f "$CONFDIR/abs.conf" ]]; then source "$CONFDIR/abs.conf" else error "Could not find configuration file $CONFDIR/abs.conf" @@ -67,23 +67,23 @@ fi ## # User based overrides ## -[ -f ~/.abs.conf ] && source ~/.abs.conf +[[ -f ~/.abs.conf ]] && source ~/.abs.conf ## # Helper functions ## usage() { echo "Arch Build System $ABS_VERSION -- synchronization utility" - echo "" - echo "Usage:" + echo + echo 'Usage:' echo "$0 [options] [repository1[/package1] [repository2[/package2] ...]]" echo - echo "Options:" - echo " -h, --help Display this help message then exit." - echo " -V, --version Display version information then exit." - echo " -t, --tarball Sync ABS tree using tarballs from your pacman mirror." + echo 'Options:' + echo ' -h, --help Display this help message then exit.' + echo ' -V, --version Display version information then exit.' + echo ' -t, --tarball Sync ABS tree using tarballs from your pacman mirror.' echo - echo "abs will synchronize PKGBUILD scripts from the Arch Linux repositories" + echo 'abs will synchronize PKGBUILD scripts from the Arch Linux repositories' echo "into $ABSROOT via rsync. If no argument is given, abs will synchronize" echo "the repositories specified in ${CONFDIR}abs.conf." echo @@ -93,11 +93,11 @@ usage() { version() { echo "abs $ABS_VERSION" echo - echo "Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>" - echo "Copyright (C) 2007-2010 Aaron Griffin <aaron(a)archlinux.org>" + echo 'Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>' + echo 'Copyright (C) 2007-2010 Aaron Griffin <aaron(a)archlinux.org>' echo - echo "This is free software; see the source for copying conditions." - echo "There is NO WARRANTY, to the extent permitted by law." + echo 'This is free software; see the source for copying conditions.' + echo 'There is NO WARRANTY, to the extent permitted by law.' } update_rsync() { @@ -105,15 +105,15 @@ update_rsync() { cd "$ABSROOT" - if [ ! "$(type -p rsync)" ]; then - error "missing rsync synchronization utility. Install rsync." + if [[ ! "$(type -p rsync)" ]]; then + error 'missing rsync synchronization utility. Install rsync.' exit $_E_MISSING_PROGRAM fi - if [ "$CLPARAM" = "" ]; then + if [[ "$CLPARAM" == "" ]]; then # using repos specified in abs.conf for repo in "${REPOS[@]}"; do - if [ "$repo" != "${repo#!}" ]; then + if [[ "$repo" != "${repo#!}" ]]; then EXCLUDE="${EXCLUDE} --filter=-_/${repo#!}/" fi done @@ -124,7 +124,7 @@ update_rsync() { # using repos/packages specified on the command line for param in "${REPOS[@]}"; do INCLUDE="${INCLUDE} --include=/${param}" - if [ "$param" != "${param/\/}" ]; then + if [[ "$param" != "${param/\/}" ]]; then repo=${param%/*} INCLUDE="${INCLUDE} --include=/${repo}" EXCLUDE="${EXCLUDE} --exclude=/${repo}/*" @@ -132,55 +132,55 @@ update_rsync() { done # remove duplicate values - INCLUDE=$(echo $INCLUDE | tr " " "\n" | sort -u | tr "\n" " ") + INCLUDE=$(echo $INCLUDE | tr ' ' '\n' | sort -u | tr '\n' ' ') EXCLUDE="${EXCLUDE} --exclude=/*" fi - msg "Starting ABS sync..." + msg 'Starting ABS sync...' $SYNCCMD $SYNCARGS $INCLUDE $EXCLUDE ${SYNCSERVER}::abs/{${ARCH},any}/ $ABSROOT } update_tarball() { cd "$ABSROOT" - if [ ! "$(type -p wget)" ]; then - error "missing wget download utility. Install wget." + if [[ ! "$(type -p wget)" ]]; then + error 'missing wget download utility. Install wget.' exit $_E_MISSING_PROGRAM fi - if [ -f "$MIRRORLIST" ]; then - mirrorlist=$(grep "^Server" $MIRRORLIST | cut -f3 -d" ") + if [[ -f "$MIRRORLIST" ]]; then + mirrorlist=$(grep "^Server" $MIRRORLIST | cut -f3 -d' ') else error "Could not find pacman mirrorlist file $MIRRORLIST" exit $_E_CONFIG_ERROR fi - msg "Downloading tarballs..." + msg 'Downloading tarballs...' for repo in "${REPOS[@]}"; do - if [ "$repo" == "${repo#!}" ]; then + if [[ "$repo" == "${repo#!}" ]]; then echo " ==> ${repo}..." local ret - for mirror in ${mirrorlist[@]}; do + for mirror in "${mirrorlist[@]}"; do ret=0 tarball=$(echo $mirror | sed "s#\$repo#$repo#;s#\$arch#$ARCH#") tarball="${tarball}/${repo}.abs.tar.gz" protocol=$(echo $tarball | cut -f1 -d":") - if [ "$protocol" == "file" ]; then + if [[ "$protocol" == "file" ]]; then tarball=$(echo $tarball | sed "s#file://##") ln -s $tarball . 2>/dev/null || ret=$? - if [ $ret -ne 0 ]; then + if (( $ret != 0 )); then ret=0 fi else wget -q $tarball || ret=$? fi - if [ $ret -eq 0 ]; then + if (( $ret == 0 )); then break fi done - if [ $ret -ne 0 ]; then + if (( $ret != 0 )); then error "Download failed" continue fi @@ -202,8 +202,8 @@ trap 'error "An unknown error has occured. Exiting..."; exit 1' ERR ## # Parse Options ## -OPT_SHORT="hVt" -OPT_LONG="help,version,tarball" +OPT_SHORT='hVt' +OPT_LONG='help,version,tarball' OPT_TEMP="$(getopt -o "$OPT_SHORT" -l "$OPT_LONG" -n "$(basename "$0")" -- "$@" || echo 'GETOPT GO BANG!')" if echo "$OPT_TEMP" | grep -q 'GETOPT GO BANG!'; then # This is a small hack to stop the script bailing with 'set -e' @@ -224,7 +224,7 @@ while true; do shift done -if [ "$#" -gt "0" ]; then +if (( $# > 0 )); then CLPARAM=1 REPOS=("$@") fi @@ -232,12 +232,12 @@ fi ## # Verify Config ## -if [ ! -d "$ABSROOT" ]; then +if [[ ! -d "$ABSROOT" ]]; then error "$ABSROOT does not exist (or is not a directory)" exit $_E_CONFIG_ERROR fi -if [ ! -w "$ABSROOT" ]; then +if [[ ! -w "$ABSROOT" ]]; then error "no write permissions in $ABSROOT" exit $_E_CONFIG_ERROR fi @@ -247,9 +247,9 @@ fi ## # Use tarball method on first run -[ "$(ls -A $ABSROOT | sed -e 's#local##' -e 's#README##')" -o "$CLPARAM" ] || TARBALL=1 +[[ "$(ls -A $ABSROOT | sed -e 's#local##' -e 's#README##')" -o "$CLPARAM" ]] || TARBALL=1 -if [ "$TARBALL" ]; then +if [[ "$TARBALL" ]]; then update_tarball else update_rsync diff --git a/makeworld b/makeworld index e5d9f0f..9079a7f 100755 --- a/makeworld +++ b/makeworld @@ -19,7 +19,7 @@ # along with this program. If not, see <http://www.gnu.org/licenses/>. # -ABS_VERSION="%%ABS_VERSION%%" +ABS_VERSION='%%ABS_VERSION%%' BUG_REPORT_EMAIL='pacman-dev(a)archlinux.org' toplevel=$(pwd) @@ -31,38 +31,38 @@ trap 'error "Aborted by user! Exiting..."; exit 1' INT trap 'error "An unknown error has occured. Exiting..."; exit 1' ERR usage() { - printf "makeworld %s - a makepkg wrapper to build multiple packages\n" "$myver" + printf 'makeworld %s - a makepkg wrapper to build multiple packages\n' "$myver" echo - printf "Usage: %s [options] <destdir> <repo> [repo] ...\n" "$0" + printf 'Usage: %s [options] <destdir> <repo> [repo] ...\n' "$0" echo - echo "Where <repo> is one or more directory names under the ABS root" - echo " eg: makeworld -c /packages core extra" + echo 'Where <repo> is one or more directory names under the ABS root' + echo ' eg: makeworld -c /packages core extra' echo - echo "This should be run from the toplevel directory of ABS (usually /var/abs)" + echo 'This should be run from the toplevel directory of ABS (usually /var/abs)' echo - echo "See makepkg --help for supported options (passed directly to makepkg)" + echo 'See makepkg --help for supported options (passed directly to makepkg)' } version() { - printf "makeworld %s\n" "$myver" - printf "\ + printf 'makeworld %s\n' "$myver" + printf '\ Copyright (C) 2002-2007 Judd Vinet <jvinet(a)zeroflux.org>\n\n\ Copyright (C) 2007-2010 Aaron Griffin <aaron(a)archlinux.org>\n\n\ This is free software; see the source for copying conditions.\n\ -There is NO WARRANTY, to the extent permitted by law.\n" +There is NO WARRANTY, to the extent permitted by law.\n' } # Source makepkg.conf; fail if it is not found (need this for $CARCH, $PKGEXT) -if [ -r "/etc/makepkg.conf" ]; then - source "/etc/makepkg.conf" +if [[ -r '/etc/makepkg.conf' ]]; then + source '/etc/makepkg.conf' else - printf "%s not found" "/etc/makepkg.conf" - echo "Aborting..." + printf '%s not found' '/etc/makepkg.conf' + echo 'Aborting...' exit 1 fi # Source user-specific makepkg.conf overrides -if [ -r ~/.makepkg.conf ]; then +if [[ -r ~/.makepkg.conf ]]; then source ~/.makepkg.conf fi @@ -79,7 +79,7 @@ for arg in $*; do # and let it error out later if it was invalid MAKEPKG_OPTS="$MAKEPKG_OPTS $arg" ;; -*) - while getopts "AcCdefFghiLmorRsV-" opt; do + while getopts 'AcCdefFghiLmorRsV-' opt; do case $opt in h) usage; exit 0 ;; @@ -96,23 +96,23 @@ for arg in $*; do dest=$arg; shift; break ;; esac shift - if [ "$dest" != "" ]; then + if [[ "$dest" != "" ]]; then break fi done -if [ "$dest" = "" ]; then +if [[ "$dest" = "" ]]; then usage exit 1 fi -if [ $# -lt 1 ]; then +if (( $# < 1 )); then usage exit 1 fi # convert a (possibly) relative path to absolute -if [ ! -d "$dest" ]; then +if [[ ! -d "$dest" ]]; then echo "$dest does not exist, creating directory" mkdir "$dest" fi @@ -125,13 +125,13 @@ sd=$(date +"[%b %d %H:%M]") for repo in $*; do for pkg in $(find "$toplevel/$repo" -maxdepth 1 -mindepth 1 -type d | sort); do cd $pkg - if [ -f PKGBUILD ]; then + if [[ -f PKGBUILD ]]; then . PKGBUILD buildstatus=0 - if [ ! -f "$dest/$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT" -a ! -f "$dest/$pkgname-$pkgver-$pkgrel-any$PKGEXT" ]; then + if [[ ! -f "$dest/$pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT" && ! -f "$dest/$pkgname-$pkgver-$pkgrel-any$PKGEXT" ]]; then PKGDEST="$dest" makepkg $MAKEPKG_OPTS -m 2>&1 1>&2 | tee -a $toplevel/makepkg.log - if [ ${PIPESTATUS[0]} -ne 0 ]; then + if (( ${PIPESTATUS[0]} != 0 )); then buildstatus=2 else buildstatus=1 @@ -151,7 +151,7 @@ for repo in $*; do done ed=$(date +"[%b %d %H:%M]") -echo "makeworld complete." >>$toplevel/build.log +echo 'makeworld complete.' >>$toplevel/build.log echo " started: $sd" >>$toplevel/build.log echo " finished: $ed" >>$toplevel/build.log diff --git a/scripts/svn2abs b/scripts/svn2abs index 0d4c74d..c8876ed 100755 --- a/scripts/svn2abs +++ b/scripts/svn2abs @@ -21,7 +21,7 @@ ## # Constants ## -ABS_VERSION="%%ABS_VERSION%%" +ABS_VERSION='%%ABS_VERSION%%' TREE_DIR=/tmp/__abs-tree__ # Directory to store the extracted ABS tree ## @@ -41,29 +41,29 @@ function usage() echo " $0 (-v | --version)" echo " $0 (-h | --help)" echo - echo "Takes svn repo structure of form \$pkgname/repos/\$repo-\$arch" - echo "and converts it to the ABS structure of \$arch/\$repo/\$pkgname" + echo 'Takes svn repo structure of form $pkgname/repos/$repo-$arch' + echo 'and converts it to the ABS structure of $arch/$repo/$pkgname' echo "then syncs ABS tree in $ABS_DIR with extracted structure." echo - echo "Options:" - echo " -h | --help - show this message" - echo " -v | --version - show version information" + echo 'Options:' + echo ' -h | --help - show this message' + echo ' -v | --version - show version information' echo - echo "Parameters:" - echo " [svn checkout dir] - dir to store svn checkout. Defaults to" + echo 'Parameters:' + echo ' [svn checkout dir] - dir to store svn checkout. Defaults to' echo " $CHECKOUT_DIR" - echo " [abs dir] - dir containing abs tree to update. Defaults to" + echo ' [abs dir] - dir containing abs tree to update. Defaults to' echo " $ABS_DIR" - echo " [svn repo location] - URL to subversion repo containing PKGBUILDs" + echo ' [svn repo location] - URL to subversion repo containing PKGBUILDs' } version() { echo "svn2abs $ABS_VERSION" echo - echo "Copyright (C) 2008-2010 Aaron Griffin <aaron(a)archlinux.org>." + echo 'Copyright (C) 2008-2010 Aaron Griffin <aaron(a)archlinux.org>.' echo - echo "This is free software; see the source for copying conditions." - echo "There is NO WARRANTY, to the extent permitted by law." + echo 'This is free software; see the source for copying conditions.' + echo 'There is NO WARRANTY, to the extent permitted by law.' } @@ -75,12 +75,12 @@ function checkout_svn() local targetdir=$1 local origdir=$(pwd) - if [ -f "$targetdir" ]; then + if [[ -f "$targetdir" ]]; then echo "Could not create checkout target $targetdir. File exists." return 1 fi - if [ ! -d "$targetdir" ]; then + if [[ ! -d "$targetdir" ]]; then mkdir "$targetdir" fi @@ -89,23 +89,23 @@ function checkout_svn() # Simple check - if $targetdir/.svn exists, then we can assume # the repo has been checked out (ie. we can just run an update # instead of a full checkout) - if [ -d "./.svn" ]; then + if [[ -d './.svn' ]]; then # Checkout already exists - just update it - echo "Updating SVN repo..." + echo 'Updating SVN repo...' svn update else # Checkout the tree into $targetdir - echo "Checking out SVN repo..." + echo 'Checking out SVN repo...' svn co "$SVN_REPO_LOCATION" ./ fi - if [ "$?" != "0" ]; then + if (( $? != 0 )); then cd "$origdir" - echo "Error with SVN checkout/update." + echo 'Error with SVN checkout/update.' return 1 fi - echo "SVN checkout/update complete." + echo 'SVN checkout/update complete.' cd "$origdir" return 0 @@ -124,17 +124,17 @@ function extract_abs_tree() local checkoutdir="$1" local origdir=$(pwd) - if [ ! -d "$checkoutdir" ]; then + if [[ ! -d "$checkoutdir" ]]; then echo "SVN checkout dir $checkoutdir does not exist" return 1 fi - if [ -f "$targetdir" ]; then + if [[ -f "$targetdir" ]]; then echo "Could not create abs tree target $targetdir. File exists." return 1 fi - if [ ! -d "$targetdir" ]; then + if [[ ! -d "$targetdir" ]]; then mkdir "$targetdir" else # Clear out target dir @@ -149,7 +149,7 @@ function extract_abs_tree() for pkg in *; do # It seems that some repos directories have no tags in them... - if [ -d "$pkg" -a -d "$pkg/repos" ]; then + if [[ -d "$pkg" && -d "$pkg/repos" ]]; then echo "Creating ABS tree for package $pkg" cd $pkg/repos @>/dev/null @@ -157,8 +157,8 @@ function extract_abs_tree() for repo in $(ls); do arch=$(echo $repo | sed "s/.*-$.*$/\1/") dest_repo=$(echo $repo | sed "s/$.*$-.*/\1/") - mkdir -p $targetdir/$arch/$dest_repo/$pkg - cp -r $repo/* $targetdir/$arch/$dest_repo/$pkg + mkdir -p "$targetdir/$arch/$dest_repo/$pkg" + cp -r $repo/* "$targetdir/$arch/$dest_repo/$pkg" done cd ../../ @@ -176,36 +176,36 @@ function extract_abs_tree() ## # Simple params ## -if [ "$1" = "-h" -o "$1" = "--help" ]; then +if [[ "$1" = "-h" || "$1" = "--help" ]]; then usage exit 0 fi -if [ "$1" = "-v" -o "$1" = "--version" ]; then +if [[ "$1" = "-v" || "$1" = "--version" ]]; then version exit 0 fi -if [ "$1" != "" ]; then +if [[ "$1" != "" ]]; then CHECKOUT_DIR=$1 fi -if [ "$2" != "" ]; then +if [[ "$2" != "" ]]; then ABS_DIR=$2 fi -if [ "$3" != "" ]; then +if [[ "$3" != "" ]]; then SVN_REPO_LOCATION=$3 fi ## # Check config ## -if [ "$ABS_DIR" = "" ]; then - echo "No ABS_DIR specified!" +if [[ "$ABS_DIR" == "" ]]; then + echo 'No ABS_DIR specified!' exit 1 -elif [ ! -d "$ABS_DIR" ]; then - echo "ABS_DIR not a directory." +elif [[ ! -d "$ABS_DIR" ]]; then + echo 'ABS_DIR not a directory.' exit 1 fi @@ -215,8 +215,8 @@ fi checkout_svn "$CHECKOUT_DIR" || exit 1 extract_abs_tree "$CHECKOUT_DIR" "$TREE_DIR" -if [ "$?" -ne "0" ]; then - echo "Error occurred extracting the abs tree." +if (( $? != 0 )); then + echo 'Error occurred extracting the abs tree.' exit 1 fi @@ -231,9 +231,9 @@ for abs_arch in $(ls); do done cd - -echo "Cleaning up..." +echo 'Cleaning up...' rm -r $TREE_DIR -echo "Done!" +echo 'Done!' # vim: set ts=2 sw=2 noet: diff --git a/scripts/update-abs.sh b/scripts/update-abs.sh index ff3510e..4e313ff 100644 --- a/scripts/update-abs.sh +++ b/scripts/update-abs.sh @@ -7,8 +7,8 @@ ARCHES=('i686' 'x86_64' 'any') mkdir -p /srv/abs/{checkout,rsync,tree} # clear any "broken" entries from previous ABS tree generation -for server in ${SERVERS[@]}; do - [ -d /srv/abs/tree/$server ] && rm -rf /srv/abs/tree/$server/* +for server in "${SERVERS[@]}"; do + [[ -d "/srv/abs/tree/$server" ]] && rm -rf "/srv/abs/tree/$server"/* done # create ABS trees @@ -16,27 +16,27 @@ done /srv/abs/svn2abs /srv/abs/checkout/sigurd /srv/abs/tree/sigurd file:///srv/svn-community # clean and regenerate ABS rsync folder -for arch in ${ARCHES[@]}; do - if [ ! -d /srv/abs/rsync/$arch ]; then - mkdir /srv/abs/rsync/$arch +for arch in "${ARCHES[@]}"; do + if [[ ! -d "/srv/abs/rsync/$arch" ]]; then + mkdir "/srv/abs/rsync/$arch" else - rm -rf /srv/abs/rsync/$arch/* + rm -rf "/srv/abs/rsync/$arch"/* fi - for server in ${SERVERS[@]}; do - if [ -d /srv/abs/tree/$server/$arch ]; then - mv /srv/abs/tree/$server/$arch/* /srv/abs/rsync/$arch/ + for server in "${SERVERS[@]}"; do + if [[ -d "/srv/abs/tree/$server/$arch" ]]; then + mv "/srv/abs/tree/$server/$arch"/* "/srv/abs/rsync/$arch/" fi done done # generate tarballs for package mirrors for repo in testing core extra community community-testing; do - for arch in ${ARCHES[@]/any/}; do + for arch in "${ARCHES[@]/any/}"; do tarcmd="tar -czf /srv/ftp/${repo}/os/${arch}/${repo}.abs.tar.gz \ -C /srv/abs/rsync/${arch} ${repo}" - if [ -d "/srv/abs/rsync/any/${repo}" ]; then + if [[ -d "/srv/abs/rsync/any/${repo}" ]]; then tarcmd="$tarcmd -C /srv/abs/rsync/any ${repo}" fi -- Sebastien "Seblu" Luttringer

2 1

[arch-projects] [netcfg] 2.7.1 break my laptop wlan
by Andreas Radke 21 Mar '12

21 Mar '12

I have a static wpa2 profile setup that breaks with the new release in testing. :: home.wlan [BUSY] RTNETLINK answers: No such process > Adding gateway 192.168.1.1 failed [FAIL] my wlan0 device is still present though. everything.log seems clean. Any idea how to debug this? -Andy

3 8

[arch-projects] [initscripts] a bit of cleanup
by Tom Gundersen 21 Mar '12

21 Mar '12

Hi guys, I'm about to push thefollowing patches, so feedback welcome. In particular: 1) this might affect hooks. any known cases? imho they should be fixed 2) stole this from dave even though he did not submit it. the nerve! 3) this changes behavior, please raise any objections now 4) nothing interesting, move along -t

3 7

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository branch master updated. 2012.03.1
by tomegun＠archlinux.org 21 Mar '12

21 Mar '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 650aa0db2bb92b6751461baf71df169dfd107cab (commit) via e980b8e52b52c176fa1f3fa80d62b5231b4395f4 (commit) via a8691173ac04321f444b949ec041d94c83ad02af (commit) via 807d8f9c858d2adf5285a3ba27aec6ed226d14d7 (commit) via e57e4ebe4aee02b175f3d4d13a0fa1838769b3f2 (commit) via 4c6aba5ab3812523e65806c2876035b4498aad2e (commit) via cb1ddfc15431f2e6498c93cd4da53e14f1147659 (commit) via 28ec5b76ca5cbb53ec9d5de73749dbe76db7611a (commit) via e3050bd87ec873bc4ac1dc21c42c7abd02c3b408 (commit) via ddb6048878ca329a23ee9a0f10919a03d41b4a29 (commit) via e10b98ba9374c145df0719bb2e9c7fe0d4b614ea (commit) from b49cc7be1be791318f57d2941999368ae58636b7 (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 650aa0db2bb92b6751461baf71df169dfd107cab Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Mar 21 13:06:29 2012 +0100 fsck: add return value Reported-by: Lukas Fleischer <archlinux(a)cryptocrack.de> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit e980b8e52b52c176fa1f3fa80d62b5231b4395f4 Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Mar 21 12:39:27 2012 +0100 man: don't ship manpage for binfmt for now This will be enabled in the next release once we can coordinate with systemd. I'd also like to document the other formats (tmpfiles, sysctl) at the same time. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit a8691173ac04321f444b949ec041d94c83ad02af Author: Tom Gundersen <teg(a)jklm.no> Date: Wed Mar 21 11:29:41 2012 +0100 rc.d: movebash completions to /usr/share This is the standard location with the new bash-completinos package. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 807d8f9c858d2adf5285a3ba27aec6ed226d14d7 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Mar 17 13:46:12 2012 +0100 crypttab: warn if using passphrase in /etc/crypttab There is no reason not to use a keyfile, and allowing literal passphrases in crypttab has caused issues with the parsing in the past. Furthermore, it is not supported by any other crypttab implementation (to the best of my knowledge). The use of keyfiles have been the recomendation in /etc/crypttab for as long as I can remember. We are looking at refactoring the encryption support, and I think it makes sense to drop support for this when we move to the new implementation. Cc: Thomas Bächler <thomas(a)archlinux.org> Cc: Matthew Monaco <matt(a)0x01b.net> Cc: Dave Reisner <d(a)falconindy.com> Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit e57e4ebe4aee02b175f3d4d13a0fa1838769b3f2 Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Mar 17 11:38:14 2012 +0100 crypto: move function from sysinit to functions No functional change, just improve readability. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit 4c6aba5ab3812523e65806c2876035b4498aad2e Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Mar 17 11:30:25 2012 +0100 sysinit: do not unconditionally modprobe any more dm-mod and dm-crypt will be autoloaded when needed (at least on kernels newer than 2.6.36). The rtc modules should be compiled in, as they have been in the official kernels for some time. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit cb1ddfc15431f2e6498c93cd4da53e14f1147659 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Feb 19 20:06:26 2012 -0500 sysinit: remove cryptsetup compat We haven't had the static binary in nearly 2 years, so simply call this without a PATH lookup. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 28ec5b76ca5cbb53ec9d5de73749dbe76db7611a Author: Tom Gundersen <teg(a)jklm.no> Date: Sat Mar 17 11:12:55 2012 +0100 fsck: move FORCEFSCK/FASTBOOT logic to fsck_all Avoid global variables, and make things clearer. Signed-off-by: Tom Gundersen <teg(a)jklm.no> commit e3050bd87ec873bc4ac1dc21c42c7abd02c3b408 Author: Dave Reisner <d(a)falconindy.com> Date: Fri Mar 16 19:16:47 2012 -0400 reorder fsck opts, explicitly set end of options marker Fixes FS#28947. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit ddb6048878ca329a23ee9a0f10919a03d41b4a29 Author: SÃ©bastien Luttringer <seblu(a)seblu.net> Date: Wed Mar 14 00:58:23 2012 +0100 arch-binfmt: add manpage Signed-off-by: SÃ©bastien Luttringer <seblu(a)seblu.net> commit e10b98ba9374c145df0719bb2e9c7fe0d4b614ea Author: SÃ©bastien Luttringer <seblu(a)seblu.net> Date: Tue Mar 13 23:43:45 2012 +0100 arch-binfmt: move api filesytem mounting from rc.sysinit this will avoid filesytem to be mounted at every startup if not binfmt is used Signed-off-by: SÃ©bastien Luttringer <seblu(a)seblu.net> ----------------------------------------------------------------------- Summary of changes: Makefile | 4 +- arch-binfmt | 31 ++++++++++----- binfmt.d.5.txt | 57 ++++++++++++++++++++++++++++ functions | 98 +++++++++++++++++++++++++++++++++++++++++------ rc.sysinit | 115 +++++++------------------------------------------------- 5 files changed, 178 insertions(+), 127 deletions(-) create mode 100644 binfmt.d.5.txt hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] [initscripts] [GIT] Arch Linux initscripts repository annotated tag 2012.03.1 created. 2012.03.1
by tomegun＠archlinux.org 21 Mar '12

21 Mar '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 annotated tag, 2012.03.1 has been created at 7fb7c25bd747b7caac0a71e61ed1bc51254800e8 (tag) tagging 650aa0db2bb92b6751461baf71df169dfd107cab (commit) replaces 2012.02.2 tagged by Tom Gundersen on Wed Mar 21 13:12:34 2012 +0100 - Log ----------------------------------------------------------------- make dhcpcd quiet on shutdown fix hanging on shutdown due to broken nfs make arch-* accept specific config files improve makefile force /etc/localtime to be a symlink support binfmt remove NEED_ROOT don't modprobe rtc, dm-crypt and dm-mod any more warn on passphrase in /etc/crypttab move bash completion to /usr/share bugfixes Dave Reisner (7): rc.sysinit: avoid exporting empty TIMEZONE as TZ functions: check for length before using array network: pass -q to dhcpcd on shutdown arch-tmpfiles: allow passing specific config files arch-tmpfiles: don't try to resolve numeric UIDs/GIDs reorder fsck opts, explicitly set end of options marker sysinit: remove cryptsetup compat Lukas Fleischer (2): Makefile: Mark phony targets Makefile: Rework man page handling Sébastien Luttringer (5): arch-sysctl: allow passing specific config files Support additional binary formats at boot Remove NEED_ROOT crap arch-binfmt: move api filesytem mounting from rc.sysinit arch-binfmt: add manpage Tom Gundersen (12): Revert "deal with both valid return codes of mount -a" netfs: force umounts in order to avoid hanging on NFS Merge commit 'falconindy/working^1' timezone: always symlink to zoneinfo rather than copying Merge remote-tracking branch 'seblu/master' fsck: move FORCEFSCK/FASTBOOT logic to fsck_all sysinit: do not unconditionally modprobe any more crypto: move function from sysinit to functions crypttab: warn if using passphrase in /etc/crypttab rc.d: movebash completions to /usr/share man: don't ship manpage for binfmt for now fsck: add return value ----------------------------------------------------------------------- hooks/post-receive -- Arch Linux initscripts repository

1 0

[arch-projects] netcfg: fixes and features
by Jouke Witteveen 21 Mar '12

21 Mar '12

Dear Thomas and the rest, A few of us have been looking at the netcfg code lately. One thing that came to light was that FS#24599 is actualy a wpa_actiond bug, so, Thomas, could you take it upon you? Furthermore, Remy's development tree held 8 bugfixes and some improvements, which I augmented with another 5.5 bugfixes and 3.5 added features (the half one being a syntax to reconnect based on an interface, as a fix for FS#28196). I would like to see someone package this work, that is available at https://github.com/joukewitteveen/netcfg and push a package to the (testing?) repository. I am not requesting maintainership of the code (Alfredo Palhares is after it too), but I am willing to be the maintainer. My request is just to move netcfg forward. Regards, - Jouke List of fixed bugs outside Remy's tree: FS#23934 FS#26370 FS#26607 FS#27496 (not quite) FS#28022 FS#28196

7 20

Re: [arch-projects] pyalpm config file parsing
by Rémy Oudompheng 21 Mar '12

21 Mar '12

Le 21 mars 2012 07:53, Xyne <xyne(a)archlinux.ca> a écrit : > Hi Rémy, > > The current implementation of pycman.config discards per-level SigLevel options. > It seems that you began to implement this around line 113 where you yield > SigLevel (you can remove the comment on line 110 btw), but these options are > still ignores around line 170. > > I tried to come up with a solution, but the current structure of the config > object doesn't seem to allow it cleanly. Maybe that's why you only implemented > part of it. Hello, It was never implemented properly because it's not used anywhere in my code. I will probably concentrate more on go-alpm in the future (and adapt pyalpm to pacman 4.1 API changes), so feel free to suggest a patch to improve the situation. I've put arch-projects in recipients, that helps getting more opinions as I am lacking time. Rémy.

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20120305-1-gacbbe8c
by pierre＠archlinux.org 21 Mar '12

21 Mar '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 "The official devtools repository". The branch, master has been updated via acbbe8cb90ddf197451735b94107902887e0dcad (commit) from 9840730880bf31361d4007797fc3e4c847310c4b (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 acbbe8cb90ddf197451735b94107902887e0dcad Author: Pierre Schmitz <pierre(a)archlinux.de> Date: Wed Mar 21 07:32:44 2012 +0100 Move bash_completion to /usr/share/bash-completion/completions/ ----------------------------------------------------------------------- Summary of changes: Makefile | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- The official devtools repository

1 0