From fffe690a7361b8e36bf67db1a1ad1dc524489e67 Mon Sep 17 00:00:00 2001 From: Gerardo Exequiel Pozzi Date: Wed, 17 Mar 2010 23:23:13 -0300 Subject: [PATCH] [archiso] Rename nbd hook to archiso_nbd Signed-off-by: Gerardo Exequiel Pozzi --- README | 2 ++ archiso/Makefile | 8 ++++---- archiso/hooks/{nbd => archiso_pxe_nbd} | 0 archiso/install/{nbd => archiso_pxe_nbd} | 2 +- configs/syslinux-iso/mkinitcpio.conf | 2 +- 5 files changed, 8 insertions(+), 6 deletions(-) rename archiso/hooks/{nbd => archiso_pxe_nbd} (100%) rename archiso/install/{nbd => archiso_pxe_nbd} (91%) diff --git a/README b/README index 79e50ab..77373d0 100644 --- a/README +++ b/README @@ -21,6 +21,8 @@ First off, Archiso has some dependencies: - aufs2-util (only needed in target media) - devtools for mkarchroot - syslinux + - nbd + - mkinitcpio-nfs-utils Archiso itself can be installed with the handy dandy included Makefile, and the incantation 'make install'. diff --git a/archiso/Makefile b/archiso/Makefile index ba887e6..8d72a18 100644 --- a/archiso/Makefile +++ b/archiso/Makefile @@ -8,8 +8,8 @@ install: all # hooks/install are needed by mkinitcpio install -D -m 644 hooks/archiso $(DESTDIR)/lib/initcpio/hooks/archiso install -D -m 644 install/archiso $(DESTDIR)/lib/initcpio/install/archiso - install -D -m 644 hooks/nbd $(DESTDIR)/lib/initcpio/hooks/nbd - install -D -m 644 install/nbd $(DESTDIR)/lib/initcpio/install/nbd + install -D -m 644 hooks/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd + install -D -m 644 install/archiso_pxe_nbd $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd # install docs and examples install -d -m 644 $(DESTDIR)/usr/share/archiso/ cp -r ../configs $(DESTDIR)/usr/share/archiso/configs @@ -20,7 +20,7 @@ uninstall: rm -f $(DESTDIR)/usr/bin/testiso rm -f $(DESTDIR)/lib/initcpio/hooks/archiso rm -f $(DESTDIR)/lib/initcpio/install/archiso - rm -f $(DESTDIR)/lib/initcpio/hooks/nbd - rm -f $(DESTDIR)/lib/initcpio/install/nbd + rm -f $(DESTDIR)/lib/initcpio/hooks/archiso_pxe_nbd + rm -f $(DESTDIR)/lib/initcpio/install/archiso_pxe_nbd rm -rf $(DESTDIR)/usr/share/archiso/ rm -rf $(DESTDIR)/usr/share/doc/archiso/ diff --git a/archiso/hooks/nbd b/archiso/hooks/archiso_pxe_nbd similarity index 100% rename from archiso/hooks/nbd rename to archiso/hooks/archiso_pxe_nbd diff --git a/archiso/install/nbd b/archiso/install/archiso_pxe_nbd similarity index 91% rename from archiso/install/nbd rename to archiso/install/archiso_pxe_nbd index bff232b..4bebd15 100644 --- a/archiso/install/nbd +++ b/archiso/install/archiso_pxe_nbd @@ -6,7 +6,7 @@ install () BINARIES="" FILES="" - SCRIPT="nbd" + SCRIPT="archiso_pxe_nbd" add_binary "/usr/sbin/nbd-client" "/bin/nbd-client" add_binary "/lib/initcpio/ipconfig" "/bin/ipconfig" diff --git a/configs/syslinux-iso/mkinitcpio.conf b/configs/syslinux-iso/mkinitcpio.conf index 3ff159b..1f61638 100644 --- a/configs/syslinux-iso/mkinitcpio.conf +++ b/configs/syslinux-iso/mkinitcpio.conf @@ -2,5 +2,5 @@ MODULES="" BINARIES="" FILES="" -HOOKS="base udev nbd archiso pata scsi sata usb fw pcmcia filesystems usbinput" +HOOKS="base udev archiso_pxe_nbd archiso pata scsi sata usb fw pcmcia filesystems usbinput" COMPRESSION="lzma"