- Arch-projects - lists.archlinux.org

[arch-projects] [netctl][PATCH] Start DHCPv6 after DAD (FS#43183)
by Jouke Witteveen 08 Jan '15

08 Jan '15

We need our link-local address to not be tentative. After DHCPv6 we do not need to do DAD again, as it is part of DHCPv6 per RFT 3315, section 18.1.8. --- src/lib/ip | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/src/lib/ip b/src/lib/ip index b7847a2..b6692c3 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -100,20 +100,15 @@ ip_set() { fi fi - case "$IP6" in - dhcp|dhcp-noaddr) - dhcp_call "${DHCP6Client:-dhclient}" start 6 ${IP6:5} || return - ;; - stateless|static) - for addr in "${Address6[@]}"; do - if ! do_debug ip -6 addr add $addr $(is_yes "${SkipDAD:-no}" && printf nodad) dev "$Interface"; then - report_error "Could not add address '$addr' to interface '$Interface'" - fi - done - ;; - esac - if [[ $IP6 ]]; then + if [[ $IP6 == @(stateless|static) ]]; then + for addr in "${Address6[@]}"; do + if ! do_debug ip -6 addr add $addr $(is_yes "${SkipDAD:-no}" && printf nodad) dev "$Interface"; then + report_error "Could not add address '$addr' to interface '$Interface'" + fi + done + fi + if ! is_yes "${SkipDAD:-no}"; then # Wait for Duplicate Address Detection to finish if ! timeout_wait "${TimeoutDAD:-3}" '[[ -z "$(ip -6 addr show dev "$Interface" tentative)" ]]'; then @@ -122,6 +117,11 @@ ip_set() { fi fi + # Start a DHCPv6 client after DAD has finished for the link-local address + if [[ $IP6 == @(dhcp|dhcp-noaddr) ]]; then + dhcp_call "${DHCP6Client:-dhclient}" start 6 ${IP6:5} || return + fi + # Add static IPv6 routes after DAD has finished for route in "${Routes6[@]}"; do if ! do_debug ip -6 route add $route dev "$Interface"; then -- 2.2.1

1 0

