Author: glen
Date: Mon Nov 10 02:04:20 2008
New Revision: 9975
Modified:
geninitrd/trunk/geninitrd
Log:
- use inst_exec when installing executables
Modified: geninitrd/trunk/geninitrd
==============================================================================
--- geninitrd/trunk/geninitrd (original)
+++ geninitrd/trunk/geninitrd Mon Nov 10 02:04:20 2008
@@ -1057,9 +1057,9 @@
inst /etc/suspend.conf /etc/suspend.conf
if [ -x /usr/${_lib}/suspend/resume ]; then
- inst /usr/${_lib}/suspend/resume /bin/resume
+ inst_exec /usr/${_lib}/suspend/resume /bin/resume
else
- inst /usr/sbin/resume /bin/resume
+ inst_exec /usr/sbin/resume /bin/resume
fi
add_linuxrc <<-'EOF'
@@ -1108,7 +1108,7 @@
die "/sbin/initrd-udevd not present"
fi
- inst /sbin/initrd-udevd /sbin/udevd
+ inst_exec /sbin/initrd-udevd /sbin/udevd
inst /etc/udev/udev.conf /etc/udev/udev.conf
mount_dev
@@ -1118,7 +1118,7 @@
/sbin/udevd --daemon
EOF
- inst /sbin/initrd-udevadm /sbin/udevadm
+ inst_exec /sbin/initrd-udevadm /sbin/udevadm
ln -s udevadm $DESTDIR/sbin/udevsettle
ln -s udevadm $DESTDIR/sbin/udevtrigger
add_linuxrc <<-'EOF'
@@ -1184,7 +1184,7 @@
fi
inst_d /sbin
- inst /sbin/dmraid-initrd /sbin/dmraid
+ inst_exec /sbin/dmraid-initrd /sbin/dmraid
mount_dev
mount_sys
@@ -1338,7 +1338,7 @@
die "/sbin/mdadm or /sbin/initrd-mdassemble is missing!"
fi
- inst /sbin/initrd-mdassemble /bin/mdassemble
+ inst_exec /sbin/initrd-mdassemble /bin/mdassemble
# LVM on RAID case
dev_list_extra=$(awk '/^DEVICE / { for (i=2; i<=NF; i++) { printf "%s
", $i; }; } ' /etc/mdadm.conf | xargs)
@@ -1438,7 +1438,7 @@
initrd_gen_lvm() {
debug "Adding LVM support to initrd"
inst_d /tmp /newroot
- inst /sbin/initrd-lvm /bin/lvm.static
+ inst_exec /sbin/initrd-lvm /bin/lvm.static
# always make /dev on tmpfs for LVM2
if [ "$LVMTOOLSVERSION" = "2" ]; then
@@ -1564,7 +1564,7 @@
initrd_gen_blkid()
{
debug "Adding BLKID support to initrd"
- inst /sbin/initrd-blkid /bin/blkid
+ inst_exec /sbin/initrd-blkid /bin/blkid
initrd_gen_devices
add_linuxrc <<-'EOF'
# if built with blkid change ROOT=LABEL=something into
ROOT=/dev/somethingelse -
@@ -1956,12 +1956,12 @@
mknod "$DESTDIR/dev/null" c 1 3
mknod "$DESTDIR/dev/zero" c 1 5
-inst /bin/initrd-busybox /bin/initrd-busybox
+inst_exec /bin/initrd-busybox /bin/initrd-busybox
ln -s initrd-busybox $DESTDIR/bin/sh
ln -s initrd-busybox $DESTDIR/bin/busybox # for older busyboxes who had
/bin/busybox as EXEPATH
if is_yes "$USEINSMODSTATIC"; then
- inst "$INSMOD" /bin/insmod.static
+ inst_exec "$INSMOD" /bin/insmod.static
fi
add_linuxrc <<EOF
_______________________________________________
pld-cvs-commit mailing list
[email protected]
http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
