aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Zanussi <tom.zanussi@intel.com>2011-02-10 01:58:14 -0600
committerTom Zanussi <tom.zanussi@intel.com>2011-02-10 01:58:14 -0600
commite8abba6e66d9e0936a688bd985bc93b824b24543 (patch)
treec626125accb1007fdc5f0b61bfe2c28c8fd627fc
parentd4ec0c2e8c52f0e5e30ff04e214cb7ec383b6c9d (diff)
downloadmeta-intel-e8abba6e66d9e0936a688bd985bc93b824b24543.tar.gz
meta-intel-e8abba6e66d9e0936a688bd985bc93b824b24543.tar.bz2
meta-intel-e8abba6e66d9e0936a688bd985bc93b824b24543.zip
meta-crownbay: apply init-live.sh coldplug udev trigger patch here instead
At the moment, we can't spin a new laverne release, so we need to add it to the crownbay layer instead. Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
-rw-r--r--meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot/0001-init-live.sh-add-coldplug-udev-trigger.patch44
-rw-r--r--meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot_1.0.bbappend6
2 files changed, 50 insertions, 0 deletions
diff --git a/meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot/0001-init-live.sh-add-coldplug-udev-trigger.patch b/meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot/0001-init-live.sh-add-coldplug-udev-trigger.patch
new file mode 100644
index 00000000..5119b3f8
--- /dev/null
+++ b/meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot/0001-init-live.sh-add-coldplug-udev-trigger.patch
@@ -0,0 +1,44 @@
+From 0b8fcb95dd4209d56e150d0b20133e728b22776c Mon Sep 17 00:00:00 2001
+From: Tom Zanussi <tom.zanussi@intel.com>
+Date: Mon, 7 Feb 2011 13:45:45 -0600
+Subject: [PATCH 1/2] init-live.sh: add 'coldplug' udev trigger
+
+Fixes [BUGID #693]
+
+The init-live.sh script starts udevd in init-live.sh:early_setup(),
+but doesn't account for the possibility that the root device may have
+already been registered by the kernel before udevd starts up.
+
+If the device is detected after udevd starts up, everything's fine -
+udevd gets the 'add' uevent for the device, the root image shows up at
+e.g. /media/sda/rootfs.img, and the boot continues.
+
+If however the device is detected before udevd starts up, udevd misses
+the 'add' uevent and the root image never shows up, causing it to stay
+in the 'waiting for removable media' loop forever.
+
+The 'udevadm trigger' command is meant to be used to avoid this
+situation, but init-live.sh doesn't use it. Furthermore, since the
+default was changed in udev 152 from 'add' to 'change', the command
+needs to explicity name 'add' as the action.
+
+Signed-off-by: Tom Zanussi <tom.zanussi@intel.com>
+---
+ meta/recipes-core/initrdscripts/files/init-live.sh | 1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
+index c96b1f4..f3e5145 100644
+--- a/init-live.sh
++++ b/init-live.sh
+@@ -11,6 +11,7 @@ early_setup() {
+ mount -t proc proc /proc
+ mount -t sysfs sysfs /sys
+ udevd --daemon
++ /sbin/udevadm trigger --action=add
+ }
+
+ read_args() {
+--
+1.7.0.4
+
diff --git a/meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot_1.0.bbappend b/meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot_1.0.bbappend
new file mode 100644
index 00000000..c5d929dd
--- /dev/null
+++ b/meta-crownbay/recipes-core/initrdscripts/initramfs-live-boot_1.0.bbappend
@@ -0,0 +1,6 @@
+FILESEXTRAPATHS := "${THISDIR}/${PN}"
+S = "${WORKDIR}"
+
+PR .= ".1"
+
+SRC_URI_append += " file://0001-init-live.sh-add-coldplug-udev-trigger.patch"