Accepting request 695825 from Base:System

Revert back to revision # 79.

OBS-URL: https://build.opensuse.org/request/show/695825
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=82

ctc_configure

@@ -96,7 +96,7 @@ else mesg "Psuedo file/sys/bus/ccw/devices/${CTC_READ_CHAN}/cutype doesn't exist
 fi
 
 PARM_LIST=""
-if [ "${CU_TYPE}" = "3088/01" ] || [ "${CU_TYPE}" = "3088/60" ]; then
+if [ "${CU_TYPE}" == "3088/01" ] || [ "${CU_TYPE}" == "3088/60" ]; then
   DEV_TYPE="lcs"
 else DEV_TYPE="ctc"
      if [ -z "${CTC_MODE}" ]; then
@@ -105,10 +105,10 @@ else DEV_TYPE="ctc"
      fi
 fi
 
-if [ "${ON_OFF}" = 0 ]; then
+if [ "${ON_OFF}" == 0 ]; then
   debug_mesg "chzdev -d ${DEV_TYPE} --no-root-update ${CTC_READ_CHAN}"
   chzdev -d ${DEV_TYPE} --no-root-update ${CTC_READ_CHAN}
-elif [ "${ON_OFF}" = 1 ]; then
+elif [ "${ON_OFF}" == 1 ]; then
   debug_mesg "chzdev -e ${DEV_TYPE} --no-root-update ${CTC_READ_CHAN} ${PARM_LIST}"
   chzdev -e ${DEV_TYPE} --no-root-update ${CTC_READ_CHAN} ${PARM_LIST}
 else mesg "You must specify a 0 or a 1 for the online/offline attribute."
@@ -121,7 +121,7 @@ if [ ${RC} -ne 0 ]; then
   exit ${RC}
 fi
 
-if [ ${ON_OFF} = 1 ]; then
+if [ ${ON_OFF} == 1 ]; then
   add_cio_channel "${CTC_READ_CHAN},${CTC_WRITE_CHAN}"
 else remove_cio_channel "${CTC_READ_CHAN}"
      remove_cio_channel "${CTC_WRITE_CHAN}"

dasd_configure

@@ -1,4 +1,4 @@
-#! /bin/bash
+#! /bin/sh
 #
 # dasd_configure
 #

dasd_reload

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 #
 # dasd_reload
 # $Id: dasd_reload,v 1.2 2004/05/26 15:17:09 hare Exp $

detach_disks.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 COOKIE=$(mcookie)
 DASDFILE=/tmp/dasd.list.${COOKIE}

hsnc

