Just a heads-up, actually I've submitted the wrong file in the first place :(<div><br></div><div><br></div><div>Alex</div><div class="gmail_extra"><br><br><div class="gmail_quote">On Fri, Nov 2, 2012 at 3:07 PM, Damian, Alexandru <span dir="ltr"><<a href="mailto:alexandru.damian@intel.com" target="_blank">alexandru.damian@intel.com</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">I submitted a new patch in a separate mail, with proper description.<br><br>Alex<div class="HOEnZb"><div class="h5"><br>
<div class="gmail_extra"><br><br><div class="gmail_quote">On Thu, Nov 1, 2012 at 9:31 PM, Richard Purdie <span dir="ltr"><<a href="mailto:richard.purdie@linuxfoundation.org" target="_blank">richard.purdie@linuxfoundation.org</a>></span> wrote:<br>
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">On Thu, 2012-11-01 at 16:32 +0200, Alex DAMIAN wrote:<br>
> From: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br>
<div>><br>
> udevd moved location and isn't in $PATH anymore, so use an absolute path to<br>
> start it.<br>
><br>
> The control socket path moved too, so mkdir the directory it's in.<br>
<br>
</div>This patch looks to do a little more than that...<br>
<br>
Cheers,<br>
<br>
Richard<br>
<div><br>
> Signed-off-by: Ross Burton <<a href="mailto:ross.burton@intel.com" target="_blank">ross.burton@intel.com</a>><br>
> ---<br>
</div>> meta/recipes-core/initrdscripts/files/init-live.sh | 50 +++++++++++++++++---<br>
> .../initrdscripts/initramfs-framework/udev | 6 +--<br>
> .../initrdscripts/<a href="http://initramfs-framework_1.0.bb" target="_blank">initramfs-framework_1.0.bb</a> | 2 +<br>
> .../initrdscripts/<a href="http://initramfs-live-boot_1.0.bb" target="_blank">initramfs-live-boot_1.0.bb</a> | 2 +-<br>
> 4 files changed, 50 insertions(+), 10 deletions(-)<br>
><br>
> diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh<br>
> index 5682fd1..fdea892 100644<br>
> --- a/meta/recipes-core/initrdscripts/files/init-live.sh<br>
> +++ b/meta/recipes-core/initrdscripts/files/init-live.sh<br>
> @@ -19,7 +19,8 @@ early_setup() {<br>
<div>> modprobe isofs 2> /dev/null<br>
><br>
> mkdir -p /run<br>
> - udevd --daemon<br>
</div>> + mkdir -p /var/run<br>
<div>> + /lib/udev/udevd --daemon<br>
> udevadm trigger --action=add<br>
> }<br>
><br>
</div>> @@ -68,13 +69,49 @@ fatal() {<br>
><br>
> early_setup<br>
><br>
> +# wait for the udevd to settle<br>
> +echo "Waiting for udev to settle..."<br>
> +sleep 3<br>
> +<br>
> [ -z "$CONSOLE" ] && CONSOLE="/dev/console"<br>
><br>
> read_args<br>
><br>
> -echo "Waiting for removable media..."<br>
> -while true<br>
> +# boot partiton menu, if one or more bootable partitions exist<br>
> +BOOTMENU=`ls /media/sd*/sbin/init 2>/dev/null | wc -l`<br>
> +if [ $BOOTMENU -gt 0 ]; then<br>
> + choice=0<br>
> + while [ $choice -le 0 ]; do<br>
> + echo "1). boot live ramfs image"<br>
> + count=2<br>
> + for i in `ls /media/sd*/sbin/init 2>/dev/null | cut -d "/" -f 3`; do<br>
> + echo $count"). boot /dev/"$i<br>
> + choicecmd[$count]=$i<br>
> + count=$(( count + 1))<br>
> + done<br>
> + echo<br>
> + echo -n "Your choice: "<br>
> + read choice<br>
> + done<br>
> +<br>
> + if [ $choice -gt 1 ]; then<br>
> + #ROOT_MOUNT=/media/${choicecmd[${choice}]}<br>
> + ROOT_MOUNT=none #testing<br>
> + echo "Booting local root ... $ROOT_MOUNT"<br>
> + if [ -d $ROOT_MOUNT ]; then<br>
> + boot_live_root<br>
> + else<br>
> + fatal "Rootfs partition not mounted"<br>
> + fi<br>
> + fi<br>
> +fi<br>
> +<br>
> +echo -n "Waiting for removable media... "<br>
> +CNT=0<br>
> +while [ $CNT -le 3 ];<br>
> do<br>
> + echo -n "$CNT "<br>
> + CNT=$(( $CNT + 1 ))<br>
> for i in `ls /media 2>/dev/null`; do<br>
> if [ -f /media/$i/$ROOT_IMAGE ] ; then<br>
> found="yes"<br>
> @@ -82,7 +119,7 @@ do<br>
> elif [ -f /media/$i/isolinux/$ROOT_IMAGE ]; then<br>
> found="yes"<br>
> ISOLINUX="isolinux"<br>
> - break<br>
> + break<br>
> fi<br>
> done<br>
> if [ "$found" = "yes" ]; then<br>
> @@ -90,13 +127,14 @@ do<br>
> fi<br>
> sleep 1<br>
> done<br>
> +if [ "$found" != "yes" ]; then<br>
> + fatal "...could not mount removable media, drop to shell"<br>
> +fi<br>
><br>
> case $label in<br>
> boot)<br>
> mkdir $ROOT_MOUNT<br>
> mknod /dev/loop0 b 7 0 2>/dev/null<br>
> -<br>
> -<br>
> if [ "$UNIONFS" = "yes" ]; then<br>
> mkdir /rootfs-tmp<br>
<div><div>><br>
> diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/udev b/meta/recipes-core/initrdscripts/initramfs-framework/udev<br>
> index 9ea8aa3..15a1d5b 100644<br>
> --- a/meta/recipes-core/initrdscripts/initramfs-framework/udev<br>
> +++ b/meta/recipes-core/initrdscripts/initramfs-framework/udev<br>
> @@ -3,8 +3,8 @@<br>
> # Licensed on MIT<br>
><br>
> udev_enabled() {<br>
> - if [ ! -e /sbin/udevd ]; then<br>
> - debug "/sbin/udev doesn't exist"<br>
> + if [ ! -e /lib/udev/udevd ]; then<br>
> + debug "/lib/udev/udev doesn't exist"<br>
> return 1<br>
> fi<br>
><br>
> @@ -14,7 +14,7 @@ udev_enabled() {<br>
> udev_run() {<br>
> mkdir -p /run<br>
><br>
> - udevd --daemon > /dev/null<br>
> + /lib/udev/udevd --daemon > /dev/null<br>
> udevadm trigger --action=add<br>
> udevadm settle<br>
><br>
> diff --git a/meta/recipes-core/initrdscripts/<a href="http://initramfs-framework_1.0.bb" target="_blank">initramfs-framework_1.0.bb</a> b/meta/recipes-core/initrdscripts/<a href="http://initramfs-framework_1.0.bb" target="_blank">initramfs-framework_1.0.bb</a><br>
> index 58e41d4..45d6592 100644<br>
> --- a/meta/recipes-core/initrdscripts/<a href="http://initramfs-framework_1.0.bb" target="_blank">initramfs-framework_1.0.bb</a><br>
> +++ b/meta/recipes-core/initrdscripts/<a href="http://initramfs-framework_1.0.bb" target="_blank">initramfs-framework_1.0.bb</a><br>
> @@ -3,6 +3,8 @@ LICENSE = "MIT"<br>
> LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"<br>
> RDEPENDS = "busybox"<br>
><br>
> +PR = "r1"<br>
> +<br>
> inherit allarch<br>
><br>
> SRC_URI = "file://init \<br>
> diff --git a/meta/recipes-core/initrdscripts/<a href="http://initramfs-live-boot_1.0.bb" target="_blank">initramfs-live-boot_1.0.bb</a> b/meta/recipes-core/initrdscripts/<a href="http://initramfs-live-boot_1.0.bb" target="_blank">initramfs-live-boot_1.0.bb</a><br>
> index 137a401..55a8600 100644<br>
> --- a/meta/recipes-core/initrdscripts/<a href="http://initramfs-live-boot_1.0.bb" target="_blank">initramfs-live-boot_1.0.bb</a><br>
> +++ b/meta/recipes-core/initrdscripts/<a href="http://initramfs-live-boot_1.0.bb" target="_blank">initramfs-live-boot_1.0.bb</a><br>
> @@ -5,7 +5,7 @@ RDEPENDS = "udev"<br>
> DEPENDS = "virtual/kernel"<br>
> SRC_URI = "file://init-live.sh"<br>
><br>
> -PR = "r10"<br>
> +PR = "r11"<br>
><br>
> do_compile() {<br>
> #if grep -q "CONFIG_UNION_FS=y" ${STAGING_KERNEL_DIR}/.config; then<br>
<br>
<br>
</div></div></blockquote></div><br></div>
</div></div></blockquote></div><br></div>