[arch-projects] [netctl][PATCH] Unify wired and wireless automatic profile selection (FS#35252)
by Jouke Witteveen 08 Jan '15

08 Jan '15

The previous wired automatic profile selection procedure was not properly documented. Now both wired and wireless automatic profile selection use ExcludeAuto= and Priority= --- docs/netctl.profile.5.txt | 15 +++++++++++---- src/ifplugd.action | 42 +++++++++++++++--------------------------- src/netctl-auto | 21 +++++++++------------ 3 files changed, 35 insertions(+), 43 deletions(-) diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index c4982fc..82946da 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -103,6 +103,11 @@ GENERAL OPTIONS Set to `++yes++' to force connecting even if the interface is up. Do not use this unless you know what you are doing. +'ExcludeAuto=':: + Whether or not to exclude this profile from automatic profile + selection. Defaults to `++no++' for wireless and DHCP enabled + connections and to `++yes++' otherwise. + IP OPTIONS ---------- @@ -223,6 +228,12 @@ of the `ethernet' type: Whether or not the absence of a carrier (plugged-in cable) is acceptable. Defaults to `++no++'. +'Priority=':: + Priority level of the profile. In case of automatic profile + selection, profiles are tried in decreasing order of priority. + Defaults to `++1++' in DHCP enabled profiles and to `++0++' + otherwise. + OPTIONS FOR `wireless' CONNECTIONS ---------------------------------- @@ -295,10 +306,6 @@ of the `wireless' type: variable to `++auto++'. In that case an *rfkill* device that is associated with the network interface is used. -'ExcludeAuto=':: - Whether or not to exclude this profile from automatic profile - selection. Defaults to `++no++'. - OPTIONS FOR `bond' CONNECTIONS ------------------------------ diff --git a/src/ifplugd.action b/src/ifplugd.action index c87ac0c..14a8bac 100755 --- a/src/ifplugd.action +++ b/src/ifplugd.action @@ -8,39 +8,27 @@ PROFILE_FILE="$STATE_DIR/ifplugd_$1.profile" case "$2" in up) - # Look for a dhcp based profile to try first - # dhcp can actually outright fail, whereas - # it's difficult to tell if static succeeded - # Also check profile is same iface and is right connection - echo "up" - declare -a preferred_profiles - declare -a dhcp_profiles - declare -a static_profiles - while read -r profile; do - ( - echo "Reading profile '$profile'" - source "$PROFILE_DIR/$profile" - [[ "$Interface" == "$1" && "$Connection" == "ethernet" ]] || continue - is_yes "${AutoWired:-no}" && exit 1 # user preferred AUTO profile - [[ "$IP" == "dhcp" ]] && exit 2 # dhcp profile - exit 3 # static profile - ) - case $? in - 1) preferred_profiles+=("$profile");; - 2) dhcp_profiles+=("$profile");; - 3) static_profiles+=("$profile");; - esac - done < <(list_profiles) - if [[ ${#preferred_profiles[@]} > 1 ]]; then - echo "AutoWired flag for '$1' set in more than one profile (${preferred_profiles[*]})" - fi - for profile in "${preferred_profiles[@]}" "${dhcp_profiles[@]}" "${static_profiles[@]}"; do + list_profiles | while read -r profile; do + report_debug "Examining profile '$profile'" + source "$PROFILE_DIR/$profile" + [[ $Interface == "$1" && $Connection == "ethernet" ]] || continue + # Prioritize dhcp based profiles as they can outright fail, whereas + # it is difficult to tell if a profile with a static address fails + if [[ $IP == "dhcp" || $IP6 == dhcp* ]]; then + : ${ExcludeAuto:=no} + : ${Priority:=1} + fi + is_yes "${ExcludeAuto:-yes}" && continue + printf "%i\t%s\n" "${Priority:-0}" "$profile" + report_debug "Included profile '$profile'" + done | sort -nrs -k 1,1 | cut -f 2- | while read -r profile; do if ForceConnect=yes "$SUBR_DIR/network" start "$profile"; then mkdir -p "$(dirname "$PROFILE_FILE")" printf "%s" "$profile" > "$PROFILE_FILE" exit 0 fi done + report_error "Could not start any suitable profile" ;; down) if [[ -e "$PROFILE_FILE" ]]; then diff --git a/src/netctl-auto b/src/netctl-auto index d9fac3a..df9dcde 100755 --- a/src/netctl-auto +++ b/src/netctl-auto @@ -190,18 +190,15 @@ start() { local profile list_profiles | while read -r profile; do report_debug "Examining profile '$profile'" - ( - source "$PROFILE_DIR/$profile" - [[ $Interface == "$interface" ]] || continue - is_yes "${ExcludeAuto:-no}" && exit 1 - [[ $Connection != "wireless" ]] && exit 1 - : ${Security:=none} - # Exclude wpa-config, the wpa_conf is 'complete' and doesn't fit in this scheme - [[ $Security == "wpa-config" ]] && exit 1 - - printf "%s\n" "network={" "$(wpa_make_config_block)" "id_str=\"$profile\"" "}" >> "$wpa_conf" - report_notice "Included profile '$profile'" - ) + source "$PROFILE_DIR/$profile" + [[ $Interface == "$interface" && $Connection == "wireless" ]] || continue + is_yes "${ExcludeAuto:-no}" && continue + : ${Security:=none} + # Exclude wpa-config, the wpa_conf is 'complete' and doesn't fit in this scheme + [[ $Security == "wpa-config" ]] && continue + + printf "%s\n" "network={" "$(wpa_make_config_block)" "id_str=\"$profile\"" "}" >> "$wpa_conf" + report_notice "Included profile '$profile'" done # Start the WPA supplicant and wpa_actiond -- 2.2.1

