mirror of
https://gitlab.alpinelinux.org/alpine/aports.git
synced 2025-08-08 14:57:11 +02:00
ef0c973ce6
Add Remove-bashisms.patch from Debian Drop: skip-ldoms-test-if-not-sparc64.patch not needed after bashisms fix
44 lines
1.4 KiB
Diff
44 lines
1.4 KiB
Diff
From: =?utf-8?q?Guido_G=C3=BCnther_agx=40sigxcpu=2Eorg?=
|
|
Date: =?utf-8?q?Wed=2C_2_Aug_2017_14=3A16=3A07_-0300?=
|
|
Subject: =?utf-8?q?Remove_bashisms?=
|
|
|
|
Use [ instead of [[ and -a instead of && so we fall back to test if
|
|
necessary:
|
|
|
|
http://pubs.opengroup.org/onlinepubs/9699919799/utilities/test.html
|
|
---
|
|
virt-what.in | 12 ++++++------
|
|
1 file changed, 6 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/virt-what.in b/virt-what.in
|
|
index 8c27b11..56af1ad 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" -a -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 -a \
|
|
+ -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
|