From 35348c302ba7b6d6392db3500d8585c398b0f8df Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Tue, 2 Oct 2018 15:01:09 +0100 Subject: [PATCH] zdev/initramfs: add s390-tools- prefix to hook, due to conflicts. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Unfortunately zdev hook already exists in Ubuntu, from an unrelated project. ZFS uses zdev/zpool names, and ships a zdev hook to do ZFS specific initialisation. It is available on s390x and thus results in file-conflict upon installing both. Thus renaming this zdev hook to s390-tools-zdev. Closes: https://github.com/ibm-s390-tools/s390-tools/pull/41 Signed-off-by: Dimitri John Ledkov Acked-by: Peter Oberparleiter Signed-off-by: Jan Höppner --- zdev/initramfs/Makefile | 4 ++-- zdev/initramfs/hooks/{zdev => s390-tools-zdev} | 2 +- zdev/initramfs/scripts/init-top/{zdev => s390-tools-zdev} | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) rename zdev/initramfs/hooks/{zdev => s390-tools-zdev} (98%) rename zdev/initramfs/scripts/init-top/{zdev => s390-tools-zdev} (97%) diff --git a/zdev/initramfs/Makefile b/zdev/initramfs/Makefile index 8630cdaa..3d25aba9 100644 --- a/zdev/initramfs/Makefile +++ b/zdev/initramfs/Makefile @@ -17,6 +17,6 @@ INITTOP := $(INITRAMFSDIR)/scripts/init-top ifeq ($(HAVE_INITRAMFS),1) install: $(INSTALL) -m 755 -d $(DESTDIR)/$(HOOKDIR) $(DESTDIR)/$(INITTOP) - $(INSTALL) -m 755 hooks/zdev $(DESTDIR)/$(HOOKDIR) - $(INSTALL) -m 755 scripts/init-top/zdev $(DESTDIR)/$(INITTOP) + $(INSTALL) -m 755 hooks/s390-tools-zdev $(DESTDIR)/$(HOOKDIR) + $(INSTALL) -m 755 scripts/init-top/s390-tools-zdev $(DESTDIR)/$(INITTOP) endif diff --git a/zdev/initramfs/hooks/zdev b/zdev/initramfs/hooks/s390-tools-zdev similarity index 98% rename from zdev/initramfs/hooks/zdev rename to zdev/initramfs/hooks/s390-tools-zdev index 7ba771e1..cc7d4966 100644 --- a/zdev/initramfs/hooks/zdev +++ b/zdev/initramfs/hooks/s390-tools-zdev @@ -5,7 +5,7 @@ # s390-tools is free software; you can redistribute it and/or modify # it under the terms of the MIT license. See LICENSE for details. # -# hooks/zdev +# hooks/s390-tools-zdev # This hook script adds files required to apply firmware-provided I/O # configuration data during boot. # diff --git a/zdev/initramfs/scripts/init-top/zdev b/zdev/initramfs/scripts/init-top/s390-tools-zdev similarity index 97% rename from zdev/initramfs/scripts/init-top/zdev rename to zdev/initramfs/scripts/init-top/s390-tools-zdev index 6f89d80b..f6b235fd 100644 --- a/zdev/initramfs/scripts/init-top/zdev +++ b/zdev/initramfs/scripts/init-top/s390-tools-zdev @@ -5,7 +5,7 @@ # s390-tools is free software; you can redistribute it and/or modify # it under the terms of the MIT license. See LICENSE for details. # -# scripts/init-top/zdev +# scripts/init-top/s390-tools-zdev # Parse the kernel command line for rd.zdev kernel parameters. These # parameters are evaluated and used to configure z Systems specific devices. #