Merge lp:~ahs3/eucalyptus-live/live-usb into lp:eucalyptus-live

Proposed by Al Stone
Status: Needs review
Proposed branch: lp:~ahs3/eucalyptus-live/live-usb
Merge into: lp:eucalyptus-live
Diff against target: 68 lines (+20/-6)
2 files modified
binary (+6/-6)
binary_local-hooks/20extract-initrd-uuid (+14/-0)
To merge this branch: bzr merge lp:~ahs3/eucalyptus-live/live-usb
Reviewer Review Type Date Requested Status
Registry Administrators Pending
Review via email: mp+54804@code.launchpad.net

Description of the change

Enable booting from a USB stick.

Change the binary file to create a usb-hdd type image instead of an ISO, and add a binary_local-hook to make the UUID for the livefs is written into the image so that initramfs can find it on boot.

NB: I have not tried using that on a CD. However, it does boot with KVM just fine (only one disk device is needed for the boot, too).

To post a comment you must log in.
Revision history for this message
Dustin Kirkland  (kirkland) wrote :

Al,

I've give you commit access to the OpenStack and Eucalyptus Live
branches. Feel free to commit as necessary.

Cheers,
:-Dustin

Unmerged revisions

17. By Al Stone

Enable booting from USB.

Cody provided the new script that ensures the UUID initrd needs to
find the livefs is in the image. The default maverick live-helper
does not do this even though it's required.

16. By Al Stone

remove files that keep firefox from starting up

15. By Al Stone

revert format to ISO image

14. By Al Stone

[merging] from lp:eucalyptus-live

13. By Al Stone

change from ISO to USB-HDD format

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'binary'
2--- binary 2010-11-16 19:14:09 +0000
3+++ binary 2011-03-25 00:46:23 +0000
4@@ -6,7 +6,7 @@
5
6 # $LH_BINARY_IMAGES: set image type
7 # (Default: iso)
8-LH_BINARY_IMAGES="iso"
9+LH_BINARY_IMAGES="usb-hdd"
10
11 # $LH_BINARY_INDICES: set apt/aptitude generic indices
12 # (Default: true)
13@@ -14,7 +14,7 @@
14
15 # $LH_BOOTAPPEND_LIVE: set boot parameters
16 # (Default: empty)
17-LH_BOOTAPPEND_LIVE="persistent noprompt LIVEMEDIA=/dev/sr0"
18+LH_BOOTAPPEND_LIVE="persistent noprompt"
19
20 # $LH_BOOTAPPEND_INSTALL: set boot parameters
21 # (Default: empty)
22@@ -63,19 +63,19 @@
23
24 # $LH_ISO_APPLICATION: set iso author
25 # (Default: Ubuntu Live)
26-LH_ISO_APPLICATION="Ubuntu Live"
27+LH_ISO_APPLICATION="UEC Cloud-on-a-Stick"
28
29 # $LH_ISO_PREPARER: set iso preparer
30 # (Default: live-helper 2.0~a21-1; http://packages.qa.debian.org/live-helper)
31-LH_ISO_PREPARER="live-helper 2.0~a21-1; http://packages.qa.debian.org/live-helper"
32+LH_ISO_PREPARER="Canonical OEM Server Team"
33
34 # $LH_ISO_PUBLISHER: set iso publisher
35 # (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org)
36-LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org"
37+LH_ISO_PUBLISHER="Canonical OEM Services"
38
39 # $LH_ISO_VOLUME: set iso volume (max 32 chars)
40 # (Default: Ubuntu maverick 20101110-10:49)
41-LH_ISO_VOLUME="Ubuntu maverick 20101110-10:49"
42+LH_ISO_VOLUME="Ubuntu Build $(date +%Y%m%d-%H:%M)"
43
44 # $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
45 # (Default: unset)
46
47=== added file 'binary_local-hooks/20extract-initrd-uuid'
48--- binary_local-hooks/20extract-initrd-uuid 1970-01-01 00:00:00 +0000
49+++ binary_local-hooks/20extract-initrd-uuid 2011-03-25 00:46:23 +0000
50@@ -0,0 +1,14 @@
51+#!/bin/bash
52+
53+mkdir -p uuid
54+cd uuid
55+zcat ../binary/casper/initrd.img | cpio --quiet -id conf/uuid.conf
56+if [ -e conf/uuid.conf ]
57+then
58+ echo "I: Found conf/uuid.conf in initrd... copying to '.disk/casper-uuid'."
59+ cp conf/uuid.conf ../binary/.disk/casper-uuid
60+else
61+ echo "W: conf/uuid.conf was not found in the initrd."
62+fi
63+cd ..
64+rm -rf uuid
65
66=== removed file 'chroot_local-includes/home/ubuntu/.mozilla/firefox/kngggoty.default/.parentlock'
67=== removed symlink 'chroot_local-includes/home/ubuntu/.mozilla/firefox/kngggoty.default/lock'
68=== target was u'127.0.1.1:+4678'

Subscribers

People subscribed via source and target branches