From 941236d2e4d489622ce88f9328023b34bacd0a60 Mon Sep 17 00:00:00 2001 From: Robert Nelson Date: Sat, 4 Feb 2012 09:10:09 -0600 Subject: [PATCH] bug: make sure /lib/firmware actually there Signed-off-by: Robert Nelson --- scripts/debian-tweaks.diff | 6 ++++-- scripts/ubuntu-tweaks.diff | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/scripts/debian-tweaks.diff b/scripts/debian-tweaks.diff index 1d907ab..56505c5 100644 --- a/scripts/debian-tweaks.diff +++ b/scripts/debian-tweaks.diff @@ -3,7 +3,7 @@ new file mode 100755 index 0000000..6d06fc7 --- /dev/null +++ b/usr/lib/finish-install.d/08rcn-omap -@@ -0,0 +1,34 @@ +@@ -0,0 +1,36 @@ +#!/bin/sh -e +cp /etc/e2fsck.conf /target/etc/e2fsck.conf +cp /etc/finish-install.sh /target/etc/finish-install.sh @@ -22,7 +22,9 @@ index 0000000..6d06fc7 + cat /target/etc/inittab | grep SERIAL || echo "S:2345:respawn:/sbin/getty 115200 SERIAL" >> /target/etc/inittab + fi + -+ cp -r /lib/firmware/ /target/lib/ || true ++ if [ -d /lib/firmware/ ] ; then ++ cp -r /lib/firmware/ /target/lib/ || true ++ fi + + rm -f /etc/rcn.conf + diff --git a/scripts/ubuntu-tweaks.diff b/scripts/ubuntu-tweaks.diff index 7aab870..8cd480b 100644 --- a/scripts/ubuntu-tweaks.diff +++ b/scripts/ubuntu-tweaks.diff @@ -3,7 +3,7 @@ new file mode 100755 index 0000000..6d06fc7 --- /dev/null +++ b/usr/lib/finish-install.d/08rcn-omap -@@ -0,0 +1,31 @@ +@@ -0,0 +1,33 @@ +#!/bin/sh -e +cp /etc/flash-kernel.conf /target/etc/flash-kernel.conf +cp /etc/SERIAL.conf /target/etc/init/SERIAL.conf @@ -19,7 +19,9 @@ index 0000000..6d06fc7 + #smsc95xx kevent workaround/hack + echo "vm.min_free_kbytes = 8192" >> /target/etc/sysctl.conf + -+ cp -r /lib/firmware/ /target/lib/ || true ++ if [ -d /lib/firmware/ ] ; then ++ cp -r /lib/firmware/ /target/lib/ || true ++ fi + + rm -f /etc/rcn.conf +