1 0

[arch-projects] [namcap][PATCH] Add support for new validpgpkeys array
by Eric Bélanger 31 Dec '14

31 Dec '14

Signed-off-by: Eric Bélanger <snowmaniscool(a)gmail.com> --- Namcap/rules/arrays.py | 2 +- Namcap/rules/extravars.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Namcap/rules/arrays.py b/Namcap/rules/arrays.py index 5462986..e970d3a 100644 --- a/Namcap/rules/arrays.py +++ b/Namcap/rules/arrays.py @@ -29,7 +29,7 @@ class package(PkgbuildRule): arrayvars = ['arch', 'license', 'depends', 'makedepends', 'optdepends', 'checkdepends', 'provides', 'conflicts' , 'replaces', 'backup', 'source', 'noextract', 'md5sums', - 'sha1sums', 'sha256sums', 'sha384sums', 'sha512sums'] + 'sha1sums', 'sha256sums', 'sha384sums', 'sha512sums', 'validpgpkeys'] for i in pkginfo.pkgbuild: m = re.match('\s*(.*)\s*=\s*(.*)$', i) for j in arrayvars: diff --git a/Namcap/rules/extravars.py b/Namcap/rules/extravars.py index 0fb0b93..74eed0a 100644 --- a/Namcap/rules/extravars.py +++ b/Namcap/rules/extravars.py @@ -30,7 +30,7 @@ class package(PkgbuildRule): 'sha256sums', 'sha384sums', 'sha512sums', 'pkgname', 'pkgbase', 'pkgver', 'pkgrel', 'epoch', 'pkgdesc', 'groups', 'url', 'install', 'changelog', - 'options', 'optdepends', 'checkdepends'] + 'options', 'optdepends', 'checkdepends', 'validpgpkeys'] for varname in pkginfo["setvars"]: if varname.islower() and varname not in stdvars \ and not varname.startswith('_'): -- 2.2.1

1 0

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. v18-5-g715a37b
by dreisner＠archlinux.org 28 Dec '14

