mk_mmc.sh: drop the rcn.conf tag

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
pull/37/head
Robert Nelson 11 years ago
parent decb2eb439
commit 16e95cd0f5

@ -704,65 +704,61 @@ finish_installing_device () {
cp /usr/bin/finish-install.sh /target/usr/bin/finish-install.sh cp /usr/bin/finish-install.sh /target/usr/bin/finish-install.sh
chmod a+x /target/usr/bin/finish-install.sh chmod a+x /target/usr/bin/finish-install.sh
if [ -f /etc/rcn.conf ]; then mkdir -p /target/boot/uboot || true
mkdir -p /target/boot/uboot || true
#Some devices may have mmc cards in both slots...
#Some devices may have mmc cards in both slots... unset got_boot_drive
unset got_boot_drive
if [ ! \${got_boot_drive} ] ; then
if [ ! \${got_boot_drive} ] ; then if [ -b /dev/mmcblk0p1 ] ; then
if [ -b /dev/mmcblk0p1 ] ; then mount /dev/mmcblk0p1 /target/boot/uboot
mount /dev/mmcblk0p1 /target/boot/uboot if [ -f /target/boot/uboot/SOC.sh ] ; then
if [ -f /target/boot/uboot/SOC.sh ] ; then got_boot_drive=1
got_boot_drive=1 echo "/dev/mmcblk0" > /target/boot/uboot/bootdrive
echo "/dev/mmcblk0" > /target/boot/uboot/bootdrive else
else umount /target/boot/uboot
umount /target/boot/uboot
fi
fi fi
fi fi
fi
if [ ! \${got_boot_drive} ] ; then if [ ! \${got_boot_drive} ] ; then
if [ -b /dev/mmcblk1p1 ] ; then if [ -b /dev/mmcblk1p1 ] ; then
mount /dev/mmcblk1p1 /target/boot/uboot mount /dev/mmcblk1p1 /target/boot/uboot
if [ -f /target/boot/uboot/SOC.sh ] ; then if [ -f /target/boot/uboot/SOC.sh ] ; then
got_boot_drive=1 got_boot_drive=1
echo "/dev/mmcblk1" > /target/boot/uboot/bootdrive echo "/dev/mmcblk1" > /target/boot/uboot/bootdrive
else else
umount /target/boot/uboot umount /target/boot/uboot
fi
fi fi
fi fi
fi
if [ -d /lib/firmware/ ] ; then if [ -d /lib/firmware/ ] ; then
cp -rf /lib/firmware/ /target/lib/ || true cp -rf /lib/firmware/ /target/lib/ || true
fi fi
rm -f /etc/rcn.conf
mount -o bind /sys /target/sys mount -o bind /sys /target/sys
#Needed by finish-install.sh to determine root file system location #Needed by finish-install.sh to determine root file system location
cat /proc/mounts > /target/boot/uboot/mounts cat /proc/mounts > /target/boot/uboot/mounts
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/
cp /etc/hwpack/SOC.sh /target/boot/ cp /etc/hwpack/SOC.sh /target/boot/
chroot /target /bin/bash /usr/bin/finish-install.sh chroot /target /bin/bash /usr/bin/finish-install.sh
cp /zz-uenv_txt /target/etc/kernel/postinst.d/ cp /zz-uenv_txt /target/etc/kernel/postinst.d/
chmod +x /target/etc/kernel/postinst.d/zz-uenv_txt chmod +x /target/etc/kernel/postinst.d/zz-uenv_txt
rm -f /target/mounts || true rm -f /target/mounts || true
cat /proc/mounts > /target/boot/uboot/backup/proc_mounts cat /proc/mounts > /target/boot/uboot/backup/proc_mounts
cat /var/log/syslog > /target/boot/uboot/backup/syslog.log cat /var/log/syslog > /target/boot/uboot/backup/syslog.log
umount /target/sys umount /target/sys
sync sync
umount /target/boot/uboot umount /target/boot/uboot
fi
rm -rf /target/usr/bin/finish-install.sh || true rm -rf /target/usr/bin/finish-install.sh || true
@ -870,8 +866,6 @@ generate_soc () {
initrd_device_settings () { initrd_device_settings () {
echo "NetInstall: Adding Device Tweaks" echo "NetInstall: Adding Device Tweaks"
#FIXME: shouldn't be needed to run once anymore...
touch ${TEMPDIR}/initrd-tree/etc/rcn.conf
#work around for the kevent smsc95xx issue #work around for the kevent smsc95xx issue
touch ${TEMPDIR}/initrd-tree/etc/sysctl.conf touch ${TEMPDIR}/initrd-tree/etc/sysctl.conf

Loading…
Cancel
Save