Compare commits
2 Commits
| Author | SHA1 | Date |
|---|---|---|
Dan Horák
|
1aaabed38a | |
|
Dan Horák
|
ef84123fd0 |
|
|
@ -5,5 +5,19 @@ src_vipa-2.0.4.tar.gz
|
|||
/lib-zfcp-hbaapi-2.1.tar.gz
|
||||
/src_vipa-2.1.0.tar.gz
|
||||
/s390-tools-*.tar.bz2
|
||||
/s390-tools-*.tar.gz
|
||||
/s390-tools-*-rust-vendor.tar.xz
|
||||
/s390-tools-2.0.0.tar.gz
|
||||
/s390-tools-2.1.0.tar.gz
|
||||
/s390-tools-2.2.0.tar.gz
|
||||
/s390-tools-2.3.0.tar.gz
|
||||
/s390-tools-2.4.0.tar.gz
|
||||
/s390-tools-2.5.0.tar.gz
|
||||
/s390-tools-2.6.0.tar.gz
|
||||
/s390-tools-2.7.0.tar.gz
|
||||
/s390-tools-2.7.1.tar.gz
|
||||
/s390-tools-2.8.0.tar.gz
|
||||
/s390-tools-2.9.0.tar.gz
|
||||
/s390-tools-2.10.0.tar.gz
|
||||
/s390-tools-2.11.0.tar.gz
|
||||
/s390-tools-2.12.0.tar.gz
|
||||
/s390-tools-2.13.0.tar.gz
|
||||
/s390-tools-2.14.0.tar.gz
|
||||
|
|
|
|||
|
|
@ -54,25 +54,21 @@ EOF
|
|||
case "$COMMAND" in
|
||||
add)
|
||||
if [[ "${KERNEL_DIR}" != "/boot" ]]; then
|
||||
# rename to match the name used in the pseudo-BLS snippet above
|
||||
cp --remove-destination --preserve=timestamps -T "${KERNEL_IMAGE}" "/boot/vmlinuz-${KERNEL_VERSION}"
|
||||
command -v restorecon &>/dev/null && \
|
||||
restorecon -R "/boot/vmlinuz-${KERNEL_VERSION}"
|
||||
|
||||
for i in \
|
||||
"$KERNEL_IMAGE" \
|
||||
"$KERNEL_DIR"/System.map \
|
||||
"$KERNEL_DIR"/config \
|
||||
"$KERNEL_DIR"/zImage.stub
|
||||
do
|
||||
[[ -e "$i" ]] || continue
|
||||
cp --preserve=timestamps -T "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
|
||||
cp -aT "$i" "/boot/${i##*/}-${KERNEL_VERSION}"
|
||||
command -v restorecon &>/dev/null && \
|
||||
restorecon -R "/boot/${i##*/}-${KERNEL_VERSION}"
|
||||
done
|
||||
# hmac is .vmlinuz-<version>.hmac so needs a special treatment
|
||||
i="$KERNEL_DIR/.${KERNEL_IMAGE##*/}.hmac"
|
||||
if [[ -e "$i" ]]; then
|
||||
cp --preserve=timestamps "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
||||
cp -a "$i" "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
||||
command -v restorecon &>/dev/null && \
|
||||
restorecon "/boot/.${KERNEL_IMAGE##*/}-${KERNEL_VERSION}.hmac"
|
||||
fi
|
||||
|
|
@ -92,10 +88,16 @@ case "$COMMAND" in
|
|||
done
|
||||
fi
|
||||
|
||||
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
||||
echo "Could not determine the kernel command line parameters." >&2
|
||||
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
[[ -d "$BLS_DIR" ]] || mkdir -m 0700 -p "$BLS_DIR"
|
||||
BLS_TARGET="${BLS_DIR}/${MACHINE_ID}-${KERNEL_VERSION}.conf"
|
||||
if [[ -f "${KERNEL_DIR}/bls.conf" ]]; then
|
||||
cp --preserve=timestamps -T "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
|
||||
cp -aT "${KERNEL_DIR}/bls.conf" "${BLS_TARGET}" || exit $?
|
||||
sed -i -e "s,^linux.*,linux /boot/vmlinuz-${KERNEL_VERSION},g" "${BLS_TARGET}"
|
||||
sed -i -e "s,^initrd.*,initrd /boot/initramfs-${KERNEL_VERSION}.img,g" "${BLS_TARGET}"
|
||||
sed -i -e "s#^options.*#options ${BOOT_OPTIONS[*]}#g" "${BLS_TARGET}"
|
||||
|
|
@ -116,7 +118,7 @@ case "$COMMAND" in
|
|||
|
||||
if [ "x${MAKEDEBUG}" = "xyes" ]; then
|
||||
BLS_DEBUG="$(echo ${BLS_TARGET} | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
||||
cp --preserve=timestamps -T "${BLS_TARGET}" "${BLS_DEBUG}"
|
||||
cp -aT "${BLS_TARGET}" "${BLS_DEBUG}"
|
||||
TITLE="$(grep '^title[ \t]' "${BLS_DEBUG}" | sed -e 's/^title[ \t]*//')"
|
||||
VERSION="$(grep '^version[ \t]' "${BLS_DEBUG}" | sed -e 's/^version[ \t]*//')"
|
||||
BLSID="$(grep '^id[ \t]' "${BLS_DEBUG}" | sed -e "s/${KERNEL_VERSION}/${KERNEL_VERSION}~debug/")"
|
||||
|
|
|
|||
|
|
@ -29,6 +29,12 @@ case "$COMMAND" in
|
|||
done
|
||||
fi
|
||||
|
||||
if ! [[ ${BOOT_OPTIONS[*]} ]]; then
|
||||
echo "Could not determine the kernel command line parameters." >&2
|
||||
echo "Please specify the kernel command line in /etc/kernel/cmdline!" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
BLS_RESCUE="${BLS_DIR}/${MACHINE_ID}-0-rescue.conf"
|
||||
if [[ -f "${BLS_RESCUE}" ]] && grep -q '^options.*$kernelopts' "${BLS_RESCUE}"; then
|
||||
sed -i -e "s,^linux.*,linux /boot/vmlinuz-0-rescue-${MACHINE_ID},g" "${BLS_RESCUE}"
|
||||
|
|
|
|||
13
ccw.udev
13
ccw.udev
|
|
@ -1,4 +1,13 @@
|
|||
ACTION!="add|bind|change", GOTO="ccw_end"
|
||||
ACTION!="add|change", GOTO="ccw_end"
|
||||
SUBSYSTEM!="ccw", GOTO="ccw_end"
|
||||
DRIVER=="ctcm|lcs|qeth", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="1731/01", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="1731/02", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="1731/05", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="1731/06", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="3088/01", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="3088/08", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="3088/60", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="3088/61", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="3088/1e", RUN+="ccw_init"
|
||||
ATTRS{cutype}=="3088/1f", RUN+="ccw_init"
|
||||
LABEL="ccw_end"
|
||||
|
|
|
|||
17
ccw_init
17
ccw_init
|
|
@ -35,14 +35,6 @@ get_config_by_subchannel ()
|
|||
| LC_ALL=C sed -e "$__sed_discard_ignored_files"
|
||||
}
|
||||
|
||||
get_config_by_subchannel_nm ()
|
||||
{
|
||||
LANG=C grep -E -i -l \
|
||||
"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){0,2}${1};([0-9]\.[0-9]\.[a-f0-9]+;){0,2}$" \
|
||||
/etc/NetworkManager/system-connections/*.nmconnection \
|
||||
| LC_ALL=C sed -e "$__sed_discard_ignored_files"
|
||||
}
|
||||
|
||||
CHANNEL=${DEVPATH##*/}
|
||||
|
||||
if [ $MODE = "dracut" ]; then
|
||||
|
|
@ -73,14 +65,7 @@ elif [ $MODE = "normal" ]; then
|
|||
if [ -n "$CONFIG_FILE" ]; then
|
||||
. $CONFIG_FILE
|
||||
else
|
||||
CONFIG_FILE=$(get_config_by_subchannel_nm $CHANNEL)
|
||||
if [ -n "$CONFIG_FILE" ]; then
|
||||
NETTYPE=$(sed -nr "/^\[ethernet\]/ { :l /^s390-nettype[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
|
||||
SUBCHANNELS=$(sed -nr "/^\[ethernet\]/ { :l /^s390-subchannels[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE | sed -e "s/;/,/g" -e "s/,$//")
|
||||
LAYER2=$(sed -nr "/^\[ethernet-s390-options\]/ { :l /^layer2[ ]*=/ { s/.*=[ ]*//; p; q;}; n; b l;}" $CONFIG_FILE)
|
||||
else
|
||||
exit 1
|
||||
fi
|
||||
exit 1
|
||||
fi
|
||||
else
|
||||
echo "Unknown mode=$MODE"
|
||||
|
|
|
|||
|
|
@ -306,14 +306,6 @@ if [ $MODE_ZNET ]; then
|
|||
eval "$line"
|
||||
free_device $SUBCHANNELS
|
||||
done
|
||||
for line in $(LANG=C grep -E -i -h \
|
||||
"^s390-subchannels=([0-9]\.[0-9]\.[a-f0-9]+;){2,3}$" \
|
||||
$( (ls /etc/NetworkManager/system-connections/*.nmconnection 2> /dev/null || echo "__no_config_file") | \
|
||||
LC_ALL=C sed -e "$__sed_discard_ignored_files") 2> /dev/null)
|
||||
do
|
||||
SUBCHANNELS="$(echo $line | sed -e "s/s390-subchannels=//" -e "s/;/,/g")"
|
||||
free_device $SUBCHANNELS
|
||||
done
|
||||
fi
|
||||
|
||||
[ -z "$ALL_DEVICES" ] && exit 0
|
||||
|
|
|
|||
|
|
@ -7,6 +7,7 @@ Before=sysinit.target systemd-udev-trigger.service
|
|||
Type=oneshot
|
||||
RemainAfterExit=yes
|
||||
ExecStart=/usr/sbin/device_cio_free
|
||||
StandardOutput=syslog
|
||||
|
||||
[Install]
|
||||
WantedBy=sysinit.target
|
||||
|
|
|
|||
|
|
@ -1,8 +0,0 @@
|
|||
---
|
||||
pathmigration:
|
||||
excluded_paths:
|
||||
- /lib/s390-tools
|
||||
|
||||
badfuncs:
|
||||
ignore:
|
||||
- /usr/sbin/qethqoat
|
||||
|
|
@ -1,234 +1,19 @@
|
|||
From b2daaa34776ba6afec879e362378f6f7563590a6 Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
|
||||
Date: Mon, 20 Jun 2022 17:43:05 +0200
|
||||
Subject: [PATCH 1/2] Revert "zipl/src: Implement sorting bls entries by
|
||||
versions"
|
||||
|
||||
This reverts commit a0dba6bfdb50ff373fa710ffe2a307cc0748f18b.
|
||||
---
|
||||
zipl/src/scan.c | 139 ++----------------------------------------------
|
||||
1 file changed, 3 insertions(+), 136 deletions(-)
|
||||
|
||||
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||
index 0cea1d4..9352f76 100644
|
||||
--- a/zipl/src/scan.c
|
||||
+++ b/zipl/src/scan.c
|
||||
@@ -10,7 +10,6 @@
|
||||
*
|
||||
*/
|
||||
diff -up s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/Makefile
|
||||
--- s390-tools-2.9.0/zipl/src/Makefile.blscfg-rpm-nvr-sort 2019-05-22 08:16:17.317273801 -0400
|
||||
+++ s390-tools-2.9.0/zipl/src/Makefile 2019-05-22 08:18:02.947273801 -0400
|
||||
@@ -7,7 +7,7 @@ ALL_CPPFLAGS += -I../include -I../boot \
|
||||
-D_FILE_OFFSET_BITS=64 $(NO_PIE_CFLAGS)
|
||||
ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
||||
|
||||
-static const char *VERSION_KEYWORD = "version";
|
||||
-libs = $(rootdir)/libutil/libutil.a
|
||||
+libs = $(rootdir)/libutil/libutil.a -lrpm
|
||||
|
||||
/* Need ISOC99 function isblank() in ctype.h */
|
||||
#ifndef __USE_ISOC99
|
||||
@@ -646,7 +645,7 @@ scan_file(const char* filename, struct scan_token** token)
|
||||
|
||||
|
||||
static int
|
||||
-bls_filter_by_names(const struct dirent *ent)
|
||||
+bls_filter(const struct dirent *ent)
|
||||
{
|
||||
int offset = strlen(ent->d_name) - strlen(".conf");
|
||||
|
||||
@@ -656,111 +655,13 @@ bls_filter_by_names(const struct dirent *ent)
|
||||
return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
|
||||
}
|
||||
|
||||
-struct version {
|
||||
- char *line; /* pointer to a line with version keyword */
|
||||
- int offset; /* offset of version value in the line */
|
||||
-};
|
||||
-
|
||||
-/*
|
||||
- * Locate version in bls file represented by ENT
|
||||
- */
|
||||
-static void get_version(const struct dirent *ent, struct version *v)
|
||||
-{
|
||||
- char *line = NULL;
|
||||
- size_t len = 0;
|
||||
- char *d_name;
|
||||
- FILE *stream;
|
||||
- ssize_t read;
|
||||
-
|
||||
- memset(v, 0, sizeof(*v));
|
||||
- d_name = misc_make_path((char *)blsdir, (char *)ent->d_name);
|
||||
- if (!d_name)
|
||||
- return;
|
||||
-
|
||||
- stream = fopen(d_name, "r");
|
||||
- free(d_name);
|
||||
- if (!stream)
|
||||
- return;
|
||||
-
|
||||
- while ((read = getline(&line, &len, stream)) != -1) {
|
||||
- if (line[read - 1] == '\n') {
|
||||
- line[read - 1] = '\0';
|
||||
- read--;
|
||||
- }
|
||||
- if ((size_t)read <= strlen(VERSION_KEYWORD) + 1)
|
||||
- continue;
|
||||
- if (strcmp(VERSION_KEYWORD, line) > 0)
|
||||
- continue;
|
||||
- if (!isblank(line[strlen(VERSION_KEYWORD)]))
|
||||
- continue;
|
||||
- /* skip blanks */
|
||||
- v->offset = strlen(VERSION_KEYWORD) + 1;
|
||||
- while (v->offset < read - 1 && isblank(line[v->offset]))
|
||||
- v->offset++;
|
||||
- if (isblank(line[v->offset]))
|
||||
- /*
|
||||
- * all characters after the keyword
|
||||
- * are blanks. Invalid version
|
||||
- */
|
||||
- continue;
|
||||
- v->line = line;
|
||||
- fclose(stream);
|
||||
- return;
|
||||
- }
|
||||
- free(line);
|
||||
- fclose(stream);
|
||||
-}
|
||||
-
|
||||
-static void put_version(struct version *v)
|
||||
-{
|
||||
- free(v->line);
|
||||
-}
|
||||
-
|
||||
-/**
|
||||
- * Check version in bls file represented by ENT.
|
||||
- * Return 1 if version is valid. Otherwise return 0
|
||||
- */
|
||||
-static int bls_filter_by_versions(const struct dirent *ent)
|
||||
-{
|
||||
- struct version v;
|
||||
-
|
||||
- if (bls_filter_by_names(ent) == 0)
|
||||
- return 0;
|
||||
-
|
||||
- get_version(ent, &v);
|
||||
- if (v.line) {
|
||||
- put_version(&v);
|
||||
- return 1;
|
||||
- }
|
||||
- return 0;
|
||||
-}
|
||||
-
|
||||
|
||||
static int
|
||||
-bls_sort_by_names(const struct dirent **ent_a, const struct dirent **ent_b)
|
||||
+bls_sort(const struct dirent **ent_a, const struct dirent **ent_b)
|
||||
{
|
||||
return strverscmp((*ent_a)->d_name, (*ent_b)->d_name);
|
||||
}
|
||||
|
||||
-static int
|
||||
-bls_sort_by_versions(const struct dirent **ent_a, const struct dirent **ent_b)
|
||||
-{
|
||||
- struct version v1, v2;
|
||||
- int ret;
|
||||
-
|
||||
- get_version(*ent_a, &v1);
|
||||
- get_version(*ent_b, &v2);
|
||||
- /*
|
||||
- * Both versions are valid.
|
||||
- * It is guaranteed by bls_filter_by_versions()
|
||||
- */
|
||||
- ret = strverscmp(v1.line + v1.offset, v2.line + v2.offset);
|
||||
-
|
||||
- put_version(&v1);
|
||||
- put_version(&v2);
|
||||
-
|
||||
- return ret;
|
||||
-}
|
||||
|
||||
static int
|
||||
scan_append_section_heading(struct scan_token* scan, int* index, char* name);
|
||||
@@ -1110,40 +1011,6 @@ scan_count_target_keywords(char* keyword[])
|
||||
return num;
|
||||
}
|
||||
|
||||
-static int bls_scandir(struct dirent ***bls_entries)
|
||||
-{
|
||||
- struct dirent **entries1;
|
||||
- struct dirent **entries2;
|
||||
- int n1, n2;
|
||||
-
|
||||
- /* arrange by names */
|
||||
- n1 = scandir(blsdir, &entries1,
|
||||
- bls_filter_by_names, bls_sort_by_names);
|
||||
- if (n1 <= 0)
|
||||
- return n1;
|
||||
- /* arrange by versions */
|
||||
- n2 = scandir(blsdir, &entries2,
|
||||
- bls_filter_by_versions, bls_sort_by_versions);
|
||||
-
|
||||
- if (n2 <= 0 || n2 < n1) {
|
||||
- /*
|
||||
- * failed to sort by versions,
|
||||
- * fall back to sorting by filenames
|
||||
- */
|
||||
- *bls_entries = entries1;
|
||||
- while (n2--)
|
||||
- free(entries2[n2]);
|
||||
- free(entries2);
|
||||
- return n1;
|
||||
- }
|
||||
- /* use arrangement by versions */
|
||||
- *bls_entries = entries2;
|
||||
- while (n1--)
|
||||
- free(entries1[n1]);
|
||||
- free(entries1);
|
||||
- return n2;
|
||||
-}
|
||||
-
|
||||
int
|
||||
scan_check_target_data(char* keyword[], int* line)
|
||||
{
|
||||
@@ -1464,7 +1331,7 @@ int scan_bls(struct scan_token **token, int scan_size)
|
||||
if (!(stat(blsdir, &sb) == 0 && S_ISDIR(sb.st_mode)))
|
||||
return 0;
|
||||
|
||||
- n = bls_scandir(&bls_entries);
|
||||
+ n = scandir(blsdir, &bls_entries, bls_filter, bls_sort);
|
||||
if (n <= 0)
|
||||
return n;
|
||||
|
||||
--
|
||||
2.39.2
|
||||
|
||||
|
||||
From 692e70bcfc32a05e30146bd7077c41e0eaceff03 Mon Sep 17 00:00:00 2001
|
||||
From: Peter Jones <pjones@redhat.com>
|
||||
Date: Mon, 20 Jun 2022 17:46:59 +0200
|
||||
Subject: [PATCH 2/2] blscfg: sort like rpm nvr, not like a single version
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
Signed-off-by: Peter Jones <pjones@redhat.com>
|
||||
Signed-off-by: Dan Horák <dan@danny.cz>
|
||||
---
|
||||
zipl/src/Makefile | 1 +
|
||||
zipl/src/scan.c | 96 ++++++++++++++++++++++++++++++++++++++++++++++-
|
||||
2 files changed, 95 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/zipl/src/Makefile b/zipl/src/Makefile
|
||||
index cab5655..7ec215d 100644
|
||||
--- a/zipl/src/Makefile
|
||||
+++ b/zipl/src/Makefile
|
||||
@@ -9,6 +9,7 @@ ALL_LDFLAGS += -Wl,-z,noexecstack $(NO_PIE_LDFLAGS)
|
||||
|
||||
libs = $(rootdir)/libutil/libutil.a \
|
||||
$(rootdir)/libvtoc/libvtoc.a \
|
||||
+ -lrpmio -lrpm
|
||||
|
||||
objects = misc.o error.o scan.o job.o boot.o bootmap.o fs-map.o disk.o \
|
||||
bootmap_header.o envblk.o install.o zipl.o
|
||||
diff --git a/zipl/src/scan.c b/zipl/src/scan.c
|
||||
index 9352f76..3327e2d 100644
|
||||
--- a/zipl/src/scan.c
|
||||
+++ b/zipl/src/scan.c
|
||||
@@ -35,6 +35,8 @@
|
||||
objects = misc.o error.o scan.o job.o boot.o bootmap.o disk.o \
|
||||
install.o zipl.o $(rootdir)/zipl/boot/data.o
|
||||
diff -up s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort s390-tools-2.9.0/zipl/src/scan.c
|
||||
--- s390-tools-2.9.0/zipl/src/scan.c.blscfg-rpm-nvr-sort 2019-05-21 09:13:36.000000000 -0400
|
||||
+++ s390-tools-2.9.0/zipl/src/scan.c 2019-05-22 08:16:17.317273801 -0400
|
||||
@@ -33,6 +33,8 @@
|
||||
|
||||
#include "lib/util_base.h"
|
||||
|
||||
|
|
@ -237,7 +22,7 @@ index 9352f76..3327e2d 100644
|
|||
#include "boot.h"
|
||||
#include "error.h"
|
||||
#include "misc.h"
|
||||
@@ -655,13 +657,103 @@ bls_filter(const struct dirent *ent)
|
||||
@@ -653,13 +655,103 @@ bls_filter(const struct dirent *ent)
|
||||
return strncmp(ent->d_name + offset, ".conf", strlen(".conf")) == 0;
|
||||
}
|
||||
|
||||
|
|
@ -343,6 +128,3 @@ index 9352f76..3327e2d 100644
|
|||
|
||||
static int
|
||||
scan_append_section_heading(struct scan_token* scan, int* index, char* name);
|
||||
--
|
||||
2.39.2
|
||||
|
||||
|
|
|
|||
|
|
@ -61,10 +61,10 @@ index 871935c783f..d8d5eca5867 100755
|
|||
;;
|
||||
--)
|
||||
shift
|
||||
diff --git a/scripts/zipl-switch-to-blscfg.8 b/scripts/zipl-switch-to-blscfg.8
|
||||
diff --git a/scripts/zipl-switch-to-blscfg.1 b/scripts/zipl-switch-to-blscfg.1
|
||||
index 6bd14d00d14..71b904ffd1c 100644
|
||||
--- a/scripts/zipl-switch-to-blscfg.8
|
||||
+++ b/scripts/zipl-switch-to-blscfg.8
|
||||
--- a/scripts/zipl-switch-to-blscfg.1
|
||||
+++ b/scripts/zipl-switch-to-blscfg.1
|
||||
@@ -37,9 +37,9 @@ The DIRECTORY where the BLS fragments will be generated. The directory is create
|
||||
The FILE used for zipl configuration file, defaults to /etc/zipl.conf.
|
||||
|
||||
|
|
|
|||
538
s390utils.spec
538
s390utils.spec
|
|
@ -1,44 +1,33 @@
|
|||
# secure boot support is for RHEL only
|
||||
%if 0%{?rhel} >= 8
|
||||
%bcond_without signzipl
|
||||
%else
|
||||
%bcond_with signzipl
|
||||
%endif
|
||||
|
||||
%if 0%{?fedora}
|
||||
%bcond_without pandoc
|
||||
%else
|
||||
%bcond_with pandoc
|
||||
%global signzipl 1
|
||||
%endif
|
||||
|
||||
Name: s390utils
|
||||
Summary: Utilities and daemons for IBM z Systems
|
||||
Version: 2.31.0
|
||||
Release: 2%{?dist}
|
||||
Version: 2.14.0
|
||||
Release: 1%{?dist}
|
||||
Epoch: 2
|
||||
# MIT covers nearly all the files, except init files
|
||||
License: MIT AND LGPL-2.1-or-later
|
||||
URL: https://github.com/ibm-s390-linux/s390-tools
|
||||
Source0: https://github.com/ibm-s390-linux/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
||||
# To create the vendor tarball:
|
||||
# tar xf s390-tools-%%{version}.tar.gz ; pushd s390-tools-%%{version}/rust ; \
|
||||
# rm -f Cargo.lock && cargo vendor && \
|
||||
# tar Jvcf ../../s390-tools-%%{version}-rust-vendor.tar.xz vendor/ ; popd
|
||||
Source1: s390-tools-%{version}-rust-vendor.tar.xz
|
||||
Source5: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcpconf.sh
|
||||
Source7: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/zfcp.udev
|
||||
Source12: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasd.udev
|
||||
Source13: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/dasdconf.sh
|
||||
Source14: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/device_cio_free
|
||||
Source15: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/device_cio_free.service
|
||||
Source16: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/ccw_init
|
||||
Source17: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/ccw.udev
|
||||
Source21: https://fedorapeople.org/cgit/sharkcz/public_git/utils.git/tree/normalize_dasd_arg
|
||||
License: MIT
|
||||
ExclusiveArch: s390 s390x
|
||||
#URL: http://www.ibm.com/developerworks/linux/linux390/s390-tools.html
|
||||
URL: https://github.com/ibm-s390-tools/s390-tools
|
||||
Source0: https://github.com/ibm-s390-tools/s390-tools/archive/v%{version}.tar.gz#/s390-tools-%{version}.tar.gz
|
||||
Source5: zfcpconf.sh
|
||||
Source7: zfcp.udev
|
||||
# files for DASD initialization
|
||||
Source12: dasd.udev
|
||||
Source13: dasdconf.sh
|
||||
Source14: device_cio_free
|
||||
Source15: device_cio_free.service
|
||||
Source16: ccw_init
|
||||
Source17: ccw.udev
|
||||
Source21: normalize_dasd_arg
|
||||
Source23: 20-zipl-kernel.install
|
||||
Source24: 52-zipl-rescue.install
|
||||
Source25: 91-zipl.install
|
||||
|
||||
%if %{with signzipl}
|
||||
%if 0%{?signzipl}
|
||||
%define pesign_name redhatsecureboot302
|
||||
%endif
|
||||
|
||||
|
|
@ -46,19 +35,6 @@ Source25: 91-zipl.install
|
|||
Patch0: s390-tools-zipl-invert-script-options.patch
|
||||
Patch1: s390-tools-zipl-blscfg-rpm-nvr-sort.patch
|
||||
|
||||
# upstream fixes/updates
|
||||
#Patch100: s390utils-%%{version}-fedora.patch
|
||||
|
||||
# https://fedoraproject.org/wiki/Changes/EncourageI686LeafRemoval
|
||||
ExcludeArch: %{ix86}
|
||||
|
||||
# Add Provides for upstream name
|
||||
Provides: s390-tools = %{epoch}:%{version}-%{release}
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native package structure
|
||||
#
|
||||
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-base = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-osasnmpd = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -66,48 +42,8 @@ Requires: s390utils-cpuplugd = %{epoch}:%{version}-%{release}
|
|||
Requires: s390utils-mon_statd = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-iucvterm = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-ziomon = %{epoch}:%{version}-%{release}
|
||||
%else
|
||||
#
|
||||
# multiarch package structure
|
||||
#
|
||||
Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
|
||||
%endif
|
||||
|
||||
BuildRequires: make
|
||||
BuildRequires: gcc-c++
|
||||
BuildRequires: glib2-devel
|
||||
%if 0%{?rhel}
|
||||
BuildRequires: libcurl-devel
|
||||
BuildRequires: openssl-devel
|
||||
BuildRequires: rust-toolset
|
||||
%else
|
||||
BuildRequires: crate(anstream)
|
||||
BuildRequires: crate(anstyle-query)
|
||||
BuildRequires: crate(anyhow)
|
||||
BuildRequires: crate(byteorder)
|
||||
BuildRequires: crate(cfg-if)
|
||||
BuildRequires: crate(clap)
|
||||
BuildRequires: crate(clap_complete)
|
||||
BuildRequires: crate(clap_derive)
|
||||
BuildRequires: crate(colorchoice)
|
||||
BuildRequires: crate(curl)
|
||||
BuildRequires: crate(is-terminal)
|
||||
BuildRequires: crate(lazy_static)
|
||||
BuildRequires: crate(libc)
|
||||
BuildRequires: crate(log)
|
||||
BuildRequires: crate(mockito)
|
||||
BuildRequires: crate(openssl)
|
||||
BuildRequires: crate(openssl-probe)
|
||||
BuildRequires: crate(serde)
|
||||
BuildRequires: crate(serde_derive)
|
||||
BuildRequires: crate(serde_test)
|
||||
BuildRequires: crate(serde_yaml)
|
||||
BuildRequires: crate(strsim)
|
||||
BuildRequires: crate(terminal_size)
|
||||
BuildRequires: crate(thiserror)
|
||||
BuildRequires: crate(zerocopy)
|
||||
BuildRequires: rust-packaging
|
||||
%endif
|
||||
|
||||
%description
|
||||
This is a meta package for installing the default s390-tools sub packages.
|
||||
|
|
@ -118,25 +54,20 @@ The s390utils packages contain a set of user space utilities that should to
|
|||
be used together with the zSeries (s390) Linux kernel and device drivers.
|
||||
|
||||
%prep
|
||||
%autosetup -n s390-tools-%{version} -p1
|
||||
%setup -q -n s390-tools-%{version}
|
||||
|
||||
# Fedora/RHEL changes
|
||||
%patch0 -p1 -b .zipl-invert-script-options
|
||||
%patch1 -p1 -b .blscfg-rpm-nvr-sort
|
||||
|
||||
|
||||
# remove --strip from install
|
||||
find . -name Makefile | xargs sed -i 's/$(INSTALL) -s/$(INSTALL)/g'
|
||||
|
||||
%if 0%{?rhel}
|
||||
pushd rust
|
||||
%cargo_prep -V 1
|
||||
popd
|
||||
%else
|
||||
%cargo_prep
|
||||
%endif
|
||||
rm ./rust/Cargo.lock
|
||||
|
||||
%build
|
||||
make \
|
||||
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cxxflags}" LDFLAGS="%{build_ldflags}" \
|
||||
HAVE_DRACUT=1 \
|
||||
%if %{with pandoc}
|
||||
ENABLE_DOC=1 \
|
||||
%endif
|
||||
NO_PIE_LDFLAGS="" \
|
||||
CFLAGS="%{build_cflags}" CXXFLAGS="%{build_cflags}" LDFLAGS="%{build_ldflags}" \
|
||||
BINDIR=/usr/sbin \
|
||||
DISTRELEASE=%{release} \
|
||||
V=1
|
||||
|
|
@ -145,21 +76,14 @@ make \
|
|||
%install
|
||||
make install \
|
||||
HAVE_DRACUT=1 \
|
||||
%if %{with pandoc}
|
||||
ENABLE_DOC=1 \
|
||||
%endif
|
||||
DESTDIR=%{buildroot} \
|
||||
BINDIR=/usr/sbin \
|
||||
SYSTEMDSYSTEMUNITDIR=%{_unitdir} \
|
||||
DISTRELEASE=%{release} \
|
||||
V=1
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native specific %%install section
|
||||
#
|
||||
# sign the stage3 bootloader
|
||||
%if %{with signzipl}
|
||||
%if 0%{?signzipl}
|
||||
if [ -x /usr/bin/rpm-sign ]; then
|
||||
pushd %{buildroot}/lib/s390-tools/
|
||||
rpm-sign --key "%{pesign_name}" --lkmsign stage3.bin --output stage3.signed
|
||||
|
|
@ -170,9 +94,6 @@ else
|
|||
fi
|
||||
%endif
|
||||
|
||||
# move tools to searchable dir
|
||||
mv %{buildroot}%{_datadir}/s390-tools/netboot/mk-s390image %{buildroot}%{_bindir}
|
||||
|
||||
mkdir -p %{buildroot}{/boot,%{_udevrulesdir},%{_sysconfdir}/{profile.d,sysconfig},%{_prefix}/lib/modules-load.d}
|
||||
install -p -m 644 zipl/boot/tape0.bin %{buildroot}/boot/tape0
|
||||
install -p -m 755 %{SOURCE5} %{buildroot}%{_sbindir}
|
||||
|
|
@ -217,61 +138,17 @@ install -p -m 644 %{SOURCE17} %{buildroot}%{_udevrulesdir}/81-ccw.rules
|
|||
|
||||
# zipl.conf to be ghosted
|
||||
touch %{buildroot}%{_sysconfdir}/zipl.conf
|
||||
%endif
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x/native main %%files section
|
||||
#
|
||||
%files
|
||||
%doc README.md
|
||||
|
||||
%else
|
||||
#
|
||||
# multiarch %%files section
|
||||
#
|
||||
|
||||
%files
|
||||
%doc README.md
|
||||
%license LICENSE
|
||||
%{_bindir}/genprotimg
|
||||
%{_bindir}/pvapconfig
|
||||
%{_bindir}/pvattest
|
||||
%{_bindir}/pvextract-hdr
|
||||
%{_bindir}/pvsecret
|
||||
%{_mandir}/man1/genprotimg.1*
|
||||
%{_mandir}/man1/pvapconfig.1*
|
||||
%{_mandir}/man1/pvattest.1*
|
||||
%{_mandir}/man1/pvattest-create.1*
|
||||
%{_mandir}/man1/pvattest-perform.1*
|
||||
%{_mandir}/man1/pvattest-verify.1*
|
||||
%{_mandir}/man1/pvsecret-add.1*
|
||||
%{_mandir}/man1/pvsecret-create-association.1*
|
||||
%{_mandir}/man1/pvsecret-create-meta.1*
|
||||
%{_mandir}/man1/pvsecret-create.1*
|
||||
%{_mandir}/man1/pvsecret-list.1*
|
||||
%{_mandir}/man1/pvsecret-lock.1*
|
||||
%{_mandir}/man1/pvsecret-verify.1*
|
||||
%{_mandir}/man1/pvsecret.1*
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/genprotimg/
|
||||
|
||||
#
|
||||
# enf of multi-arch section
|
||||
#
|
||||
%endif
|
||||
|
||||
%ifarch s390x
|
||||
#
|
||||
# s390x specific sub-packages
|
||||
#
|
||||
#
|
||||
# ************************* s390-tools core package *************************
|
||||
#
|
||||
%package core
|
||||
License: MIT
|
||||
Summary: S390 core tools
|
||||
Provides: s390-tools-core = %{epoch}:%{version}-%{release}
|
||||
Requires: coreutils
|
||||
%{?systemd_requires}
|
||||
# BRs are covered via the base package
|
||||
|
|
@ -292,45 +169,29 @@ This package provides minimal set of tools needed to system to boot.
|
|||
%systemd_postun_with_restart cpi.service
|
||||
|
||||
%files core
|
||||
%doc README.md zdev/src/chzdev_usage.txt
|
||||
%license LICENSE
|
||||
%doc README.md zdev/src/*.txt
|
||||
%doc LICENSE
|
||||
%{_sbindir}/chreipl
|
||||
%{_sbindir}/chzdev
|
||||
%{_sbindir}/cio_ignore
|
||||
%{_sbindir}/dasdfmt
|
||||
%{_sbindir}/dasdinfo
|
||||
%{_sbindir}/fdasd
|
||||
%{_sbindir}/lszdev
|
||||
%{_sbindir}/vmcp
|
||||
%{_sbindir}/zipl
|
||||
%{_sbindir}/zipl-editenv
|
||||
%dir /lib/s390-tools
|
||||
%dir /lib/s390-tools/
|
||||
/lib/s390-tools/{zipl,chreipl}_helper.*
|
||||
/lib/s390-tools/cpictl
|
||||
/lib/s390-tools/stage3.bin
|
||||
/lib/s390-tools/zdev_id
|
||||
/lib/s390-tools/zdev-from-dasd_mod.dasd
|
||||
/lib/s390-tools/zdev-root-update
|
||||
/lib/s390-tools/zdev-to-dasd_mod.dasd
|
||||
/lib/s390-tools/zdev-to-rd.znet
|
||||
/lib/s390-tools/zipl.conf
|
||||
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
|
||||
%config(noreplace) %{_sysconfdir}/ziplenv
|
||||
%{_unitdir}/cpi.service
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/cpi
|
||||
/usr/lib/dracut/modules.d/95zdev/
|
||||
/usr/lib/dracut/modules.d/95zdev-kdump/
|
||||
%{_mandir}/man5/zipl.conf.5*
|
||||
%{_mandir}/man8/chreipl.8*
|
||||
%{_mandir}/man8/chzdev.8*
|
||||
%{_mandir}/man8/cio_ignore.8*
|
||||
%{_mandir}/man8/dasdfmt.8*
|
||||
%{_mandir}/man8/dasdinfo.8*
|
||||
%{_mandir}/man8/fdasd.8*
|
||||
%{_mandir}/man8/lszdev.8*
|
||||
%{_mandir}/man8/vmcp.8*
|
||||
%{_mandir}/man8/zipl.8*
|
||||
%{_mandir}/man8/zipl-editenv.8*
|
||||
|
||||
# Additional Fedora/RHEL specific stuff
|
||||
%ghost %config(noreplace) %{_sysconfdir}/dasd.conf
|
||||
|
|
@ -350,7 +211,6 @@ This package provides minimal set of tools needed to system to boot.
|
|||
%{_udevrulesdir}/59-dasd.rules
|
||||
%{_udevrulesdir}/60-readahead.rules
|
||||
%{_udevrulesdir}/81-ccw.rules
|
||||
%{_udevrulesdir}/81-dpm.rules
|
||||
%{_udevrulesdir}/90-cpi.rules
|
||||
%{_sysconfdir}/kernel/install.d/20-grubby.install
|
||||
%{_prefix}/lib/kernel/install.d/10-zfcpdump.install
|
||||
|
|
@ -364,16 +224,14 @@ This package provides minimal set of tools needed to system to boot.
|
|||
#
|
||||
|
||||
%package base
|
||||
License: MIT AND LGPL-2.1-or-later
|
||||
License: MIT
|
||||
Summary: S390 base tools
|
||||
Provides: s390-tools-base = %{epoch}:%{version}-%{release}
|
||||
Requires: gawk sed coreutils
|
||||
Requires: sysfsutils
|
||||
Requires: sg3_utils
|
||||
Requires: ethtool
|
||||
Requires: tar
|
||||
Requires: file
|
||||
Requires: s390utils-core = %{epoch}:%{version}-%{release}
|
||||
Requires: s390utils-se-data = %{epoch}:%{version}-%{release}
|
||||
%{?systemd_requires}
|
||||
BuildRequires: perl-generators
|
||||
BuildRequires: ncurses-devel
|
||||
|
|
@ -381,7 +239,7 @@ BuildRequires: glibc-static
|
|||
BuildRequires: cryptsetup-devel >= 2.0.3
|
||||
BuildRequires: json-c-devel
|
||||
BuildRequires: rpm-devel
|
||||
BuildRequires: libxml2-devel
|
||||
BuildRequires: glib2-devel
|
||||
|
||||
|
||||
%description base
|
||||
|
|
@ -446,6 +304,11 @@ s390 base tools. This collection provides the following utilities:
|
|||
* tunedasd:
|
||||
Adjust tunable parameters on DASD devices.
|
||||
|
||||
* vmconvert:
|
||||
Convert system dumps created by the z/VM VMDUMP command into dumps with
|
||||
LKCD format. These LKCD dumps can then be analyzed with the dump analysis
|
||||
tool lcrash.
|
||||
|
||||
* vmcp:
|
||||
Allows Linux users to send commands to the z/VM control program (CP).
|
||||
The normal usage is to invoke vmcp with the command you want to
|
||||
|
|
@ -527,45 +390,43 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%systemd_postun_with_restart dumpconf.service
|
||||
|
||||
%files base
|
||||
%doc README.md zdev/src/lszdev_usage.txt
|
||||
%doc README.md zdev/src/*.txt
|
||||
%doc LICENSE
|
||||
%{_sbindir}/chccwdev
|
||||
%{_sbindir}/chchp
|
||||
%{_sbindir}/chcpumf
|
||||
%{_sbindir}/chshut
|
||||
%{_sbindir}/chzcrypt
|
||||
%{_sbindir}/cio_ignore
|
||||
%{_sbindir}/dasdstat
|
||||
%{_sbindir}/dasdview
|
||||
%{_sbindir}/dbginfo.sh
|
||||
%{_sbindir}/hsavmcore
|
||||
%{_sbindir}/hsci
|
||||
%{_sbindir}/fdasd
|
||||
%{_sbindir}/hyptop
|
||||
%{_sbindir}/ip_watcher.pl
|
||||
%{_sbindir}/lschp
|
||||
%{_sbindir}/lscpumf
|
||||
%{_sbindir}/lscss
|
||||
%{_sbindir}/lsdasd
|
||||
%{_sbindir}/lshwc
|
||||
%{_sbindir}/lsluns
|
||||
%{_sbindir}/lsqeth
|
||||
%{_sbindir}/lspai
|
||||
%{_sbindir}/lsluns
|
||||
%{_sbindir}/lsreipl
|
||||
%{_sbindir}/lsscm
|
||||
%{_sbindir}/lsshut
|
||||
%{_sbindir}/lsstp
|
||||
%{_sbindir}/lstape
|
||||
%{_sbindir}/lszcrypt
|
||||
%{_sbindir}/lszdev
|
||||
%{_sbindir}/lszfcp
|
||||
%{_sbindir}/pai
|
||||
%{_sbindir}/qetharp
|
||||
%{_sbindir}/qethconf
|
||||
%{_sbindir}/qethqoat
|
||||
%{_sbindir}/scsi_logging_level
|
||||
%{_sbindir}/sclpdbf
|
||||
%{_sbindir}/start_hsnc.sh
|
||||
%{_sbindir}/tape390_crypt
|
||||
%{_sbindir}/tape390_display
|
||||
%{_sbindir}/ttyrun
|
||||
%{_sbindir}/tunedasd
|
||||
%{_sbindir}/vmcp
|
||||
%{_sbindir}/vmur
|
||||
%{_sbindir}/xcec-bridge
|
||||
%{_sbindir}/zcryptctl
|
||||
|
|
@ -577,82 +438,50 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_sbindir}/zpcictl
|
||||
%{_bindir}/dump2tar
|
||||
%{_bindir}/genprotimg
|
||||
%{_bindir}/pvapconfig
|
||||
%{_bindir}/mk-s390image
|
||||
%{_bindir}/pvattest
|
||||
%{_bindir}/pvextract-hdr
|
||||
%{_bindir}/pvsecret
|
||||
%{_bindir}/vmconvert
|
||||
%{_bindir}/zkey
|
||||
%{_bindir}/zkey-cryptsetup
|
||||
%{_unitdir}/dumpconf.service
|
||||
%ghost %config(noreplace) %{_sysconfdir}/zipl.conf
|
||||
%config(noreplace) %{_sysconfdir}/sysconfig/dumpconf
|
||||
%{_sysconfdir}/mdevctl.d/*
|
||||
/usr/lib/dracut/modules.d/99ngdump/
|
||||
# own the mdevctl dirs until new release is available
|
||||
%dir /usr/lib/mdevctl
|
||||
%dir /usr/lib/mdevctl/scripts.d
|
||||
%dir /usr/lib/mdevctl/scripts.d/callouts
|
||||
/usr/lib/mdevctl/scripts.d/callouts/ap-check
|
||||
/lib/s390-tools/dumpconf
|
||||
/lib/s390-tools/lsznet.raw
|
||||
%dir /lib/s390-tools/zfcpdump
|
||||
/lib/s390-tools/zfcpdump
|
||||
/lib/s390-tools/zfcpdump/zfcpdump-initrd
|
||||
/lib/s390-tools/znetcontrolunits
|
||||
%{_libdir}/libekmfweb.so.*
|
||||
%{_libdir}/libkmipclient.so.*
|
||||
%dir %{_libdir}/zkey
|
||||
%{_libdir}/zkey/zkey-ekmfweb.so
|
||||
%{_libdir}/zkey/zkey-kmip.so
|
||||
%{_mandir}/man1/dbginfo.sh.1*
|
||||
%{_mandir}/man1/dump2tar.1*
|
||||
%{_mandir}/man1/genprotimg.1*
|
||||
%{_mandir}/man1/pvapconfig.1*
|
||||
%{_mandir}/man1/pvattest.1*
|
||||
%{_mandir}/man1/pvattest-create.1*
|
||||
%{_mandir}/man1/pvattest-perform.1*
|
||||
%{_mandir}/man1/pvattest-verify.1*
|
||||
%{_mandir}/man1/pvsecret-add.1*
|
||||
%{_mandir}/man1/pvsecret-create-association.1*
|
||||
%{_mandir}/man1/pvsecret-create-meta.1*
|
||||
%{_mandir}/man1/pvsecret-create.1*
|
||||
%{_mandir}/man1/pvsecret-list.1*
|
||||
%{_mandir}/man1/pvsecret-lock.1*
|
||||
%{_mandir}/man1/pvsecret-verify.1*
|
||||
%{_mandir}/man1/pvsecret.1*
|
||||
%{_mandir}/man1/lscpumf.1*
|
||||
%{_mandir}/man1/vmconvert.1*
|
||||
%{_mandir}/man1/zfcpdbf.1*
|
||||
%{_mandir}/man1/zipl-switch-to-blscfg.1*
|
||||
%{_mandir}/man1/zkey.1*
|
||||
%{_mandir}/man1/zkey-cryptsetup.1*
|
||||
%{_mandir}/man1/zkey-ekmfweb.1*
|
||||
%{_mandir}/man1/zkey-kmip.1*
|
||||
%{_mandir}/man4/prandom.4*
|
||||
%{_mandir}/man5/hsavmcore.conf.5*
|
||||
%{_mandir}/man8/chccwdev.8*
|
||||
%{_mandir}/man8/chchp.8*
|
||||
%{_mandir}/man8/chcpumf.8*
|
||||
%{_mandir}/man8/chshut.8*
|
||||
%{_mandir}/man8/chzcrypt.8*
|
||||
%{_mandir}/man8/cio_ignore.8*
|
||||
%{_mandir}/man8/dasdstat.8*
|
||||
%{_mandir}/man8/dasdview.8*
|
||||
%{_mandir}/man8/dbginfo.sh.8*
|
||||
%{_mandir}/man8/dumpconf.8*
|
||||
%{_mandir}/man8/hsavmcore.8*
|
||||
%{_mandir}/man8/hsci.8*
|
||||
%{_mandir}/man8/fdasd.8*
|
||||
%{_mandir}/man8/genprotimg.8.*
|
||||
%{_mandir}/man8/hyptop.8*
|
||||
%{_mandir}/man8/lschp.8*
|
||||
%{_mandir}/man8/lscpumf.8*
|
||||
%{_mandir}/man8/lscss.8*
|
||||
%{_mandir}/man8/lsdasd.8*
|
||||
%{_mandir}/man8/lshwc.8*
|
||||
%{_mandir}/man8/lsluns.8*
|
||||
%{_mandir}/man8/lspai.8*
|
||||
%{_mandir}/man8/lsqeth.8*
|
||||
%{_mandir}/man8/lsreipl.8*
|
||||
%{_mandir}/man8/lsscm.8*
|
||||
%{_mandir}/man8/lsshut.8*
|
||||
%{_mandir}/man8/lsstp.8*
|
||||
%{_mandir}/man8/lstape.8*
|
||||
%{_mandir}/man8/lszcrypt.8*
|
||||
%{_mandir}/man8/lszdev.8*
|
||||
%{_mandir}/man8/lszfcp.8*
|
||||
%{_mandir}/man8/pai.8*
|
||||
%{_mandir}/man8/qetharp.8*
|
||||
%{_mandir}/man8/qethconf.8*
|
||||
%{_mandir}/man8/qethqoat.8*
|
||||
|
|
@ -660,45 +489,27 @@ getent group zkeyadm > /dev/null || groupadd -r zkeyadm
|
|||
%{_mandir}/man8/tape390_display.8*
|
||||
%{_mandir}/man8/ttyrun.8*
|
||||
%{_mandir}/man8/tunedasd.8*
|
||||
%{_mandir}/man8/vmcp.8*
|
||||
%{_mandir}/man8/vmur.8*
|
||||
%{_mandir}/man8/zcryptctl.8*
|
||||
%{_mandir}/man8/zcryptstats.8*
|
||||
%{_mandir}/man8/zfcpdbf.8*
|
||||
%{_mandir}/man8/zgetdump.8*
|
||||
%{_mandir}/man8/zipl-switch-to-blscfg.8*
|
||||
%{_mandir}/man8/znetconf.8*
|
||||
%{_mandir}/man8/zpcictl.8*
|
||||
%dir %{_datadir}/s390-tools
|
||||
%dir %{_datadir}/s390-tools/
|
||||
%{_datadir}/s390-tools/genprotimg/
|
||||
%{_datadir}/s390-tools/netboot/
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/kmip/profiles
|
||||
%config(noreplace) %attr(0660,root,zkeyadm)%{_sysconfdir}/zkey/kmip/profiles/*.profile
|
||||
%dir %attr(0770,root,zkeyadm) %{_sysconfdir}/zkey/repository
|
||||
%config(noreplace) %attr(0660,root,zkeyadm)%{_sysconfdir}/zkey/kms-plugins.conf
|
||||
|
||||
# Additional Fedora/RHEL specific stuff
|
||||
/boot/tape0
|
||||
|
||||
%package se-data
|
||||
License: MIT
|
||||
Summary: Data for Secure Execution
|
||||
Provides: s390-tools-se-data = %{epoch}:%{version}-%{release}
|
||||
BuildArch: noarch
|
||||
|
||||
%description se-data
|
||||
%{summary}.
|
||||
|
||||
%files se-data
|
||||
%dir %{_datadir}/s390-tools
|
||||
%{_datadir}/s390-tools/genprotimg/
|
||||
|
||||
#
|
||||
# *********************** s390-tools osasnmpd package ***********************
|
||||
#
|
||||
%package osasnmpd
|
||||
Summary: SNMP sub-agent for OSA-Express cards
|
||||
Provides: s390-tools-osasnmpd = %{epoch}:%{version}-%{release}
|
||||
Requires: net-snmp
|
||||
Requires: psmisc
|
||||
BuildRequires: net-snmp-devel
|
||||
|
|
@ -718,7 +529,6 @@ ATM Ethernet LAN Emulation in QDIO mode.
|
|||
#
|
||||
%package mon_statd
|
||||
Summary: Monitoring daemons for Linux in z/VM
|
||||
Provides: s390-tools-mon_statd = %{epoch}:%{version}-%{release}
|
||||
Requires: coreutils
|
||||
%{?systemd_requires}
|
||||
|
||||
|
|
@ -758,7 +568,6 @@ Monitoring daemons for Linux in z/VM:
|
|||
#
|
||||
%package cpuplugd
|
||||
Summary: Daemon that manages CPU and memory resources
|
||||
Provides: s390-tools-cpuplugd = %{epoch}:%{version}-%{release}
|
||||
%{?systemd_requires}
|
||||
BuildRequires: systemd
|
||||
|
||||
|
|
@ -788,7 +597,6 @@ memory can be increased or decreased exploiting the CMM1 feature.
|
|||
#
|
||||
%package ziomon
|
||||
Summary: S390 ziomon tools
|
||||
Provides: s390-tools-ziomon = %{epoch}:%{version}-%{release}
|
||||
Requires: blktrace
|
||||
Requires: coreutils
|
||||
Requires: device-mapper-multipath
|
||||
|
|
@ -827,7 +635,6 @@ Tool set to collect data for zfcp performance analysis and report.
|
|||
#
|
||||
%package iucvterm
|
||||
Summary: z/VM IUCV terminal applications
|
||||
Provides: s390-tools-iucvterm = %{epoch}:%{version}-%{release}
|
||||
Requires(pre): shadow-utils
|
||||
Requires(post): grep
|
||||
Requires(postun): grep
|
||||
|
|
@ -890,10 +697,8 @@ fi
|
|||
#
|
||||
%package cmsfs-fuse
|
||||
Summary: CMS file system based on FUSE
|
||||
BuildRequires: fuse3-devel
|
||||
Requires: fuse3
|
||||
Provides: s390-tools-cmsfs-fuse = %{epoch}:%{version}-%{release}
|
||||
Requires: glibc-gconv-extra
|
||||
BuildRequires: fuse-devel
|
||||
Requires: fuse
|
||||
Obsoletes: %{name}-cmsfs < 2:2.7.0-3
|
||||
|
||||
%description cmsfs-fuse
|
||||
|
|
@ -910,10 +715,9 @@ This package contains the CMS file system based on FUSE.
|
|||
#
|
||||
%package zdsfs
|
||||
Summary: z/OS data set access based on FUSE
|
||||
BuildRequires: fuse3-devel
|
||||
BuildRequires: fuse-devel
|
||||
BuildRequires: libcurl-devel
|
||||
Requires: fuse3
|
||||
Provides: s390-tools-zdsfs = %{epoch}:%{version}-%{release}
|
||||
Requires: fuse
|
||||
|
||||
%description zdsfs
|
||||
This package contains the z/OS data set access based on FUSE.
|
||||
|
|
@ -927,9 +731,8 @@ This package contains the z/OS data set access based on FUSE.
|
|||
#
|
||||
%package hmcdrvfs
|
||||
Summary: HMC drive file system based on FUSE
|
||||
BuildRequires: fuse3-devel
|
||||
Requires: fuse3
|
||||
Provides: s390-tools-hmcdrvfs = %{epoch}:%{version}-%{release}
|
||||
BuildRequires: fuse-devel
|
||||
Requires: fuse
|
||||
|
||||
%description hmcdrvfs
|
||||
This package contains a HMC drive file system based on FUSE and a tool
|
||||
|
|
@ -946,13 +749,11 @@ to list files and directories.
|
|||
#
|
||||
%package cpacfstatsd
|
||||
Summary: Monitor and maintain CPACF activity counters
|
||||
Provides: s390-tools-cpacfstatsd = %{epoch}:%{version}-%{release}
|
||||
Requires(post): systemd
|
||||
Requires(preun): systemd
|
||||
Requires(postun): systemd
|
||||
Requires(pre): shadow-utils
|
||||
BuildRequires: systemd
|
||||
BuildRequires: systemd-devel
|
||||
|
||||
%description cpacfstatsd
|
||||
The cpacfstats tools provide a client/server application set to monitor
|
||||
|
|
@ -977,224 +778,23 @@ getent group cpacfstats >/dev/null || groupadd -r cpacfstats
|
|||
%{_mandir}/man8/cpacfstatsd.8*
|
||||
%{_unitdir}/cpacfstatsd.service
|
||||
|
||||
#
|
||||
# *********************** chreipl-fcp-mpath package ***********************
|
||||
#
|
||||
%package chreipl-fcp-mpath
|
||||
Summary: Use multipath information for re-IPL path failover
|
||||
BuildRequires: make
|
||||
BuildRequires: bash
|
||||
BuildRequires: coreutils
|
||||
%if %{with pandoc}
|
||||
BuildRequires: pandoc
|
||||
%endif
|
||||
BuildRequires: gawk
|
||||
BuildRequires: gzip
|
||||
BuildRequires: sed
|
||||
Provides: s390-tools-chreipl-fcp-mpath = %{epoch}:%{version}-%{release}
|
||||
Requires: bash
|
||||
Requires: coreutils
|
||||
Requires: util-linux
|
||||
Requires: systemd-udev
|
||||
Requires: device-mapper-multipath
|
||||
Requires: dracut
|
||||
|
||||
%description chreipl-fcp-mpath
|
||||
The chreipl-fcp-mpath toolset monitors udev events about paths to the re-IPL
|
||||
volume. If the currently configured FCP re-IPL path becomes unavailable, the
|
||||
toolset checks for operational paths to the same volume. If available, it
|
||||
reconfigures the FCP re-IPL settings to use an operational path.
|
||||
|
||||
%files chreipl-fcp-mpath
|
||||
%doc chreipl-fcp-mpath/README.md
|
||||
%if %{with pandoc}
|
||||
%doc chreipl-fcp-mpath/README.html
|
||||
%endif
|
||||
%dir %{_prefix}/lib/chreipl-fcp-mpath/
|
||||
%{_prefix}/lib/chreipl-fcp-mpath/*
|
||||
%{_prefix}/lib/dracut/dracut.conf.d/70-chreipl-fcp-mpath.conf
|
||||
%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-tgt
|
||||
%{_prefix}/lib/udev/chreipl-fcp-mpath-is-ipl-vol
|
||||
%{_prefix}/lib/udev/chreipl-fcp-mpath-is-reipl-zfcp
|
||||
%{_prefix}/lib/udev/chreipl-fcp-mpath-record-volume-identifier
|
||||
%{_prefix}/lib/udev/chreipl-fcp-mpath-try-change-ipl-path
|
||||
%{_udevrulesdir}/70-chreipl-fcp-mpath.rules
|
||||
%{_mandir}/man7/chreipl-fcp-mpath.7*
|
||||
|
||||
#
|
||||
# *********************** devel package ***********************
|
||||
#
|
||||
%package devel
|
||||
Summary: Development files
|
||||
Provides: s390-tools-devel = %{epoch}:%{version}-%{release}
|
||||
Requires: %{name}-base%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description devel
|
||||
User-space development files for the s390/s390x architecture.
|
||||
|
||||
%files devel
|
||||
%{_includedir}/%{name}/
|
||||
%{_includedir}/ekmfweb/
|
||||
%{_includedir}/kmipclient/
|
||||
%{_libdir}/libekmfweb.so
|
||||
%{_libdir}/libkmipclient.so
|
||||
|
||||
#
|
||||
# end of s390x specific sub-packages
|
||||
#
|
||||
%endif
|
||||
%{_includedir}/%{name}
|
||||
|
||||
|
||||
%changelog
|
||||
* Fri Mar 08 2024 Neal Gompa <ngompa@fedoraproject.org> - 2:2.31.0-2
|
||||
- Add 's390-tools' Provides to all packages
|
||||
|
||||
* Mon Feb 05 2024 Dan Horák <dan[at]danny.cz> - 2:2.31.0-1
|
||||
- rebased to 2.31.0 (rhbz#2262499)
|
||||
|
||||
* Thu Jan 25 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-2
|
||||
- add s390utils-se-data as a noarch subpackage with Secure Execution data files
|
||||
|
||||
* Tue Jan 02 2024 Dan Horák <dan[at]danny.cz> - 2:2.30.0-1
|
||||
- rebased to 2.30.0 (rhbz#2252519)
|
||||
|
||||
* Fri Dec 01 2023 Fabio Valentini <decathorpe@gmail.com> - 2:2.29.0-6
|
||||
- Rebuild for openssl crate >= v0.10.60 (RUSTSEC-2023-0044, RUSTSEC-2023-0072)
|
||||
|
||||
* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-5
|
||||
- enable multi-arch build
|
||||
|
||||
* Fri Nov 10 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-4
|
||||
- fix upstream kernel installations
|
||||
|
||||
* Mon Oct 23 2023 Yaakov Selkowitz <yselkowi@redhat.com> - 2:2.29.0-3
|
||||
- Use vendored dependencies in RHEL builds
|
||||
|
||||
* Thu Aug 31 2023 Jakub Čajka <jcajka[at]redhat.com> - 2:2.29.0-2
|
||||
- enable rust based tools
|
||||
|
||||
* Mon Aug 07 2023 Dan Horák <dan[at]danny.cz> - 2:2.29.0-1
|
||||
- rebased to 2.29.0
|
||||
|
||||
* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.28.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
|
||||
|
||||
* Tue Jul 11 2023 Dan Horák <dan[at]danny.cz> - 2:2.28.0-1
|
||||
- rebased to 2.28.0
|
||||
|
||||
* Wed May 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.27.0-1
|
||||
- rebased to 2.27.0
|
||||
|
||||
* Fri May 19 2023 Petr Pisar <ppisar@redhat.com> - 2:2.26.0-2
|
||||
- Rebuild against rpm-4.19 (https://fedoraproject.org/wiki/Changes/RPM-4.19)
|
||||
|
||||
* Fri Mar 03 2023 Dan Horák <dan[at]danny.cz> - 2:2.26.0-1
|
||||
- rebased to 2.26.0
|
||||
|
||||
* Tue Jan 31 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-4
|
||||
- add post GA fixes
|
||||
|
||||
* Mon Jan 23 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-3
|
||||
- revert the kernel install script change
|
||||
|
||||
* Thu Jan 19 2023 Dan Horák <dan[at]danny.cz> - 2:2.25.0-2
|
||||
- update kernel install script to write /etc/kernel/cmdline
|
||||
|
||||
* Fri Dec 09 2022 Dan Horák <dan[at]danny.cz> - 2:2.25.0-1
|
||||
- rebased to 2.25.0
|
||||
|
||||
* Tue Nov 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-2
|
||||
- update for Transparent DASD PPRC (Peer-to-Peer Remote Copy) handling
|
||||
|
||||
* Thu Nov 10 2022 Dan Horák <dan[at]danny.cz> - 2:2.24.0-1
|
||||
- rebased to 2.24.0
|
||||
|
||||
* Fri Aug 19 2022 Dan Horák <dan[at]danny.cz> - 2:2.23.0-1
|
||||
- rebased to 2.23.0
|
||||
|
||||
* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.22.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
|
||||
|
||||
* Mon Jun 20 2022 Dan Horák <dan[at]danny.cz> - 2:2.22.0-1
|
||||
- rebased to 2.22.0
|
||||
|
||||
* Tue May 31 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-2
|
||||
- do not fail on emtpy /proc/cmdline when installing kernel (#1899759)
|
||||
|
||||
* Fri Apr 22 2022 Dan Horák <dan[at]danny.cz> - 2:2.21.0-1
|
||||
- rebased to 2.21.0
|
||||
|
||||
* Mon Feb 07 2022 Dan Horák <dan[at]danny.cz> - 2:2.20.0-1
|
||||
- rebased to 2.20.0
|
||||
- switch to fuse3
|
||||
|
||||
* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.19.0-3
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
|
||||
|
||||
* Fri Nov 26 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-2
|
||||
- update ccw udev rules
|
||||
|
||||
* Fri Nov 12 2021 Dan Horák <dan[at]danny.cz> - 2:2.19.0-1
|
||||
- rebased to 2.19.0
|
||||
- cmsfs-fuse Requires glibc-gconv-extra (#2022652)
|
||||
|
||||
* Wed Oct 20 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-2
|
||||
- move vmcp to core (#1931287)
|
||||
|
||||
* Tue Oct 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.18.0-1
|
||||
- rebased to 2.18.0
|
||||
|
||||
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.17.0-2
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
|
||||
|
||||
* Wed Jul 07 2021 Dan Horák <dan[at]danny.cz> - 2:2.17.0-1
|
||||
- rebased to 2.17.0
|
||||
- zfcpconf: set exit code explicitly (#1977434)
|
||||
- mk-s390image script requires file (#1973239)
|
||||
- drop obsolete setting from device_cio_free.service (#1972449)
|
||||
|
||||
* Mon Mar 01 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-2
|
||||
- drop superfluous Require from s390utils-base
|
||||
|
||||
* Wed Feb 24 2021 Dan Horák <dan[at]danny.cz> - 2:2.16.0-1
|
||||
- rebased to 2.16.0
|
||||
|
||||
* Wed Jan 27 2021 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.15.1-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
|
||||
|
||||
* Tue Jan 05 2021 Dan Horák <dan[at]danny.cz> - 2:2.15.1-4
|
||||
- move lszdev to core
|
||||
|
||||
* Mon Jan 04 2021 Dan Horák <dan[at]danny.cz> - 2:2.15.1-3
|
||||
- move fdasd to core
|
||||
|
||||
* Thu Oct 29 2020 Petr Šabata <contyk@redhat.com> - 2:2.15.1-2
|
||||
- Fix the development package dependency by adding epoch
|
||||
|
||||
* Thu Oct 29 2020 Dan Horák <dan[at]danny.cz> - 2:2.15.1-1
|
||||
- rebased to 2.15.1
|
||||
|
||||
* Wed Oct 28 2020 Dan Horák <dan[at]danny.cz> - 2:2.15.0-2
|
||||
- move mk-s390image to /usr/bin
|
||||
|
||||
* Tue Oct 27 2020 Dan Horák <dan[at]danny.cz> - 2:2.15.0-1
|
||||
- rebased to 2.15.0
|
||||
|
||||
* Wed Oct 07 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-4
|
||||
- update scripts for https://fedoraproject.org/wiki/Changes/NetworkManager_keyfile_instead_of_ifcfg_rh
|
||||
|
||||
* Mon Sep 21 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-3
|
||||
- rebuilt for net-snmp 5.9
|
||||
|
||||
* Wed Aug 26 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-2
|
||||
- add support for auto LUN scan to zfcpconf.sh (#1552697)
|
||||
|
||||
* Tue Aug 25 2020 Dan Horák <dan[at]danny.cz> - 2:2.14.0-1
|
||||
- rebased to 2.14.0
|
||||
|
||||
* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 2:2.13.0-5
|
||||
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
|
||||
|
||||
* Fri Jul 03 2020 Javier Martinez Canillas <javierm@redhat.com> - 2:2.13.0-4
|
||||
- add a default entry in zipl.conf if there isn't one present (#1698363)
|
||||
|
||||
|
|
|
|||
3
sources
3
sources
|
|
@ -1,2 +1 @@
|
|||
SHA512 (s390-tools-2.31.0.tar.gz) = d05722dff760605baad92b25a7a9264b3c936ff851b87a02ab39604a74d02ae4e14632d9b3d83eb9cb82a14bfcbb0d40bb4797896051ed3dd36d7690abfb1c64
|
||||
SHA512 (s390-tools-2.31.0-rust-vendor.tar.xz) = f9dc2887bb2502ba6f71ef7ea807380c322a46df8c65f0fc7993f3fb4eec4da120369d3e380dbcca9b6250307da0f6236a649504d542f44730e8009ace8ed450
|
||||
SHA512 (s390-tools-2.14.0.tar.gz) = 0593db28762689cdd432cfeab0676e96882299c551d09a6b516cb1a6d34fcc0e6cff2d98d34f71cb32feb2cd44328ded7d722db8da43c8e4b0606650c20d9fe0
|
||||
|
|
|
|||
27
zfcpconf.sh
27
zfcpconf.sh
|
|
@ -2,12 +2,10 @@
|
|||
|
||||
# config file syntax:
|
||||
# deviceno WWPN FCPLUN
|
||||
# deviceno # allowed when auto LUN scan is enabled and port is in NPIV mode
|
||||
#
|
||||
# Example:
|
||||
# 0.0.4000 0x5005076300C213e9 0x5022000000000000
|
||||
# 0.0.4001 0x5005076300c213e9 0x5023000000000000
|
||||
# 0.0.5000
|
||||
#
|
||||
#
|
||||
# manual setup:
|
||||
|
|
@ -23,20 +21,12 @@
|
|||
CONFIG=/etc/zfcp.conf
|
||||
PATH=/bin:/sbin
|
||||
|
||||
set_online()
|
||||
{
|
||||
DEVICE=$1
|
||||
|
||||
[ `cat /sys/bus/ccw/drivers/zfcp/${DEVICE}/online` = "0" ] \
|
||||
&& echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE}/online
|
||||
}
|
||||
|
||||
if [ -f "$CONFIG" ]; then
|
||||
if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
|
||||
modprobe zfcp
|
||||
fi
|
||||
if [ ! -d /sys/bus/ccw/drivers/zfcp ]; then
|
||||
exit 1
|
||||
return
|
||||
fi
|
||||
sed 'y/ABCDEF/abcdef/' < $CONFIG | while read line; do
|
||||
case $line in
|
||||
|
|
@ -44,17 +34,6 @@ if [ -f "$CONFIG" ]; then
|
|||
*)
|
||||
[ -z "$line" ] && continue
|
||||
set $line
|
||||
if [ $# -eq 1 ]; then
|
||||
DEVICE=${1##*0x}
|
||||
if [ `cat /sys/module/zfcp/parameters/allow_lun_scan` = "Y" ]; then
|
||||
set_online ${DEVICE}
|
||||
grep -q NPIV /sys/bus/ccw/devices/${DEVICE}/host*/fc_host/host*/port_type || \
|
||||
echo "Error: Only device ID (${DEVICE}) given, but port not in NPIV mode"
|
||||
else
|
||||
echo "Error: Only device ID (${DEVICE}) given, but LUN scan is disabled for the zfcp module"
|
||||
fi
|
||||
continue
|
||||
fi
|
||||
if [ $# -eq 5 ]; then
|
||||
DEVICE=$1
|
||||
SCSIID=$2
|
||||
|
|
@ -67,11 +46,11 @@ if [ -f "$CONFIG" ]; then
|
|||
WWPN=$2
|
||||
FCPLUN=$3
|
||||
fi
|
||||
set_online ${DEVICE}
|
||||
[ `cat /sys/bus/ccw/drivers/zfcp/${DEVICE}/online` = "0" ] \
|
||||
&& echo 1 > /sys/bus/ccw/drivers/zfcp/${DEVICE}/online
|
||||
[ ! -d /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/${FCPLUN} ] \
|
||||
&& echo $FCPLUN > /sys/bus/ccw/drivers/zfcp/${DEVICE}/${WWPN}/unit_add
|
||||
;;
|
||||
esac
|
||||
done
|
||||
fi
|
||||
exit 0
|
||||
|
|
|
|||
Loading…
Reference in New Issue