* Re: [PATCH] initrd: add recovery feature
2012-11-12 19:51 [PATCH] initrd: add recovery feature Radu Moisan
@ 2012-11-12 19:48 ` Radu Moisan
0 siblings, 0 replies; 5+ messages in thread
From: Radu Moisan @ 2012-11-12 19:48 UTC (permalink / raw)
To: poky
Ops, wrong address, resending on openembedded-core@lists.openembedded.org
Radu
On 11/12/2012 09:51 PM, Radu Moisan wrote:
> Allows you to use as root a partition instead of the rootfs.img
> for recovering an old install, and fails safe when no rootfs is
> found, dropping the user to a shell if something goes wrong.
>
> Signed-off-by: Radu Moisan <radu.moisan@intel.com>
> Signed-off-by: Alexandru Damian <alexandru.damian@intel.com>
> ---
> meta/recipes-core/initrdscripts/files/init-live.sh | 44 +++++++++++++++++++-
> 1 file changed, 42 insertions(+), 2 deletions(-)
>
> diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
> index 5682fd1..0ef30ea 100644
> --- a/meta/recipes-core/initrdscripts/files/init-live.sh
> +++ b/meta/recipes-core/initrdscripts/files/init-live.sh
> @@ -68,13 +68,49 @@ fatal() {
>
> early_setup
>
> +# wait for the udevd to settle
> +echo "Waiting for udev to settle..."
> +sleep 3
> +
> [ -z "$CONSOLE" ] && CONSOLE="/dev/console"
>
> read_args
>
> -echo "Waiting for removable media..."
> -while true
> +# boot partiton menu, if one or more bootable partitions exist
> +BOOTMENU=`ls /media/sd*/sbin/init 2>/dev/null | wc -l`
> +if [ $BOOTMENU -gt 0 ]; then
> + choice=0
> + while [ $choice -le 0 ]; do
> + echo "1). boot live ramfs image"
> + count=2
> + for i in `ls /media/sd*/sbin/init 2>/dev/null | cut -d "/" -f 3`; do
> + echo $count"). boot /dev/"$i
> + choicecmd[$count]=$i
> + count=$(( count + 1))
> + done
> + echo
> + echo -n "Your choice: "
> + read choice
> + done
> +
> + if [ $choice -gt 1 ]; then
> + #ROOT_MOUNT=/media/${choicecmd[${choice}]}
> + ROOT_MOUNT=none #testing
> + echo "Booting local root ... $ROOT_MOUNT"
> + if [ -d $ROOT_MOUNT ]; then
> + boot_live_root
> + else
> + fatal "Rootfs partition not mounted"
> + fi
> + fi
> +fi
> +
> +echo -n "Waiting for removable media... "
> +CNT=0
> +while [ $CNT -le 3 ];
> do
> + echo -n "$CNT "
> + CNT=$(( $CNT + 1 ))
> for i in `ls /media 2>/dev/null`; do
> if [ -f /media/$i/$ROOT_IMAGE ] ; then
> found="yes"
> @@ -91,6 +127,10 @@ do
> sleep 1
> done
>
> +if [ "$found" != "yes" ]; then
> + fatal "...could not mount removable media, drop to shell"
> +fi
> +
> case $label in
> boot)
> mkdir $ROOT_MOUNT
^ permalink raw reply [flat|nested] 5+ messages in thread
* [PATCH] initrd: add recovery feature
@ 2012-11-12 19:51 Radu Moisan
2012-11-12 19:48 ` Radu Moisan
0 siblings, 1 reply; 5+ messages in thread
From: Radu Moisan @ 2012-11-12 19:51 UTC (permalink / raw)
To: poky; +Cc: Alexandru Damian
Allows you to use as root a partition instead of the rootfs.img
for recovering an old install, and fails safe when no rootfs is
found, dropping the user to a shell if something goes wrong.
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Alexandru Damian <alexandru.damian@intel.com>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 44 +++++++++++++++++++-
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 5682fd1..0ef30ea 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -68,13 +68,49 @@ fatal() {
early_setup
+# wait for the udevd to settle
+echo "Waiting for udev to settle..."
+sleep 3
+
[ -z "$CONSOLE" ] && CONSOLE="/dev/console"
read_args
-echo "Waiting for removable media..."
-while true
+# boot partiton menu, if one or more bootable partitions exist
+BOOTMENU=`ls /media/sd*/sbin/init 2>/dev/null | wc -l`
+if [ $BOOTMENU -gt 0 ]; then
+ choice=0
+ while [ $choice -le 0 ]; do
+ echo "1). boot live ramfs image"
+ count=2
+ for i in `ls /media/sd*/sbin/init 2>/dev/null | cut -d "/" -f 3`; do
+ echo $count"). boot /dev/"$i
+ choicecmd[$count]=$i
+ count=$(( count + 1))
+ done
+ echo
+ echo -n "Your choice: "
+ read choice
+ done
+
+ if [ $choice -gt 1 ]; then
+ #ROOT_MOUNT=/media/${choicecmd[${choice}]}
+ ROOT_MOUNT=none #testing
+ echo "Booting local root ... $ROOT_MOUNT"
+ if [ -d $ROOT_MOUNT ]; then
+ boot_live_root
+ else
+ fatal "Rootfs partition not mounted"
+ fi
+ fi
+fi
+
+echo -n "Waiting for removable media... "
+CNT=0
+while [ $CNT -le 3 ];
do
+ echo -n "$CNT "
+ CNT=$(( $CNT + 1 ))
for i in `ls /media 2>/dev/null`; do
if [ -f /media/$i/$ROOT_IMAGE ] ; then
found="yes"
@@ -91,6 +127,10 @@ do
sleep 1
done
+if [ "$found" != "yes" ]; then
+ fatal "...could not mount removable media, drop to shell"
+fi
+
case $label in
boot)
mkdir $ROOT_MOUNT
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH] initrd: add recovery feature
@ 2012-11-12 19:52 Radu Moisan
2012-11-13 16:36 ` Burton, Ross
2012-11-13 16:42 ` Otavio Salvador
0 siblings, 2 replies; 5+ messages in thread
From: Radu Moisan @ 2012-11-12 19:52 UTC (permalink / raw)
To: openembedded-core; +Cc: Alexandru Damian
Allows you to use as root a partition instead of the rootfs.img
for recovering an old install, and fails safe when no rootfs is
found, dropping the user to a shell if something goes wrong.
Signed-off-by: Radu Moisan <radu.moisan@intel.com>
Signed-off-by: Alexandru Damian <alexandru.damian@intel.com>
---
meta/recipes-core/initrdscripts/files/init-live.sh | 44 +++++++++++++++++++-
1 file changed, 42 insertions(+), 2 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 5682fd1..0ef30ea 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -68,13 +68,49 @@ fatal() {
early_setup
+# wait for the udevd to settle
+echo "Waiting for udev to settle..."
+sleep 3
+
[ -z "$CONSOLE" ] && CONSOLE="/dev/console"
read_args
-echo "Waiting for removable media..."
-while true
+# boot partiton menu, if one or more bootable partitions exist
+BOOTMENU=`ls /media/sd*/sbin/init 2>/dev/null | wc -l`
+if [ $BOOTMENU -gt 0 ]; then
+ choice=0
+ while [ $choice -le 0 ]; do
+ echo "1). boot live ramfs image"
+ count=2
+ for i in `ls /media/sd*/sbin/init 2>/dev/null | cut -d "/" -f 3`; do
+ echo $count"). boot /dev/"$i
+ choicecmd[$count]=$i
+ count=$(( count + 1))
+ done
+ echo
+ echo -n "Your choice: "
+ read choice
+ done
+
+ if [ $choice -gt 1 ]; then
+ #ROOT_MOUNT=/media/${choicecmd[${choice}]}
+ ROOT_MOUNT=none #testing
+ echo "Booting local root ... $ROOT_MOUNT"
+ if [ -d $ROOT_MOUNT ]; then
+ boot_live_root
+ else
+ fatal "Rootfs partition not mounted"
+ fi
+ fi
+fi
+
+echo -n "Waiting for removable media... "
+CNT=0
+while [ $CNT -le 3 ];
do
+ echo -n "$CNT "
+ CNT=$(( $CNT + 1 ))
for i in `ls /media 2>/dev/null`; do
if [ -f /media/$i/$ROOT_IMAGE ] ; then
found="yes"
@@ -91,6 +127,10 @@ do
sleep 1
done
+if [ "$found" != "yes" ]; then
+ fatal "...could not mount removable media, drop to shell"
+fi
+
case $label in
boot)
mkdir $ROOT_MOUNT
--
1.7.9.5
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH] initrd: add recovery feature
2012-11-12 19:52 Radu Moisan
@ 2012-11-13 16:36 ` Burton, Ross
2012-11-13 16:42 ` Otavio Salvador
1 sibling, 0 replies; 5+ messages in thread
From: Burton, Ross @ 2012-11-13 16:36 UTC (permalink / raw)
To: Radu Moisan; +Cc: Alexandru Damian, openembedded-core
On 12 November 2012 19:52, Radu Moisan <radu.moisan@intel.com> wrote:
> +# wait for the udevd to settle
> +echo "Waiting for udev to settle..."
> +sleep 3
Pasting from Otavio in the other thread for this patch just to make
sure it doesn't get lost:
> This doesn't work for all machines as the time need depends on the machine
> performance and the number of devices connected.
> You can use the trigger --settle in udevadm.
Ross
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] initrd: add recovery feature
2012-11-12 19:52 Radu Moisan
2012-11-13 16:36 ` Burton, Ross
@ 2012-11-13 16:42 ` Otavio Salvador
1 sibling, 0 replies; 5+ messages in thread
From: Otavio Salvador @ 2012-11-13 16:42 UTC (permalink / raw)
To: Radu Moisan; +Cc: Alexandru Damian, openembedded-core
[-- Attachment #1: Type: text/plain, Size: 876 bytes --]
On Mon, Nov 12, 2012 at 5:52 PM, Radu Moisan <radu.moisan@intel.com> wrote:
> Allows you to use as root a partition instead of the rootfs.img
> for recovering an old install, and fails safe when no rootfs is
> found, dropping the user to a shell if something goes wrong.
>
> Signed-off-by: Radu Moisan <radu.moisan@intel.com>
> Signed-off-by: Alexandru Damian <alexandru.damian@intel.com>
> +++ b/meta/recipes-core/initrdscripts/files/init-live.sh
> @@ -68,13 +68,49 @@ fatal() {
>
> early_setup
>
> +# wait for the udevd to settle
> +echo "Waiting for udev to settle..."
> +sleep 3
>
Use udevadm with settle. So it use the minimal amount of time for it.
--
Otavio Salvador O.S. Systems
E-mail: otavio@ossystems.com.br http://www.ossystems.com.br
Mobile: +55 53 9981-7854 http://projetos.ossystems.com.br
[-- Attachment #2: Type: text/html, Size: 1479 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2012-11-13 16:56 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-11-12 19:51 [PATCH] initrd: add recovery feature Radu Moisan
2012-11-12 19:48 ` Radu Moisan
-- strict thread matches above, loose matches on Subject: below --
2012-11-12 19:52 Radu Moisan
2012-11-13 16:36 ` Burton, Ross
2012-11-13 16:42 ` Otavio Salvador
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.