@@ -58,14 +58,14 @@ test -x $XCEC_BRIDGE_BIN || exit 5
 
 #call with cleanup or not
 read_config_file() {
-	if [ "$1" = "cleanup" ]; then
+	if [ "$1" == "cleanup" ]; then
 		file=$HSNC_CLEANUP_FILE
 	else
 		file=$HSNC_CONFIG_FILE
 	fi
 
 	if [ -s $file ]; then
-		. $file
+		source $file
 	else
 		echo -ne "\nCannot read $file: empty or nonexistant! "
 		# Means not configured:
@@ -77,8 +77,8 @@ read_config_file() {
 set_osa_mode() {
 # for full mode, we set up the osa as multicast router. otherwise, no
 # special setup is required for the osa.
-	if [ "$operating_mode" = "full" ]; then
+	if [ "$operating_mode" == "full" ]; then
-		if [ "$1" = "cleanup" ]; then
+		if [ "$1" == "cleanup" ]; then
 			echo no_router > /sys/class/net/$osa_int/device/route4
 		else
 			echo multicast_router > /sys/class/net/$osa_int/device/route4
@@ -92,7 +92,7 @@ set_hsi_mode() {
 # special HA setups, some more tweaking is needed, but then a handcarved
 # solution should be used anyway.
 	for i in $hsi_int ; do
-		if [ "$1" = "cleanup" ]; then
+		if [ "$1" == "cleanup" ]; then
 			echo no_router > /sys/class/net/$i/device/route4
 		else
 			echo primary_connector > /sys/class/net/$i/device/route4
@@ -103,7 +103,7 @@ set_hsi_mode() {
 do_start_hsnc() {
 	set_osa_mode
 	set_hsi_mode
-	if  [ "$operating_mode" = "full" ]; then
+	if  [ "$operating_mode" == "full" ]; then
 		$IP_WATCHER_BIN --check
 	else
 		$IP_WATCHER_BIN --check $osa_int
@@ -117,7 +117,7 @@ do_start_hsnc() {
 		# To match the LSB spec, startproc returns 0,
 		# even if the program it already running.
 		#
-		if [ "$operating_mode" = "full" ]; then
+		if [ "$operating_mode" == "full" ]; then
 			startproc $START_HSNC_BIN
 		else
 			startproc $START_HSNC_BIN $osa_int

killcdl

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 #
 # Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany.

lgr_check

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function check_sysoper(){
 local SYSOPER=$(vmcp q sysoper | cut -f4 -d" ")

qeth_configure

@@ -150,10 +150,10 @@ if [ -z "${QETH_READ_CHAN}" ] || [ -z "${QETH_WRITE_CHAN}" ] || [ -z "${QETH_DAT
   exit 1
 fi
 
-if [ "${ON_OFF}" = 0 ]; then
+if [ "${ON_OFF}" == 0 ]; then
   debug_mesg "chzdev -d qeth --no-root-update ${QETH_READ_CHAN}"
   chzdev -d qeth --no-root-update ${QETH_READ_CHAN}
-elif [ "${ON_OFF}" = 1 ]; then
+elif [ "${ON_OFF}" == 1 ]; then
   debug_mesg "chzdev -e qeth --no-root-update ${LAYER_MODE} ${PARM_LIST} ${QETH_READ_CHAN}"
   chzdev -e qeth ${LAYER_MODE} --no-root-update ${PARM_LIST} ${QETH_READ_CHAN}
 else mesg "You must specify a 0 or a 1 for the online/offline attribute."
@@ -166,7 +166,7 @@ if [ ${RC} -ne 0 ]; then
   exit ${RC}
 fi
 
-if [ ${ON_OFF} = 1 ]; then
+if [ ${ON_OFF} == 1 ]; then
   add_cio_channel "${QETH_READ_CHAN},${QETH_WRITE_CHAN},${QETH_DATA_CHAN}"
 else remove_cio_channel "${QETH_READ_CHAN}"
      remove_cio_channel "${QETH_WRITE_CHAN}"

s390-tools.changes

@@ -1,13 +1,3 @@
--------------------------------------------------------------------
-Thu Feb 21 21:46:37 UTC 2019 - Jan Engelhardt <jengelh@inai.de>
-
-- Make sure that *ALL* scripts are either sh compatible or have
-  been properly tagged as #!/bin/bash, not just the specfile.
-- Drop BuildRequires: dracut, because it is not required to build
-  or install the source. Installation of the dracut module files
-  depends on the HAVE_DRACUT make variable only.
-- Remove invisible trailing whitespaces.
-
 -------------------------------------------------------------------
 Thu Feb 21 19:38:18 UTC 2019 - mpost@suse.com
 
@@ -3149,3 +3139,4 @@ Fri Jul 13 18:31:30 CEST 2001 - mls@suse.de
 Fri Jul 13 16:15:33 CEST 2001 - bk@suse.de
 
 - new package based on s390utils
+

s390-tools.spec

@@ -189,6 +189,7 @@ Patch100:       s390-tools-sles15sp1-zkey-Enhance-error-message-about-missing-CC
 Patch101:       s390-tools-sles15sp1-zdev-Also-include-the-ctc-driver-in-the-initrd.patch
 Patch102:       s390-tools-sles15sp1-zcrypt-refine-lszcrypt-man-page.patch
 
+BuildRequires:  dracut
 BuildRequires:  fuse-devel
 BuildRequires:  gcc-c++
 BuildRequires:  gettext-tools
@@ -556,9 +557,7 @@ fi
 %dir %{_datadir}/s390-tools
 %dir %{_datadir}/s390-tools/cpumf
 %dir %{_datadir}/s390-tools/netboot
-%dir %{_prefix}/lib/dracut
+%dir %{_prefix}/lib/dracut/modules.d/95zdev
-%dir %{_prefix}/lib/dracut/modules.d
-%{_prefix}/lib/dracut/modules.d/95zdev
 %dir /boot/zipl
 %dir /lib/s390-tools/
 %{_prefix}/lib/modules-load.d/pkey.conf

virtsetup.sh

@@ -33,17 +33,17 @@ case "${hypervisor}" in
 		  fi
 		fi
 		echo "The vmcp device driver is ready."
-		if [ "${ZVM_DETACH_DISKS}" = "yes" ]; then
+		if [ "${ZVM_DETACH_DISKS}" == "yes" ]; then
 		  echo "Detaching devices to prepare for Live Guest Relocation."
 		  /usr/lib/systemd/scripts/detach_disks.sh
 		fi
-		if [ "${ZVM_WARN_ABOUT_POSSIBLE_LGR_PROBLEMS}" = yes ]; then
+		if [ "${ZVM_WARN_ABOUT_POSSIBLE_LGR_PROBLEMS}" == yes ]; then
 		  /sbin/lgr_check
 		fi
 	;;
 	none)
 		hypervisor="lpar"
-		if [ "${LPAR_SCLP_HOSTNAME}" = "yes" ]; then
+		if [ "${LPAR_SCLP_HOSTNAME}" == "yes" ]; then
 		  # If the sclp_cpi module is already loaded, we have to unload it
 		  # so we can be sure it has the correct system name specified
 		  # when we reload it again.

xpram

@@ -14,7 +14,7 @@ read_config_file() {
     file=$XPRAM_CONFIG_FILE
     
     if [ -s "$file" ]; then
-	. $file
+	source $file
 	config_read=1
     else
 	echo -ne "Cannot read $file: empty or nonexistant! "