[arch-releng] [PATCH 11/11] Rename archiso-early hook to archiso_early

[Gerardo Exequiel Pozzi]

To make compatible with disablehooks= param. Since "hook_archiso-early"
is not a valid variable name.

Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
 archiso/Makefile                     |    4 ++--
 archiso/hooks/archiso-early          |    8 --------
 archiso/hooks/archiso_early          |    8 ++++++++
 archiso/install/archiso-early        |    9 ---------
 archiso/install/archiso_early        |    9 +++++++++
 configs/syslinux-iso/mkinitcpio.conf |    2 +-
 6 files changed, 20 insertions(+), 20 deletions(-)
 delete mode 100644 archiso/hooks/archiso-early
 create mode 100644 archiso/hooks/archiso_early
 delete mode 100644 archiso/install/archiso-early
 create mode 100644 archiso/install/archiso_early

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
deleted file mode 100644
index edd554b..0000000
--- a/archiso/hooks/archiso-early
+++ /dev/null
@@ -1,8 +0,0 @@
-# vim: set ft=sh:
-run_hook ()
-{
-  if [ -n "${archisolabel}" ]; then
-    echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules
-    echo "ENV{ID_FS_LABEL_ENC}==\"${archisolabel}\", SYMLINK+=\"archiso\"" >> /lib/udev/rules.d/00-archiso-device.rules
-  fi
-}
diff --git a/archiso/hooks/archiso_early b/archiso/hooks/archiso_early
new file mode 100644
index 0000000..edd554b
--- /dev/null
+++ b/archiso/hooks/archiso_early
@@ -0,0 +1,8 @@
+# vim: set ft=sh:
+run_hook ()
+{
+  if [ -n "${archisolabel}" ]; then
+    echo "ACTION==\"add|change\", SUBSYSTEM==\"block\", IMPORT{program}=\"/sbin/blkid -o udev \$tempnode\"" > /lib/udev/rules.d/00-archiso-device.rules
+    echo "ENV{ID_FS_LABEL_ENC}==\"${archisolabel}\", SYMLINK+=\"archiso\"" >> /lib/udev/rules.d/00-archiso-device.rules
+  fi
+}
diff --git a/archiso/install/archiso-early b/archiso/install/archiso-early
deleted file mode 100644
index 66b8579..0000000
--- a/archiso/install/archiso-early
+++ /dev/null
@@ -1,9 +0,0 @@
-install ()
-{
-    MODULES=""
-    BINARIES=""
-    FILES=""
-    SCRIPT="archiso-early"
-}
-
-# vim:ft=sh:ts=4:sw=4:et:
diff --git a/archiso/install/archiso_early b/archiso/install/archiso_early
new file mode 100644
index 0000000..818fc7b
--- /dev/null
+++ b/archiso/install/archiso_early
@@ -0,0 +1,9 @@
+install ()
+{
+    MODULES=""
+    BINARIES=""
+    FILES=""
+    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"
-- 
1.7.0