[arch-releng] [PATCH 02/12] [archiso] Avoid full path in add_binary
Gerardo Exequiel Pozzi
vmlinuz386 at yahoo.com.ar
Wed Feb 22 22:30:41 EST 2012
Signed-off-by: Gerardo Exequiel Pozzi <vmlinuz386 at yahoo.com.ar>
---
archiso/install/archiso | 8 ++++----
archiso/install/archiso_pxe_http | 2 +-
archiso/install/archiso_pxe_nbd | 3 ++-
3 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/archiso/install/archiso b/archiso/install/archiso
index db0fc3a..25eccea 100644
--- a/archiso/install/archiso
+++ b/archiso/install/archiso
@@ -6,10 +6,10 @@ build ()
FILES=""
add_binary /lib/udev/cdrom_id
- add_binary /sbin/blockdev
- add_binary /sbin/dmsetup
- add_binary /sbin/losetup
- add_binary /bin/mountpoint
+ add_binary blockdev
+ add_binary dmsetup
+ add_binary losetup
+ add_binary mountpoint
add_file /lib/udev/rules.d/60-cdrom_id.rules
add_file /lib/udev/rules.d/10-dm.rules
diff --git a/archiso/install/archiso_pxe_http b/archiso/install/archiso_pxe_http
index a636f3b..38a8ee5 100644
--- a/archiso/install/archiso_pxe_http
+++ b/archiso/install/archiso_pxe_http
@@ -7,7 +7,7 @@ build ()
FILES=""
SCRIPT="archiso_pxe_http"
- add_binary "/usr/bin/curl"
+ add_binary curl
}
help ()
diff --git a/archiso/install/archiso_pxe_nbd b/archiso/install/archiso_pxe_nbd
index 4227623..747e5b9 100644
--- a/archiso/install/archiso_pxe_nbd
+++ b/archiso/install/archiso_pxe_nbd
@@ -7,7 +7,8 @@ build ()
FILES=""
SCRIPT="archiso_pxe_nbd"
- add_binary "/usr/sbin/nbd-client" "/bin/nbd-client"
+ add_binary nbd-client
+
add_file "/lib/initcpio/archiso_pxe_nbd" "/archiso_pxe_nbd"
}
--
1.7.9.1
More information about the arch-releng
mailing list