From: Samuel Ortiz <sameo@openedhand.com>
Date: Wed, 8 Oct 2008 14:31:12 +0000 (+0000)
Subject: poky-image-netbook: Add installation script
X-Git-Tag: 2011-1~8067
X-Git-Url: https://code.ossystems.io/gitweb?a=commitdiff_plain;h=460d93416d2f0dba887ffe83d781d7bf05da0017;p=openembedded-core.git

poky-image-netbook: Add installation script

By typing "install" from the syslinux prompt, you should boot into the
netbook image installation script. That will install the netbook image
in your selected hard drive.
By default, the netbook-live image will continue booting the live
image.



git-svn-id: https://svn.o-hand.com/repos/poky/trunk@5456 311d38ba-8fff-0310-9ca6-ca027cbcb966
---

diff --git a/meta/packages/images/poky-image-live.inc b/meta/packages/images/poky-image-live.inc
index 637d9e29cc..7f8dd8fba5 100644
--- a/meta/packages/images/poky-image-live.inc
+++ b/meta/packages/images/poky-image-live.inc
@@ -1,7 +1,7 @@
 AUTO_SYSLINUXCFG = "1"
 INITRD = "${DEPLOY_DIR_IMAGE}/poky-image-minimal-initramfs-${MACHINE}.cpio.gz"
-LABELS = "poky"
 APPEND += "root=/dev/ram0 "
+TIMEOUT = "10"
 
 EXCLUDE_FROM_WORLD = "1"
 
diff --git a/meta/packages/images/poky-image-minimal-initramfs.bb b/meta/packages/images/poky-image-minimal-initramfs.bb
index d0f0ff1cd6..b2824a7d61 100644
--- a/meta/packages/images/poky-image-minimal-initramfs.bb
+++ b/meta/packages/images/poky-image-minimal-initramfs.bb
@@ -1,6 +1,6 @@
-# Sample initramfs image, very minimal
+# Simple initramfs image. Mostly used for live images.
 
-IMAGE_INSTALL = "initramfs-live-boot busybox udev"
+IMAGE_INSTALL = "initramfs-live-boot initramfs-live-install busybox udev"
 
 export IMAGE_BASENAME = "poky-image-minimal-initramfs"
 IMAGE_LINGUAS = ""
diff --git a/meta/packages/images/poky-image-netbook-install.bb b/meta/packages/images/poky-image-netbook-install.bb
new file mode 100644
index 0000000000..ac7dc63e2b
--- /dev/null
+++ b/meta/packages/images/poky-image-netbook-install.bb
@@ -0,0 +1,9 @@
+DESCRIPTION = "Netbook Bootable Live Image"
+
+require poky-image-live.inc
+
+LABELS += "install"
+
+ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
+
+do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/images/poky-image-netbook-live.bb b/meta/packages/images/poky-image-netbook-live.bb
index 4a03015b79..a3bfbfc71f 100644
--- a/meta/packages/images/poky-image-netbook-live.bb
+++ b/meta/packages/images/poky-image-netbook-live.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Netbook Bootable Live Image"
 
 require poky-image-live.inc
 
+LABELS += "boot install"
+
 ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-netbook-${MACHINE}.ext3"
-TIMEOUT = "3"
 
 do_bootimg[depends] += "poky-image-netbook:do_rootfs"
diff --git a/meta/packages/images/poky-image-sato-live.bb b/meta/packages/images/poky-image-sato-live.bb
index e2cc2c209f..9b686e812c 100644
--- a/meta/packages/images/poky-image-sato-live.bb
+++ b/meta/packages/images/poky-image-sato-live.bb
@@ -2,7 +2,8 @@ DESCRIPTION = "Sato Bootable Live Image"
 
 require poky-image-live.inc
 
+LABELS += "boot install"
+
 ROOTFS = "${DEPLOY_DIR_IMAGE}/poky-image-sato-${MACHINE}.ext3"
-TIMEOUT = "3"
 
 do_bootimg[depends] += "poky-image-sato:do_rootfs"