diff --git a/README.md b/README.md index d7ab8a47..9218a70b 100644 --- a/README.md +++ b/README.md @@ -128,9 +128,6 @@ Package contents * sclpdbf: Display debug data for the sclp kernel component. - * scsi_logging_level: - Create, get or set the logging level for the SCSI logging facility. - * zconf: Set of scripts to configure and list status information of Linux on s390 devices. diff --git a/scripts/Makefile b/scripts/Makefile index deaed573..c08afc24 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -1,7 +1,6 @@ include ../common.mak -SCRIPTS = dbginfo.sh zfcpdbf zipl-switch-to-blscfg scsi_logging_level -SCRIPTS += sclpdbf +SCRIPTS = dbginfo.sh zfcpdbf zipl-switch-to-blscfg sclpdbf # Helper scripts controlled by corresponding systemd services SD_HELPER_SCRIPTS = cpictl dumpconf MAN_PAGES = dbginfo.sh.8 zfcpdbf.8 zipl-switch-to-blscfg.8 diff --git a/scripts/scsi_logging_level b/scripts/scsi_logging_level deleted file mode 100755 index 13f7e9df..00000000 --- a/scripts/scsi_logging_level +++ /dev/null @@ -1,278 +0,0 @@ -#!/bin/bash -# -# scsi_logging_level - Conveniently create and set scsi logging level, -# show SCSI_LOG fields in human readable form -# -# Copyright IBM Corp. 2006, 2017 -# -# s390-tools is free software; you can redistribute it and/or modify -# it under the terms of the MIT license. See LICENSE for details. -# - -SCRIPTNAME="scsi_logging_level" - -declare -i LOG_ERROR=0 -declare -i LOG_TIMEOUT=0 -declare -i LOG_SCAN=0 -declare -i LOG_MLQUEUE=0 -declare -i LOG_MLCOMPLETE=0 -declare -i LOG_LLQUEUE=0 -declare -i LOG_LLCOMPLETE=0 -declare -i LOG_HLQUEUE=0 -declare -i LOG_HLCOMPLETE=0 -declare -i LOG_IOCTL=0 - -declare -i LEVEL=0 - -_ERROR_SHIFT=0 -_TIMEOUT_SHIFT=3 -_SCAN_SHIFT=6 -_MLQUEUE_SHIFT=9 -_MLCOMPLETE_SHIFT=12 -_LLQUEUE_SHIFT=15 -_LLCOMPLETE_SHIFT=18 -_HLQUEUE_SHIFT=21 -_HLCOMPLETE_SHIFT=24 -_IOCTL_SHIFT=27 - -SET=0 -GET=0 -CREATE=0 - -OPTS=`getopt -o hvcgsa:E:T:S:I:M:L:H: --long \ -help,version,create,get,set,all:,error:,timeout:,scan:,ioctl:,\ -midlevel:,mlqueue:,mlcomplete:,lowlevel:,llqueue:,llcomplete:,\ -highlevel:,hlqueue:,hlcomplete: -n \'$SCRIPTNAME\' -- "$@"` -eval set -- "$OPTS" - -# print version info -printversion() -{ - cat <>$_ERROR_SHIFT) & 7)) - LOG_TIMEOUT=$((($LEVEL>>$_TIMEOUT_SHIFT) & 7)) - LOG_SCAN=$((($LEVEL>>$_SCAN_SHIFT) & 7)) - LOG_MLQUEUE=$((($LEVEL>>$_MLQUEUE_SHIFT) & 7)) - LOG_MLCOMPLETE=$((($LEVEL>>$_MLCOMPLETE_SHIFT) & 7)) - LOG_LLQUEUE=$((($LEVEL>>$_LLQUEUE_SHIFT) & 7)) - LOG_LLCOMPLETE=$((($LEVEL>>$_LLCOMPLETE_SHIFT) & 7)) - LOG_HLQUEUE=$((($LEVEL>>$_HLQUEUE_SHIFT) & 7)) - LOG_HLCOMPLETE=$((($LEVEL>>$_HLCOMPLETE_SHIFT) & 7)) - LOG_IOCTL=$((($LEVEL>>$_IOCTL_SHIFT) & 7)) - - echo "SCSI_LOG_ERROR=$LOG_ERROR" - echo "SCSI_LOG_TIMEOUT=$LOG_TIMEOUT" - echo "SCSI_LOG_SCAN=$LOG_SCAN" - echo "SCSI_LOG_MLQUEUE=$LOG_MLQUEUE" - echo "SCSI_LOG_MLCOMPLETE=$LOG_MLCOMPLETE" - echo "SCSI_LOG_LLQUEUE=$LOG_LLQUEUE" - echo "SCSI_LOG_LLCOMPLETE=$LOG_LLCOMPLETE" - echo "SCSI_LOG_HLQUEUE=$LOG_HLQUEUE" - echo "SCSI_LOG_HLCOMPLETE=$LOG_HLCOMPLETE" - echo "SCSI_LOG_IOCTL=$LOG_IOCTL" -} - -set_logging_level() -{ - echo "New scsi logging level:" - sysctl -q -w dev.scsi.logging_level=$LEVEL - if [ $? != 0 ] - then - echo "$SCRIPTNAME: could not write scsi logging level" \ - "(kernel probably without SCSI_LOGGING support)" - exit 1 - fi -} -create_logging_level() -{ - LEVEL=$((($LOG_ERROR & 7)<<$_ERROR_SHIFT)) - LEVEL=$(($LEVEL|(($LOG_TIMEOUT & 7)<<$_TIMEOUT_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_SCAN & 7)<<$_SCAN_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_MLQUEUE & 7)<<$_MLQUEUE_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_MLCOMPLETE & 7)<<$_MLCOMPLETE_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_LLQUEUE & 7)<<$_LLQUEUE_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_LLCOMPLETE & 7)<<$_LLCOMPLETE_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_HLQUEUE & 7)<<$_HLQUEUE_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_HLCOMPLETE & 7)<<$_HLCOMPLETE_SHIFT))) - LEVEL=$(($LEVEL|(($LOG_IOCTL & 7)<<$_IOCTL_SHIFT))) -} - -check_cmdline $* - -if [ $SET = "1" ] -then - create_logging_level - set_logging_level - show_logging_level -elif [ $GET = "1" ] -then - get_logging_level - show_logging_level -elif [ $CREATE = "1" ] -then - create_logging_level - show_logging_level -else - invalid_cmdline missing option \'-g\', \'-s\' or \'-c\' -fi