28 Dec '14

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 715a37b0d6cbee360c00ee2e23e94a772a50a1f0 (commit) via 9398ae7fcbc2af9c788089ba72ddcd610b8df3a9 (commit) via 514d5f1fa641b0bfc66d43f4c0c7e7830f747899 (commit) from b209e8c5e965965c50878fb57a628bca83a06f8d (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 715a37b0d6cbee360c00ee2e23e94a772a50a1f0 Author: Alexei Colin <ac(a)alexeicolin.com> Date: Sun Dec 28 16:51:30 2014 -0500 mkinitcpio: expose syntax errors in preset files commit 9398ae7fcbc2af9c788089ba72ddcd610b8df3a9 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 7 10:19:54 2014 -0500 lsinitcpio: avoid setting TIMEFORMAT globally Not that it really matters, but let's scope this to where we actually care for the modified time output. commit 514d5f1fa641b0bfc66d43f4c0c7e7830f747899 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Dec 7 10:18:58 2014 -0500 mkinitcpio avoiding adding a CPIO entry for '.' The archive goes from looking like this: . ./buildconfig ./config ./init ./init_functions ./VERSION ./lib64 ./sbin To: buildconfig config init init_functions VERSION lib64 sbin Note the lack of the "root" entry and leading "./". This fixes an issue with packing ucode into the initramfs since the kernel really wants an exact match, and not path equivalency. ----------------------------------------------------------------------- Summary of changes: lsinitcpio | 2 +- mkinitcpio | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository annotated tag 20141224 created. 20141224
by dreisner＠archlinux.org 24 Dec '14

24 Dec '14

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 annotated tag, 20141224 has been created at 12e12d9ff6efa6e338c8e89f0135c79be1a2c53d (tag) tagging db135e90137c5ebb9248ae7bd5ced4e8ee6b27da (commit) replaces 20141024 tagged by Dave Reisner on Wed Dec 24 11:04:23 2014 -0500 - Log ----------------------------------------------------------------- tag as 20141224 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 iQEcBAABCAAGBQJUmuQHAAoJEB6yY4/1bAxTaZwIALVRnYbGAQPcC/MYzK0k8yL8 T7u2enqGT3K7FQkbhYZ/8UbpUa3DUWx1Xb0SAOJERc3JzVZbZUMkfe5luLlJsPUC BYBxlkGge6puCJaHknoxKtUsFyvmhOQ8geT6YeW2OjPP7IgABFEIw5TPKDiciflL iBsQ2elm7DqvtXtXYrrZNZqF3XArPj36u19wUVTUfPZA1p5docvR74xL5pN2JO0v LYw6rOxQDw23r5kFb/ZknqG6bwZNYy61bpB3Rh/2yn14R48Nke2BsC2XpeLOiPXh HbJPdr/mUSyaPtluzLAdEJzK2xnUPu5EWozoJIFws8CZByeSRloYlhmDVN4XLm4= =FE3m -----END PGP SIGNATURE----- Dave Reisner (4): find-libdeps: cleanup some quoting/array concerns checkpkg: mask errors from lib-provides makepkg-*.conf: add VCSCLIENTS definition prepare 20141224 release ----------------------------------------------------------------------- hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20141024-4-gdb135e9
by dreisner＠archlinux.org 24 Dec '14

24 Dec '14

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 db135e90137c5ebb9248ae7bd5ced4e8ee6b27da (commit) from 443aedca9a1acb928c2d2f0ef75bc5c2a68c209b (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 db135e90137c5ebb9248ae7bd5ced4e8ee6b27da Author: Dave Reisner <dreisner(a)archlinux.org> Date: Wed Dec 24 10:56:41 2014 -0500 prepare 20141224 release It's an xmas miracle! ----------------------------------------------------------------------- Summary of changes: Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20141024-3-g443aedc
by dreisner＠archlinux.org 23 Dec '14

23 Dec '14

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 443aedca9a1acb928c2d2f0ef75bc5c2a68c209b (commit) from b58fb33482bdce19163eb23ea79bb1a2f74b1719 (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 443aedca9a1acb928c2d2f0ef75bc5c2a68c209b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Dec 23 17:52:45 2014 -0500 makepkg-*.conf: add VCSCLIENTS definition Needed for makepkg 4.2 ----------------------------------------------------------------------- Summary of changes: makepkg-i686.conf | 7 +++++++ makepkg-x86_64.conf | 7 +++++++ 2 files changed, 14 insertions(+) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [devtools] [GIT] The official devtools repository branch master updated. 20141024-2-gb58fb33
by dreisner＠archlinux.org 10 Nov '14

10 Nov '14

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 b58fb33482bdce19163eb23ea79bb1a2f74b1719 (commit) via f743f58682d47fba5366c910d6179851e1f9483e (commit) from 98166e3454139918304b3e0a314e41628dd0c61c (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 b58fb33482bdce19163eb23ea79bb1a2f74b1719 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 25 11:20:48 2014 -0400 checkpkg: mask errors from lib-provides bsdtar doesn't consider it an error when your --include doesn't match anything in the archive, so we're forced to dump stderr to /dev/null here. Fixes: https://bugs.archlinux.org/task/42551 commit f743f58682d47fba5366c910d6179851e1f9483e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sat Oct 25 11:03:43 2014 -0400 find-libdeps: cleanup some quoting/array concerns ----------------------------------------------------------------------- Summary of changes: checkpkg.in | 4 ++-- find-libdeps.in | 14 +++++++------- 2 files changed, 9 insertions(+), 9 deletions(-) hooks/post-receive -- The official devtools repository

1 0

[arch-projects] [mkinitcpio] [PATCH] Add 'microcode' hooks
by Weng Xuetian 03 Nov '14

03 Nov '14

Add early microcode support with early cpio. All files added under /early_root will be created as a separate cpio prepend to original one. Add a early_cpio file to early cpio to detect whether cpio contains early cpio, thus we can have lsinitcpio work normally like old one. --- .gitignore | 1 + Makefile | 9 +++- install/microcode | 24 +++++++++++ lsinitcpio | 35 +++++++++++++--- mkinitcpio | 13 +++++- skipcpio.c | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 6 files changed, 198 insertions(+), 7 deletions(-) create mode 100644 install/microcode create mode 100644 skipcpio.c diff --git a/.gitignore b/.gitignore index a814a0f..1e501f0 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,4 @@ lsinitcpio.1 *~ *.bak mkinitcpio-*.tar.gz +skipcpio diff --git a/Makefile b/Makefile index 5af0eb2..a3a3591 100644 --- a/Makefile +++ b/Makefile @@ -20,7 +20,10 @@ DIRS = \ /usr/lib/systemd/system/shutdown.target.wants \ /usr/lib/tmpfiles.d -all: doc +all: doc skipcpio + +skipcpio: skipcpio.c + $(CC) skipcpio.c -o skipcpio MANPAGES = \ man/mkinitcpio.8 \ @@ -40,6 +43,7 @@ install: all < mkinitcpio > $(DESTDIR)/usr/bin/mkinitcpio sed -e 's|$^_f_functions$=.*|\1=/usr/lib/initcpio/functions|' \ + -e 's|$^_f_skipcpio$=.*|\1=/usr/lib/initcpio/skipcpio|' \ -e 's|%VERSION%|$(VERSION)|g' \ < lsinitcpio > $(DESTDIR)/usr/bin/lsinitcpio @@ -67,6 +71,8 @@ install: all ln -s mkinitcpio $(DESTDIR)/usr/share/bash-completion/completions/lsinitcpio install -m644 shell/zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_mkinitcpio + install -m755 skipcpio $(DESTDIR)/usr/lib/initcpio/skipcpio + doc: $(MANPAGES) man/%: man/%.txt Makefile a2x -d manpage \ @@ -76,6 +82,7 @@ man/%: man/%.txt Makefile clean: $(RM) mkinitcpio-${VERSION}.tar.gz $(MANPAGES) + $(RM) skipcpio dist: doc echo $(VERSION) > VERSION diff --git a/install/microcode b/install/microcode new file mode 100644 index 0000000..4dfd69e --- /dev/null +++ b/install/microcode @@ -0,0 +1,24 @@ +#!/bin/bash + +build() { + ucode_dir=(amd-ucode intel-ucode) + ucode_dest=(AuthenticAMD.bin GenuineIntel.bin) + + for idx in 0 1; do + fw=${ucode_dir[$idx]} + for fwpath in "${_d_firmware[@]}"; do + if [[ -d $fwpath/$fw ]]; then + add_dir '/early_root/kernel/x86/microcode' + cat $fwpath/$fw/* > $BUILDROOT/early_root/kernel/x86/microcode/${ucode_dest[$idx]} + fi + done + done +} + +help() { + cat <<HELPEOF +This hook generate early ucode update +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: diff --git a/lsinitcpio b/lsinitcpio index 9567b79..902bfe2 100755 --- a/lsinitcpio +++ b/lsinitcpio @@ -6,8 +6,10 @@ shopt -s extglob _list='--list' -_optcolor=1 _optverbose= +_optcolor=1 _optverbose= _optnoearly=1 _f_functions=functions +_f_skipcpio=./skipcpio +_tmp_files=() usage() { cat<<USAGE @@ -21,6 +23,7 @@ usage: ${0##*/} [action] [options] <initramfs> -x, --extract extract image to disk Options: + -e, --early display early cpio if possible -h, --help display this help -n, --nocolor disable colorized output -V, --version display version information @@ -131,7 +134,8 @@ analyze_image() { local kernver ratio columns=$(tput cols) image=$1 workdir=$(mktemp -d --tmpdir lsinitcpio.XXXXXX) - trap 'rm -rf "$workdir"' EXIT + _tmp_files+=("$workdir") + trap 'rm -rf "${_tmp_files[@]}"' EXIT # fallback in case tput failed us columns=${columns:-80} @@ -174,7 +178,7 @@ analyze_image() { explicitmod=($MODULES) # print results - imagename=$_image + imagename=$_origimage [[ -L $_image ]] && imagename+=" -> $(readlink -e "$_image")" msg 'Image: %s %s' "$imagename" [[ $version ]] && msg 'Created with mkinitcpio %s' "$version" @@ -225,10 +229,18 @@ analyze_image() { printf ' %s\n' $CLEANUPHOOKS printf '\n' fi + + msg 'Contains early CPIO:' + if (( _hasearly )); then + printf ' yes\n' + else + printf ' no\n' + fi + printf '\n' } -_opt_short='achlnVvx' -_opt_long=('analyze' 'config' 'help' 'list' 'nocolor' 'version' 'verbose' 'extract') +_opt_short='achlenVvx' +_opt_long=('analyze' 'config' 'help' 'list' 'early' 'nocolor' 'version' 'verbose' 'extract') parseopts "$_opt_short" "${_opt_long[@]}" -- "$@" || exit set -- "${OPTRET[@]}" @@ -245,6 +257,8 @@ while :; do exit 0 ;; -l|--list) _optlistcontents=1 ;; + -e|--early) + _optnoearly=0 ;; -n|--nocolor) _optcolor=0 ;; -V|--version) @@ -262,6 +276,8 @@ while :; do done _image=$1 +_origimage=$1 +_hasearly=0 if [[ -t 1 ]] && (( _optcolor )); then try_enable_color @@ -281,6 +297,15 @@ esac # read compression type _compress=$(detect_filetype "$_image") || exit +if (( _optnoearly )) && decomp "$_image" | bsdcpio -i --quiet --list | grep -q '^early_cpio'; then + _hasearly=1 + _tmp_image=$(mktemp --tmpdir lsinitcpio.XXXXXX) + _tmp_files+=("$_tmp_image") + trap 'rm -rf "${_tmp_files[@]}"' EXIT + $_f_skipcpio $_image > $_tmp_image + _image=$_tmp_image +fi + if (( _optanalyze )); then analyze_image "$_image" elif (( _optshowconfig )); then diff --git a/mkinitcpio b/mkinitcpio index 01fe8ba..cfe5747 100755 --- a/mkinitcpio +++ b/mkinitcpio @@ -221,10 +221,21 @@ build_image() { cpio_opts+=('-R' '0:0') fi + echo -n > "$out" + if [[ -d "$BUILDROOT/early_root" ]]; then + pushd "$BUILDROOT/early_root" >/dev/null + touch "$BUILDROOT/early_root/early_cpio" + find . -mindepth 1 -printf "%P\0" | + LANG=C bsdcpio "${cpio_opts[@]}" >> "$out" + popd >/dev/null + + rm -rf "$BUILDROOT/early_root" + fi + pushd "$BUILDROOT" >/dev/null find . -print0 | LANG=C bsdcpio "${cpio_opts[@]}" | - $compress $COMPRESSION_OPTIONS > "$out" + $compress $COMPRESSION_OPTIONS >> "$out" pipesave=("${PIPESTATUS[@]}") # save immediately popd >/dev/null diff --git a/skipcpio.c b/skipcpio.c new file mode 100644 index 0000000..445d7f6 --- /dev/null +++ b/skipcpio.c @@ -0,0 +1,123 @@ +/* dracut-install.c -- install files and executables + + Copyright (C) 2012 Harald Hoyer + Copyright (C) 2012 Red Hat, Inc. All rights reserved. + + This program is free software: you can redistribute it and/or modify + under the terms of the GNU Lesser General Public License as published by + the Free Software Foundation; either version 2.1 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public License + along with this program; If not, see <http://www.gnu.org/licenses/>. +*/ + +#define PROGRAM_VERSION_STRING "1" + +#ifndef _GNU_SOURCE +#define _GNU_SOURCE +#endif + +#include <stdbool.h> +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <string.h> + +#define CPIO_END "TRAILER!!!" +#define CPIO_ENDLEN (sizeof(CPIO_END)-1) + +static char buf[CPIO_ENDLEN * 2 + 1]; + +int main(int argc, char **argv) +{ + FILE *f; + size_t s; + + if (argc != 2) { + fprintf(stderr, "Usage: %s <file>\n", argv[0]); + exit(1); + } + + f = fopen(argv[1], "r"); + + if (f == NULL) { + fprintf(stderr, "Cannot open file '%s'\n", argv[1]); + exit(1); + } + + s = fread(buf, 6, 1, f); + if (s <= 0) { + fprintf(stderr, "Read error from file '%s'\n", argv[1]); + fclose(f); + exit(1); + } + fseek(f, 0, SEEK_SET); + + /* check, if this is a cpio archive */ + if ((buf[0] == 0x71 && buf[1] == 0xc7) + || (buf[0] == '0' && buf[1] == '7' && buf[2] == '0' && buf[3] == '7' && buf[4] == '0' && buf[5] == '1')) { + long pos = 0; + + /* Search for CPIO_END */ + do { + char *h; + fseek(f, pos, SEEK_SET); + buf[sizeof(buf) - 1] = 0; + s = fread(buf, CPIO_ENDLEN, 2, f); + if (s <= 0) + break; + + h = strstr(buf, CPIO_END); + if (h) { + pos = (h - buf) + pos + CPIO_ENDLEN; + fseek(f, pos, SEEK_SET); + break; + } + pos += CPIO_ENDLEN; + } while (!feof(f)); + + if (feof(f)) { + /* CPIO_END not found, just cat the whole file */ + fseek(f, 0, SEEK_SET); + } else { + /* skip zeros */ + while (!feof(f)) { + size_t i; + + buf[sizeof(buf) - 1] = 0; + s = fread(buf, 1, sizeof(buf) - 1, f); + if (s <= 0) + break; + + for (i = 0; (i < s) && (buf[i] == 0); i++) ; + + if (buf[i] != 0) { + pos += i; + fseek(f, pos, SEEK_SET); + break; + } + + pos += s; + } + } + } + /* cat out the rest */ + while (!feof(f)) { + s = fread(buf, 1, sizeof(buf), f); + if (s <= 0) + break; + + s = fwrite(buf, 1, s, stdout); + if (s <= 0) + break; + } + fclose(f); + + return EXIT_SUCCESS; +} -- 2.0.2

2 5

[arch-projects] [dbscripts] [GIT] Official repo DB scripts branch master updated. 20131102-2-g4fcedea
by pierre＠archlinux.org 01 Nov '14

01 Nov '14

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 "Official repo DB scripts". The branch, master has been updated via 4fcedea4ae5fb8788c7ef0ddd907ed8b02d14a5b (commit) from 278d07fb2b72951e1f03154df55bb833cc38d29b (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 4fcedea4ae5fb8788c7ef0ddd907ed8b02d14a5b Author: Dave Reisner <dreisner(a)archlinux.org> Date: Tue Sep 9 19:04:25 2014 -0400 disallow packages without a valid PACKAGER Shame. Signed-off-by: Pierre Schmitz <pierre(a)archlinux.de> ----------------------------------------------------------------------- Summary of changes: db-functions | 7 +++++++ db-update | 3 +++ 2 files changed, 10 insertions(+) hooks/post-receive -- Official repo DB scripts

1 0