diff options
| author | Henrik Riomar <henrik.riomar@gmail.com> | 2018-01-10 10:34:55 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2018-03-21 11:50:42 +0000 |
| commit | 9165ed7246c6bc2d38d13b39640a12ed9fa3b155 (patch) | |
| tree | 4a31c2695e208bb77faa5f7bce6a5f6982b9c901 /testing/virt-what/0002-Remove-bashisms.patch | |
| parent | 631275b3feda496b60f58ad579f8a09e2ca1c297 (diff) | |
| download | aports-9165ed7246c6bc2d38d13b39640a12ed9fa3b155.tar.bz2 aports-9165ed7246c6bc2d38d13b39640a12ed9fa3b155.tar.xz | |
testing/virt-what: add upstream fixes
Set Maintainer
Diffstat (limited to 'testing/virt-what/0002-Remove-bashisms.patch')
| -rw-r--r-- | testing/virt-what/0002-Remove-bashisms.patch | 48 |
1 files changed, 48 insertions, 0 deletions
diff --git a/testing/virt-what/0002-Remove-bashisms.patch b/testing/virt-what/0002-Remove-bashisms.patch new file mode 100644 index 0000000000..02fe382e2a --- /dev/null +++ b/testing/virt-what/0002-Remove-bashisms.patch @@ -0,0 +1,48 @@ +From 9d90704a05dee7704470eff818a1c44aeef6c880 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org> +Date: Fri, 4 Aug 2017 12:02:08 -0300 +Subject: [PATCH] Remove bashisms + +Use [ instead of [[ so we fall back to test if necessary: + + http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html + +Gbp-Pq: Name Remove-bashisms.patch +--- + virt-what.in | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/virt-what.in b/virt-what.in +index 9050035..a05e0db 100644 +--- a/virt-what.in ++++ b/virt-what.in +@@ -360,20 +360,20 @@ if [ "$cpuid" = "OpenBSDVMM58" ]; then + fi + + # Check for LDoms +-if [[ "$arch" == sparc* && -e ${root}/dev/mdesc ]]; then ++if [ "${arch#sparc}" != "$arch" ] && [ -e "${root}/dev/mdesc" ]; then + echo ldoms +- if [[ -d ${root}/sys/class/vlds/ctrl && \ +- -d ${root}/sys/class/vlds/sp ]]; then ++ if [ -d "${root}/sys/class/vlds/ctrl" ] && \ ++ [ -d "${root}/sys/class/vlds/sp" ]; then + echo ldoms-control + else + echo ldoms-guest + fi + MDPROP="${root}/usr/lib/ldoms/mdprop.py" +- if [[ -x ${MDPROP} ]]; then +- if [[ -n $($MDPROP -v iodevice device-type=pciex) ]]; then ++ if [ -x "${MDPROP}" ]; then ++ if [ -n "$($MDPROP -v iodevice device-type=pciex)" ]; then + echo ldoms-root + echo ldoms-io +- elif [[ -n $($MDPROP -v iov-device vf-id=0) ]]; then ++ elif [ -n "$($MDPROP -v iov-device vf-id=0)" ]; then + echo ldoms-io + fi + fi +-- +2.15.0 + |