Merge lp:~xnox/ubuntu/trusty/initramfs-tools-ubuntu-touch/missing-mkdir into lp:ubuntu/trusty/initramfs-tools-ubuntu-touch

Proposed by Dimitri John Ledkov
Status: Merged
Approved by: Oliver Grawert
Approved revision: 57
Merge reported by: Oliver Grawert
Merged at revision: not available
Proposed branch: lp:~xnox/ubuntu/trusty/initramfs-tools-ubuntu-touch/missing-mkdir
Merge into: lp:ubuntu/trusty/initramfs-tools-ubuntu-touch
Diff against target: 32 lines (+14/-0)
2 files modified
debian/changelog (+7/-0)
scripts/touch (+7/-0)
To merge this branch: bzr merge lp:~xnox/ubuntu/trusty/initramfs-tools-ubuntu-touch/missing-mkdir
Reviewer Review Type Date Requested Status
Oliver Grawert Pending
Ubuntu branches Pending
Review via email: mp+192544@code.launchpad.net
To post a comment you must log in.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-10-11 13:01:15 +0000
3+++ debian/changelog 2013-10-24 17:04:48 +0000
4@@ -1,3 +1,10 @@
5+initramfs-tools-ubuntu-touch (0.58) UNRELEASED; urgency=low
6+
7+ * Create ${rootmnt}/android directory before mounting.
8+ * Mount ${rootmnt}/system for the emulator.
9+
10+ -- Dmitrijs Ledkovs <dmitrij.ledkov@ubuntu.com> Tue, 08 Oct 2013 10:04:58 +0100
11+
12 initramfs-tools-ubuntu-touch (0.57) saucy; urgency=low
13
14 * Don't run fsck on the phone since we don't have plymouth and so
15
16=== modified file 'scripts/touch'
17--- scripts/touch 2013-10-11 13:01:15 +0000
18+++ scripts/touch 2013-10-24 17:04:48 +0000
19@@ -109,7 +109,14 @@
20 [ -z "$device" ] && device="unknown"
21 echo "initrd: device is $device" >/dev/kmsg || true
22
23+ # Mount /system for the emulator
24+ if [ "$device" = "generic" ]; then
25+ mkdir -p ${rootmnt}/system
26+ mount /dev/mtdblock0 ${rootmnt}/system
27+ fi
28+
29 # Mount some tmpfs
30+ mkdir -p ${rootmnt}/android
31 mount -o rw,size=4096 -t tmpfs none ${rootmnt}/android
32 mount -o rw,nosuid,noexec,relatime,mode=755 -t tmpfs tmpfs ${rootmnt}/run
33

Subscribers

People subscribed via source and target branches