February 2013 - Arch-projects - lists.archlinux.org

[arch-projects] [devtools] [PATCH] use nspawn to bind mount needed directories
by Dave Reisner 17 Mar '13

17 Mar '13

systemd-nspawn is capable of doing this as of systemd-198. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- mkarchroot.in | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/mkarchroot.in b/mkarchroot.in index 20de5e6..c7c7bcb 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -95,14 +95,21 @@ bind_mount() { mount --make-slave "$target" } -chroot_mount() { - trap 'trap_chroot_umount' EXIT INT QUIT TERM HUP +build_mount_args() { + local p + declare -g mount_args=() - [[ -n $host_mirror_path ]] && bind_mount "$host_mirror_path" ro + if [[ -n $host_mirror_path ]]; then + printf -v p '%q' "$host_mirror_path" + mount_args+=(--bind-ro="$p") + fi + + printf -v p '%q' "${cache_dirs[0]}" + mount_args+=(--bind="$p") - bind_mount "${cache_dirs[0]}" for cache_dir in ${cache_dirs[@]:1}; do - bind_mount "$cache_dir" ro + printf -v p '%q' "$cache_dir" + mount_args+=(--bind-ro="$p") done } @@ -148,7 +155,7 @@ chroot_lock () { chroot_run() { local dir=$1 shift - eval systemd-nspawn -D "${dir}" -- ${@} 2>/dev/null + eval systemd-nspawn -D "${dir}" "${mount_args[@]}" -- ${@} 2>/dev/null } # }}} @@ -164,7 +171,7 @@ if [[ -n $RUN ]]; then fi chroot_lock - chroot_mount + build_mount_args copy_hostconf chroot_run "${working_dir}" ${RUN} -- 1.8.1.4

3 8

[arch-projects] [devtools] [PATCH] makepkg.conf: move -D_FORTIFY_SOURCE=2 to CPPFLAGS
by Dave Reisner 10 Mar '13

10 Mar '13

This never belonged in CFLAGS/CXXFLAGS as it really is a preprocessor flag. While not necessarily harmful, this can potentially cause software not to build when it fails sanity checks (e.g. curl 7.29.0). Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> --- A similar change will be wanted for core/pacman's makepkg.conf. makepkg-i686.conf | 5 +++-- makepkg-x86_64.conf | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/makepkg-i686.conf b/makepkg-i686.conf index 725c2a2..2104f67 100644 --- a/makepkg-i686.conf +++ b/makepkg-i686.conf @@ -29,8 +29,9 @@ CHOST="i686-pc-linux-gnu" #-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" -CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +CPPFLAGS="-D_FORTIFY_SOURCE=2" +CFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" +CXXFLAGS="-march=i686 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" diff --git a/makepkg-x86_64.conf b/makepkg-x86_64.conf index 4de5c67..214c8fe 100644 --- a/makepkg-x86_64.conf +++ b/makepkg-x86_64.conf @@ -29,8 +29,9 @@ CHOST="x86_64-unknown-linux-gnu" #-- Compiler and Linker Flags # -march (or -mcpu) builds exclusively for an architecture # -mtune optimizes for an architecture, but builds for whole processor family -CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" -CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4 -D_FORTIFY_SOURCE=2" +CPPFLAGS="-D_FORTIFY_SOURCE=2" +CFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" +CXXFLAGS="-march=x86-64 -mtune=generic -O2 -pipe -fstack-protector --param=ssp-buffer-size=4" LDFLAGS="-Wl,-O1,--sort-common,--as-needed,-z,relro" #-- Make Flags: change this for DistCC/SMP systems #MAKEFLAGS="-j2" -- 1.8.1.2

3 2

[arch-projects] [netctl][patch] Remove DAD detection
by Sébastien Luttringer 09 Mar '13

09 Mar '13

DAD detection is detected via the presence of tentative flag in ip command. This flag can only be setted if interface is up (obviously). So, setting an IPv6 address will fail when you: - the cable is not plugged - any interface of a bridge is not set The code was (before rewriting of netctl) reference this bug report: https://bugs.archlinux.org/task/28887 Signed-off-by: Sébastien Luttringer <seblu(a)seblu.net> --- docs/netctl.profile.5.txt | 4 ---- src/lib/ip | 6 ------ 2 files changed, 10 deletions(-) diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index efd4fb4..621f624 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -153,10 +153,6 @@ network. In particular, these connection types are +ethernet+, Maximum time, in seconds, to wait for DHCP to be successful. Defaults to ``10`'. -'TimeoutDAD=':: - Maximum time, in seconds, to wait for IPv6's Duplicate Address - Detection to succeed. Defaults to ``3`'. - OPTIONS FOR `ethernet' CONNECTIONS ---------------------------------- diff --git a/src/lib/ip b/src/lib/ip index 8723e5b..263305e 100644 --- a/src/lib/ip +++ b/src/lib/ip @@ -130,12 +130,6 @@ ip_set() { esac if [[ $IP6 ]]; then - # Wait for Duplicate Address Detection to finish - if ! timeout_wait "${TimeoutDAD:-3}" '[[ -z "$(ip -6 addr show dev "$Interface" tentative)" ]]'; then - report_error "Duplicate Address Detection is taking too long on interface '$Interface'" - return 1 - fi - # Add static IPv6 routes if [[ $Routes6 ]]; then for route in "${Routes6[@]}"; do -- Sébastien "Seblu" Luttringer

2 8

[arch-projects] [netctl][PATCH v3] Makefile: sign tarball and add upload target
by Florian Pritz 02 Mar '13

02 Mar '13

Signed-off-by: Florian Pritz <bluewind(a)xinu.at> --- Makefile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index ad356e8..a01fefa 100644 --- a/Makefile +++ b/Makefile @@ -42,12 +42,16 @@ netctl-$(VERSION).tar.xz: | docs mv src/netctl{.orig,} tar --exclude-vcs --transform "s%^%netctl-$(VERSION)/%" --owner=root --group=root --mtime=./netctl-$(VERSION).tar -rf netctl-$(VERSION).tar docs/*.[1-8] xz netctl-$(VERSION).tar + gpg --detach-sign $@ pkgbuild: PKGBUILD PKGBUILD: netctl-$(VERSION).tar.xz sed -e "s/%pkgver%/$(VERSION)/" -e "s/%md5sum%/$(shell md5sum $< | cut -d ' ' -f 1)/" contrib/PKGBUILD > $@ +upload: netctl-$(VERSION).tar.xz + scp $< $<.sig nymeria.archlinux.org:/srv/ftp/other/packages/netctl + clean: $(MAKE) -C docs clean - -@rm -vf PKGBUILD *.xz 2>/dev/null + -@rm -vf PKGBUILD *.xz *.xz.sig 2>/dev/null -- 1.8.1.1

2 2

[arch-projects] [netctl][PATCH] Support dynamically appearing interfaces
by Ivan Shapovalov 02 Mar '13

02 Mar '13

If a profile is WantedBy=multi-user.target, it breaks init sequence if its interface is not immediately available at runtime (e. g. a cell-phone or USB modem). Add a parameter "DynamicProfileStart=" which, if enabled, makes the profile unit wanted by its interface unit (and not multi-user.target). --- docs/netctl.profile.5.txt | 4 ++++ src/netctl | 14 ++++++++++++-- 2 files changed, 16 insertions(+), 2 deletions(-) diff --git a/docs/netctl.profile.5.txt b/docs/netctl.profile.5.txt index efd4fb4..73d99f9 100644 --- a/docs/netctl.profile.5.txt +++ b/docs/netctl.profile.5.txt @@ -85,6 +85,10 @@ GENERAL OPTIONS A command that is executed after a connection is brought down. Similar precautions should be taken as with 'ExecUpPost'. +'DynamicProfileStart=':: + If ``yes`', the profile unit file is wanted by its interface unit file + instead of *multi-user.target*. This is needed if the interface + may appear dynamically (e. g. cell phone modem). IP OPTIONS ---------- diff --git a/src/netctl b/src/netctl index 498b50d..787a621 100755 --- a/src/netctl +++ b/src/netctl @@ -97,8 +97,18 @@ unit_enable() { if [[ -n $After ]]; then printf 'After="netctl(a)%s.service"\n' "${After[@]//\"/\\\"}" >> "$unit" fi - echo "ln -s '$unit' '${unit/system\//system/multi-user.target.wants/}'" - ln -s "$unit" "${unit/system\//system/multi-user.target.wants/}" + + local trigger="multi-user.target" + if is_yes "${DynamicProfileStart:-no}"; then + trigger="sys-subsystem-net-devices-${Interface/-/\\x2d}.device" + fi + + trigger="${unit/system\//system/$trigger.wants/}" + + echo "mkdir -p '$(dirname "$trigger")'" + mkdir -p "$(dirname "$trigger")" + echo "ln -s '$unit' '$trigger'" + ln -s "$unit" "$trigger" systemctl daemon-reload } -- 1.8.1.3

3 13

[arch-projects] [mkinitcpio] [GIT] The official mkinitcpio repository branch master updated. 0.13.0-7-gdde34ba
by dreisner＠archlinux.org 28 Feb '13

28 Feb '13

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 dde34ba8266d656b1ec81f774551e1448c39ac9e (commit) via 62a223c8f27c72f6ba3954a9de9c750ea9c79ce0 (commit) via 07cf5a74aed190308f94eb76d9b1ad08492736a2 (commit) via 7dbb8b6407f803c87697680b5bea09b4ae2e02d5 (commit) from 0b052ba0bd6959f9d2b59bcd3b30ff2756ddc3cb (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 dde34ba8266d656b1ec81f774551e1448c39ac9e Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Feb 28 12:52:03 2013 -0500 mkinitcpio: use consistent style in case statement Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 62a223c8f27c72f6ba3954a9de9c750ea9c79ce0 Author: Daniel Wallace <danielwallace(a)gtmanfred.com> Date: Thu Feb 28 12:42:33 2013 -0500 add zsh completion add zsh completion for lsinitcpio and mkinitcpio Signed-off-by: Daniel Wallace <danielwallace(a)gtmanfred.com> commit 07cf5a74aed190308f94eb76d9b1ad08492736a2 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Thu Feb 28 12:38:24 2013 -0500 bash-completion: use kernel versions from detection Instead of rummaging through /lib for kernel versions, just use the validated versions from the hunt through /boot. Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> commit 7dbb8b6407f803c87697680b5bea09b4ae2e02d5 Author: Dave Reisner <dreisner(a)archlinux.org> Date: Sun Feb 10 20:33:32 2013 -0500 fsck: add fsck config if it exists Signed-off-by: Dave Reisner <dreisner(a)archlinux.org> ----------------------------------------------------------------------- Summary of changes: Makefile | 2 ++ bash-completion | 10 ++------- install/fsck | 11 +++++++--- mkinitcpio | 54 ++++++++++++++++++++++++++++++++----------------- zsh-completion | 63 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 111 insertions(+), 29 deletions(-) create mode 100644 zsh-completion hooks/post-receive -- The official mkinitcpio repository

1 0

[arch-projects] [mkinitcpio] [PATCH] add zsh completion
by Daniel Wallace 28 Feb '13

28 Feb '13

add zsh completion for lsinitcpio and mkinitcpio --- Makefile | 1 + zsh-completion | 63 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 64 insertions(+) create mode 100644 zsh-completion diff --git a/Makefile b/Makefile index 5322ff1..ccd2cba 100644 --- a/Makefile +++ b/Makefile @@ -52,6 +52,7 @@ install: all install -m644 man/lsinitcpio.1 $(DESTDIR)/usr/share/man/man1/lsinitcpio.1 install -m644 bash-completion $(DESTDIR)/usr/share/bash-completion/completions/mkinitcpio ln -s mkinitcpio $(DESTDIR)/usr/share/bash-completion/completions/lsinitcpio + install -m644 zsh-completion $(DESTDIR)/usr/share/zsh/site-functions/_mkinitcpio doc: $(MANPAGES) man/%: man/%.txt Makefile diff --git a/zsh-completion b/zsh-completion new file mode 100644 index 0000000..b0e50e0 --- /dev/null +++ b/zsh-completion @@ -0,0 +1,63 @@ +#compdef lsinitcpio mkinitcpio +# mkinitcpio zsh completion by gtmanfred <danielwallace at gtmanfred dot com> + +_detect_kver() { + local kver_validator='^[[:digit:]]+(\.[[:digit:]]+)+' __ + offset=$(hexdump -s 526 -n 2 -e '"%0d"' "$1" 2>/dev/null) || return 1 + read kver __ < \ + <(dd if="$1" bs=1 count=127 skip=$(( offset + 0x200 )) 2>/dev/null) + [[ $kver =~ $kver_validator ]] && printf "$kver" +} + +_find_kernel_versions() { + local -a version + local filedata + + for f in /boot/*; do + # only match regular files which pass validation + if [[ ! -L $f && -f $f ]] && kver=$(_detect_kver "$f"); then + version+=("$kver" "$f") + fi + done + + compadd ${(u)version} +} + +case $service in + lsinitcpio) + _arguments : \ + '(-a --analyze)'{-a,--analyze}'[analyze contents of image]' \ + '(-c --config)'{-c,--config}'[show configuration file image was built with]' \ + '(-l --list)'{-l,--list}'[list contents of the image (default)]' \ + '(-x --extract)'{-x,--extract}'[extract image to disk]' \ + '(-h --help)'{-h,--help}'[display this help]' \ + '(-n --nocolor)'{-n,--nocolor}'[disable colorized output]' \ + '(-V --version)'{-V,--version}'[display version information]' \ + '(-v --verbose)'{-v,--verbose}'[more verbose output]' \ + ':files:_files' + ;; + mkinitcpio) + _arguments : \ + '(-A --addhooks)'{-A,--addhooks}'[Add specified hooks, comma separated, to image]::usr hooks:_path_files -W /usr/lib/initcpio/install::lib hooks:_path_files -W /lib/initcpio/install' \ + '(-c --config)'{-c,--config}'[Use alternate config file. (default: /etc/mkinitcpio.conf)]:config files:_files' \ + '(-g --generate)'{-g,--generate}'[Generate cpio image and write to specified path]:config files:_files' \ + '(-H --hookhelp)'{-H,--hookhelp}'[Display help for given hook and exit]::usr hooks:_path_files -W /usr/lib/initcpio/install::lib hooks:_path_files -W /lib/initcpio/install' \ + '(-h --help)'{-h,--help}'[Display this message and exit]' \ + '(-k --kernel)'{-k,--kernel}'[Use specified kernel version]:kernel versions:_find_kernel_versions' \ + '(-L --listhooks)'{-L,--listhooks}'[List all available hooks]' \ + '(-M --automods)'{-M,--automods}'[Display modules found via autodetection]' \ + '(-n --nocolor)'{-n,--nocolor}'[Disable colorized output messages]' \ + '(-p --preset)'{-p,--preset}'[Build specified preset from /etc/mkinitcpio.d]:presets:_files -g "*(\:r)" -W /etc/mkinitcpio.d' \ + '(-r --moduleroot)'{-r,--moduleroot}'[Root directory for modules (default: /)]:directories:_files -/' \ + '(-S --skiphooks)'{-S,--skiphooks}'[Skip specified hooks, comma-separated, during build]::usr hooks:_path_files -W /usr/lib/initcpio/install::lib hooks:_path_files -W /lib/initcpio/install' \ + '(-s --save)'{-s,--save}'[Save build directory. (default: no)]' \ + '(-t --builddir)'{-t,--builddir}'[Use DIR as the temporary build directory]:directories:_files -/' \ + '(-V --version)'{-V,--version}'[Display version information and exit]' \ + '(-v --verbose)'{-v,--verbose}'[Verbose output (default: no)]' \ + '(-z --compress)'{-z,--compress}'[Use an alternate compressor on the image]' + ;; + *) + return 1; + ;; +esac +# vim: set et ts=4 sw=4 ft=zsh: -- 1.8.1.4

1 0

[arch-projects] [mkinitcpio] [PATCH] [WIP] systemd: add systemd hook
by Tom Gundersen 25 Feb '13

25 Feb '13

Note: generate initramfs with HOOKS=('systemd' 'autodetect' 'block' 'filesystems' 'fsck') This relies on patches patches soon to be posted on the systemd mailinglist. This hook would live in the systemd package, but posting it as a mkinitcpio patch because SVN. Ideally, we would eventaully introduce "add_unit" and "add_rules" functions that would allow us to add a few udev rules and systemd units, and have everything else in this hook (e.g., binaries from RUN= or ExecStart= and other units based on Wants/Requires dependencise) pulled in automatically. --- install/systemd | 64 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 64 insertions(+) create mode 100644 install/systemd diff --git a/install/systemd b/install/systemd new file mode 100644 index 0000000..bfa1ec1 --- /dev/null +++ b/install/systemd @@ -0,0 +1,64 @@ +#!/bin/bash + +build() { + local rules tool socket service + + # from base + add_binary /bin/mount + + # systemd + add_binary /usr/lib/systemd/systemd /init + add_binary /usr/bin/systemctl + add_binary /usr/bin/udevadm + add_binary /usr/lib/systemd/systemd-udevd + add_binary /usr/lib/systemd/systemd-journald + + # generate sysroot.mount and sysroot-usr.mount + add_file "/usr/lib/systemd/system-generators/systemd-fstab-generator" + + # libdbus needs the passwd info of the root user + # TODO: patch dbus to avoid this hack + add_file "/etc/nsswitch.conf" + add_file "/etc/passwd" + add_file "/lib/libnss_files-2.17.so" + add_symlink "/lib/libnss_files.so.2" "libnss_files-2.17.so" + add_symlink "/lib/libnss_files.so" "libnss_files.so.2" + + # udev rules and systemd units + for rules in 50-udev-default.rules 60-persistent-storage.rules 64-btrfs.rules 80-drivers.rules 99-systemd.rules; do + add_file "/usr/lib/udev/rules.d/$rules" + done + for tool in ata_id scsi_id; do + add_file "/usr/lib/udev/$tool" + done + for socket in systemd-udevd-control systemd-udevd-kernel systemd-journald; do + add_file "/usr/lib/systemd/system/$socket.socket" + add_symlink "/usr/lib/systemd/system/sockets.target.wants/$socket.socket" "../$socket.socket" + done + for service in systemd-udevd systemd-udev-trigger systemd-journald; do + add_file "/usr/lib/systemd/system/$service.service" + add_symlink "/usr/lib/systemd/system/sysinit.target.wants/$service.service" "../$service.service" + done + for target in sysinit sockets basic emergency local-fs-pre local-fs swap remote-fs-pre initrd-switch-root; do + add_file "/usr/lib/systemd/system/$target.target" + done + + add_file "/usr/lib/systemd/system/systemd-fsck@.service" + add_file "/usr/lib/systemd/system/systemd-reboot.service" "/usr/lib/systemd/system/ctrl-alt-del.service" + + add_file "/usr/lib/systemd/system/initrd-parse-etc.service" + add_symlink "/usr/lib/systemd/system/basic.target.wants/initrd-parse-etc.service" "../initrd-parse-etc.service" + add_file "/usr/lib/systemd/system/initrd-cleanup.service" + add_file "/usr/lib/systemd/system/initrd-switch-root.service" + add_file "/usr/lib/systemd/system/initrd-udevadm-cleanup-db.service" + + add_symlink "/usr/lib/systemd/system/default.target" "basic.target" +} + +help() { + cat <<HELPEOF +This will install a basic systemd setup on your initrd, you might want to add more hooks to get more advanced functionality. +HELPEOF +} + +# vim: set ft=sh ts=4 sw=4 et: -- 1.8.1.4

1 2

[arch-projects] [netctl] [GIT] Network control utility based on systemd branch master updated. 0.5-4-gdbc2cb7
by jouke＠archlinux.org 23 Feb '13

23 Feb '13

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 "Network control utility based on systemd". The branch, master has been updated via dbc2cb76d631046ddc6039523595eeb962e5f454 (commit) via c446fad51d232e6553ca42bcba5930d9cb8556c6 (commit) via 8ce0e5f57e75c5379c6f5e7503f49eaf62f7162c (commit) via b0f92895e6c5ca54a6c8e9ed7ed6db2816d54d8a (commit) from c5e26b20745037e1edda0288a4f08352c9097768 (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 dbc2cb76d631046ddc6039523595eeb962e5f454 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Sat Feb 23 11:10:14 2013 +0100 Introduce sleep hook (FS#33829) This adds a store/restore hook to the sleep target of systemd. Thanks to: Claudio Kozický. commit c446fad51d232e6553ca42bcba5930d9cb8556c6 Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Wed Feb 20 09:47:51 2013 +0100 Fix rfkill Redirecting inside a do_debug call is, of course, impossible. commit 8ce0e5f57e75c5379c6f5e7503f49eaf62f7162c Author: Jouke Witteveen <j.witteveen(a)gmail.com> Date: Fri Feb 15 14:45:22 2013 +0100 Update documentation DAD is still causing problems/confusion. This should help a bit. commit b0f92895e6c5ca54a6c8e9ed7ed6db2816d54d8a Author: Ivan Shapovalov <intelfx100(a)gmail.com> Date: Tue Feb 12 16:39:09 2013 +0400 Automatically escape dashes in interface names Custom interface names like "eth-phone" or "eth-lte" are not uncommon, and since they are used in pathes inside systemd units, dashes and unprintable characters shall be escaped per unit file rules. So replace "-" with "\x2d" in interface names. ----------------------------------------------------------------------- Summary of changes: docs/netctl.profile.5.txt | 4 +++- docs/netctl.special.7.txt | 5 +++++ services/netctl-sleep.service | 13 +++++++++++++ src/lib/rfkill | 6 ++++-- src/netctl | 1 + 5 files changed, 26 insertions(+), 3 deletions(-) create mode 100644 services/netctl-sleep.service hooks/post-receive -- Network control utility based on systemd

1 0

[arch-projects] [netctl][PATCH] Automatically escape dashes in interface names
by Ivan Shapovalov 15 Feb '13

15 Feb '13

Custom interface names like "eth-phone" or "eth-lte" are not uncommon, and since they are used in pathes inside systemd units, dashes and unprintable characters shall be escaped per unit file rules. So replace "-" with "\x2d" in interface names. --- src/netctl | 1 + 1 file changed, 1 insertion(+) diff --git a/src/netctl b/src/netctl index 7cf0b59..498b50d 100755 --- a/src/netctl +++ b/src/netctl @@ -89,6 +89,7 @@ unit_enable() { echo -e "\n[Unit]" >> "$unit" [[ -n $Description ]] && echo "Description=$Description" >> "$unit" : ${BindsToInterfaces=$Interface} + BindsToInterfaces=( "${BindsToInterfaces[@]/-/\\x2d}" ) printf 'BindsTo=sys-subsystem-net-devices-%s.device\n' \ "${BindsToInterfaces[@]}" >> "$unit" printf 'After=sys-subsystem-net-devices-%s.device\n' \ -- 1.8.1.3

2 1