From b7ca4bf281f0c5997fa8f52ed11d98dd32601f2c Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Thu, 18 Feb 2010 00:10:39 -0300 Subject: [PATCH] Rename archiso-early hook to archiso_early To make compatible with disablehooks= param. Since "hook_archiso-early" is not a valid variable name. Signed-off-by: Gerardo Exequiel Pozzi --- archiso/Makefile | 4 ++-- archiso/hooks/{archiso-early => archiso_early} | 0 archiso/install/{archiso-early => archiso_early} | 2 +- configs/syslinux-iso/mkinitcpio.conf | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) rename archiso/hooks/{archiso-early => archiso_early} (100%) rename archiso/install/{archiso-early => archiso_early} (76%) diff --git a/archiso/Makefile b/archiso/Makefile index 3fd7ae3..2f30175 100644 --- a/archiso/Makefile +++ b/archiso/Makefile @@ -7,9 +7,9 @@ install: all install -D -m 755 testiso $(DESTDIR)/usr/bin/testiso # hooks/install are needed by mkinitcpio install -D -m 644 hooks/archiso $(DESTDIR)/lib/initcpio/hooks/archiso - install -D -m 644 hooks/archiso-early $(DESTDIR)/lib/initcpio/hooks/archiso-early + install -D -m 644 hooks/archiso_early $(DESTDIR)/lib/initcpio/hooks/archiso_early install -D -m 644 install/archiso $(DESTDIR)/lib/initcpio/install/archiso - install -D -m 644 install/archiso-early $(DESTDIR)/lib/initcpio/install/archiso-early + install -D -m 644 install/archiso_early $(DESTDIR)/lib/initcpio/install/archiso_early # install docs and examples install -d -m 644 $(DESTDIR)/usr/share/archiso/ cp -r ../configs $(DESTDIR)/usr/share/archiso/configs diff --git a/archiso/hooks/archiso-early b/archiso/hooks/archiso_early similarity index 100% rename from archiso/hooks/archiso-early rename to archiso/hooks/archiso_early diff --git a/archiso/install/archiso-early b/archiso/install/archiso_early similarity index 76% rename from archiso/install/archiso-early rename to archiso/install/archiso_early index 66b8579..818fc7b 100644 --- a/archiso/install/archiso-early +++ b/archiso/install/archiso_early @@ -3,7 +3,7 @@ install () MODULES="" BINARIES="" FILES="" - SCRIPT="archiso-early" + SCRIPT="archiso_early" } # vim:ft=sh:ts=4:sw=4:et: diff --git a/configs/syslinux-iso/mkinitcpio.conf b/configs/syslinux-iso/mkinitcpio.conf index fbd72ed..6445456 100644 --- a/configs/syslinux-iso/mkinitcpio.conf +++ b/configs/syslinux-iso/mkinitcpio.conf @@ -2,5 +2,5 @@ MODULES="" BINARIES="" FILES="" -HOOKS="base archiso-early udev archiso pata scsi sata usb fw pcmcia filesystems usbinput" +HOOKS="base archiso_early udev archiso pata scsi sata usb fw pcmcia filesystems usbinput" COMPRESSION="lzma"