From 119b4cab8461cc5b165e59813789aa6f7acbce28e2819ccd103b322a8a1ea652 Mon Sep 17 00:00:00 2001
From: Mark Post <mpost@suse.com>
Date: Tue, 5 Dec 2017 15:58:29 +0000
Subject: [PATCH] Accepting request 554557 from
 home:markkp:branches:Base:System

- Added "--no-root-update" to all the chzdev calls in the following
  scripts for bsc#1071165:
  ctc_configure
  dasd_configure
  qeth_configure
  zfcp_disk_configure
  zfcp_host_configure

OBS-URL: https://build.opensuse.org/request/show/554557
OBS-URL: https://build.opensuse.org/package/show/Base:System/s390-tools?expand=0&rev=39
---
 ctc_configure       |  8 ++++----
 dasd_configure      |  8 ++++----
 qeth_configure      |  8 ++++----
 s390-tools.changes  | 11 +++++++++++
 zfcp_disk_configure |  8 ++++----
 zfcp_host_configure |  8 ++++----
 6 files changed, 31 insertions(+), 20 deletions(-)

diff --git a/ctc_configure b/ctc_configure
index 590f00b..0e1fdf1 100644
--- a/ctc_configure
+++ b/ctc_configure
@@ -106,11 +106,11 @@ else DEV_TYPE="ctc"
 fi
 
 if [ "${ON_OFF}" == 0 ]; then
-  debug_mesg "chzdev -d ${DEV_TYPE} ${CTC_READ_CHAN}"
-  chzdev -d ${DEV_TYPE} ${CTC_READ_CHAN}
+  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
-  debug_mesg "chzdev -e ${DEV_TYPE} ${CTC_READ_CHAN} ${PARM_LIST}"
-  chzdev -e ${DEV_TYPE} ${CTC_READ_CHAN} ${PARM_LIST}
+  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."
      usage
      exit 1
diff --git a/dasd_configure b/dasd_configure
index 3a65e78..09c3dca 100644
--- a/dasd_configure
+++ b/dasd_configure
@@ -125,11 +125,11 @@ else PARM_LIST="${PARM_LIST} use_diag=0"
 fi
 
 if [ "${ON_OFF}" == 0 ]; then
-  debug_mesg "chzdev -d dasd ${CCW_CHAN_ID}"
-  chzdev -d dasd ${CCW_CHAN_ID}
+  debug_mesg "chzdev -d dasd --no-root-update ${CCW_CHAN_ID}"
+  chzdev -d dasd --no-root-update ${CCW_CHAN_ID}
 elif [ "${ON_OFF}" == 1 ]; then
-  debug_mesg "chzdev -e dasd ${CCW_CHAN_ID} ${PARM_LIST}"
-  chzdev -e dasd ${CCW_CHAN_ID} ${PARM_LIST}
+  debug_mesg "chzdev -e dasd --no-root-update ${CCW_CHAN_ID} ${PARM_LIST}"
+  chzdev -e dasd --no-root-update ${CCW_CHAN_ID} ${PARM_LIST}
 else mesg "You must specify a 0 or a 1 for the online/offline attribute."
      usage
      exit 1
diff --git a/qeth_configure b/qeth_configure
index 0a94ee0..8e883ab 100644
--- a/qeth_configure
+++ b/qeth_configure
@@ -151,11 +151,11 @@ if [ -z "${QETH_READ_CHAN}" ] || [ -z "${QETH_WRITE_CHAN}" ] || [ -z "${QETH_DAT
 fi
 
 if [ "${ON_OFF}" == 0 ]; then
-  debug_mesg "chzdev -d qeth ${QETH_READ_CHAN}"
-  chzdev -d qeth ${QETH_READ_CHAN}
+  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
-  debug_mesg "chzdev -e qeth ${LAYER_MODE} ${PARM_LIST} ${QETH_READ_CHAN}"
-  chzdev -e qeth ${LAYER_MODE} ${PARM_LIST} ${QETH_READ_CHAN}
+  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."
      usage
      exit 1
diff --git a/s390-tools.changes b/s390-tools.changes
index aa769a8..5564b93 100644
--- a/s390-tools.changes
+++ b/s390-tools.changes
@@ -1,3 +1,14 @@
+-------------------------------------------------------------------
+Tue Dec  5 15:46:44 UTC 2017 - mpost@suse.com
+
+- Added "--no-root-update" to all the chzdev calls in the following
+  scripts for bsc#1071165:
+  ctc_configure
+  dasd_configure
+  qeth_configure
+  zfcp_disk_configure
+  zfcp_host_configure
+
 -------------------------------------------------------------------
 Thu Nov 30 20:22:09 UTC 2017 - mpost@suse.com
 
diff --git a/zfcp_disk_configure b/zfcp_disk_configure
index ef18249..46b9b09 100644
--- a/zfcp_disk_configure
+++ b/zfcp_disk_configure
@@ -62,11 +62,11 @@ FCP_WWPN=$(echo ${FCP_WWPN} | tr "A-Z" "a-z")
 FCP_LUN=$(echo ${FCP_LUN} | tr "A-Z" "a-z")
 
 if [ "${ON_OFF}" == 0 ]; then
-  debug_mesg "chzdev -d zfcp-lun ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}"
-  chzdev -d zfcp-lun ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}
+  debug_mesg "chzdev -d zfcp-lun --no-root-update ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}"
+  chzdev -d zfcp-lun --no-root-update ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}
 elif [ "${ON_OFF}" == 1 ]; then
-  debug_mesg "chzdev -e zfcp-lun ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}"
-  chzdev -e zfcp-lun ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}
+  debug_mesg "chzdev -e zfcp-lun --no-root-update ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}"
+  chzdev -e zfcp-lun --no-root-update ${CCW_CHAN_ID}:${FCP_WWPN}:${FCP_LUN}
 else mesg "You must specify a 0 or a 1 for the online/offline attribute."
      usage
      exit 1
diff --git a/zfcp_host_configure b/zfcp_host_configure
index d453ffa..2070bd1 100644
--- a/zfcp_host_configure
+++ b/zfcp_host_configure
@@ -74,11 +74,11 @@ if [ -z "${CCW_CHAN_ID}" ] || [ -z "${ON_OFF}" ]; then
 fi
 
 if [ "${ON_OFF}" == 0 ]; then
-  debug_mesg "chzdev -d zfcp-host ${CCW_CHAN_ID}"
-  chzdev -d zfcp-host ${CCW_CHAN_ID}
+  debug_mesg "chzdev -d zfcp-host --no-root-update ${CCW_CHAN_ID}"
+  chzdev -d zfcp-host --no-root-update ${CCW_CHAN_ID}
 elif [ "${ON_OFF}" == 1 ]; then
-  debug_mesg "chzdev -e zfcp-host ${CCW_CHAN_ID}"
-  chzdev -e zfcp-host ${CCW_CHAN_ID}
+  debug_mesg "chzdev -e zfcp-host --no-root-update ${CCW_CHAN_ID}"
+  chzdev -e zfcp-host --no-root-update ${CCW_CHAN_ID}
 else mesg "You must specify a 0 or a 1 for the online/offline attribute."
      usage
      exit 1