Unify ppc64 and ppc64le

hramrach · hramrach · commit 4aab6a822b71 · 2021-05-24T19:37:58.000+02:00
diff --git a/modprobe.conf/modprobe.conf.ppc64 b/modprobe.conf/modprobe.conf.ppc64
@@ -0,0 +1,6 @@
+# begin of ppc64 part for modprobe.conf
+
+# catas recovery conflicts with eeh (bsc#456389)
+options ib_mthca catas_reset_disable=1
+
+# end of ppc64 part for modprobe.conf
diff --git a/modprobe.conf/modprobe.conf.ppc64le b/modprobe.conf/modprobe.conf.ppc64le
diff --git a/modprobe.conf/modprobe.conf.ppc64le b/modprobe.conf/modprobe.conf.ppc64le
@@ -0,0 +1 @@
+modprobe.conf.ppc64
diff --git a/suse-module-tools.spec b/suse-module-tools.spec
@@ -128,7 +128,7 @@ install -pm 644 50-kernel-uname_r.conf "%{buildroot}%{_unitdir}/systemd-sysctl.s
 # Not needed in SLE11, where sg is loaded via udev rule.
 install -d -m 755 "%{buildroot}%{modules_load_dir}"
 install -pm 644 sg.conf "%{buildroot}%{modules_load_dir}"
-%ifarch ppc64le
+%ifarch ppc64 ppc64le
 install -d -m 755 %{buildroot}/usr/lib/systemd/system-generators
 install -m 755 udev-trigger-generator %{buildroot}/usr/lib/systemd/system-generators
 %endif
diff --git a/udev-trigger-generator b/udev-trigger-generator
@@ -13,7 +13,7 @@ export PATH=/usr/bin
 export TMPDIR=/dev/shm
 trap 'echo $0: error in "$BASH_COMMAND" >&2' ERR
 
-[[ $(uname -m) = ppc64le ]] || exit 0
+[[ $(uname -m) = ppc64le ]] || [[ $(uname -m) = ppc64 ]] || exit 0
 case $(systemd-detect-virt) in
     none|powervm) ;;
     *) exit 0;;
