cleanup: move /etc/finish-install.sh to /usr/bin/finish-install.sh

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/22/head
Robert Nelson 12 years ago
parent 9b0f1fb81a
commit 983ff2a30b

@ -921,8 +921,8 @@ function flash_kernel_base_installer {
function finish_installing_device { function finish_installing_device {
cat > ${TEMPDIR}/initrd-tree/usr/lib/finish-install.d/08rcn-ee-finish-installing-device <<-__EOF__ cat > ${TEMPDIR}/initrd-tree/usr/lib/finish-install.d/08rcn-ee-finish-installing-device <<-__EOF__
#!/bin/sh -e #!/bin/sh -e
cp /etc/finish-install.sh /target/etc/finish-install.sh cp /usr/bin/finish-install.sh /target/usr/bin/finish-install.sh
chmod a+x /target/etc/finish-install.sh chmod a+x /target/usr/bin/finish-install.sh
if [ -f /etc/rcn.conf ]; then if [ -f /etc/rcn.conf ]; then
mkdir -p /target/boot/uboot || true mkdir -p /target/boot/uboot || true
@ -940,7 +940,7 @@ function finish_installing_device {
mkdir -p /target/etc/hwpack/ mkdir -p /target/etc/hwpack/
cp /etc/hwpack/SOC.sh /target/etc/hwpack/ cp /etc/hwpack/SOC.sh /target/etc/hwpack/
chroot /target /bin/bash /etc/finish-install.sh chroot /target /bin/bash /usr/bin/finish-install.sh
rm -f /target/mounts || true rm -f /target/mounts || true
@ -952,6 +952,8 @@ function finish_installing_device {
umount /target/boot/uboot umount /target/boot/uboot
fi fi
rm -rf /target/usr/bin/finish-install.sh || true
__EOF__ __EOF__
chmod a+x ${TEMPDIR}/initrd-tree/usr/lib/finish-install.d/08rcn-ee-finish-installing-device chmod a+x ${TEMPDIR}/initrd-tree/usr/lib/finish-install.d/08rcn-ee-finish-installing-device
@ -979,12 +981,12 @@ function initrd_preseed_settings {
cd ${TEMPDIR}/initrd-tree/ cd ${TEMPDIR}/initrd-tree/
case "${DIST}" in case "${DIST}" in
oneiric|precise|quantal|raring) oneiric|precise|quantal|raring)
cp -v "${DIR}/lib/ubuntu-finish.sh" ${TEMPDIR}/initrd-tree/etc/finish-install.sh cp -v "${DIR}/lib/ubuntu-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
flash_kernel flash_kernel
flash_kernel_base_installer flash_kernel_base_installer
;; ;;
squeeze|wheezy) squeeze|wheezy)
cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/etc/finish-install.sh cp -v "${DIR}/lib/debian-finish.sh" ${TEMPDIR}/initrd-tree/usr/bin/finish-install.sh
;; ;;
esac esac

Loading…
Cancel
Save