diff options
Diffstat (limited to 'meta/recipes-core/initrdscripts/initramfs-framework')
3 files changed, 11 insertions, 2 deletions
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/finish b/meta/recipes-core/initrdscripts/initramfs-framework/finish index 717383ebac..dee3ab3387 100755 --- a/meta/recipes-core/initrdscripts/initramfs-framework/finish +++ b/meta/recipes-core/initrdscripts/initramfs-framework/finish | |||
@@ -14,6 +14,15 @@ finish_run() { | |||
14 | 14 | ||
15 | info "Switching root to '$ROOTFS_DIR'..." | 15 | info "Switching root to '$ROOTFS_DIR'..." |
16 | 16 | ||
17 | debug "Moving basic mounts onto rootfs" | ||
18 | for dir in `awk '/\/dev.* \/run\/media/{print $2}' /proc/mounts`; do | ||
19 | # Parse any OCT or HEX encoded chars such as spaces | ||
20 | # in the mount points to actual ASCII chars | ||
21 | dir=`printf $dir` | ||
22 | mkdir -p "${ROOTFS_DIR}/media/${dir##*/}" | ||
23 | mount -n --move "$dir" "${ROOTFS_DIR}/media/${dir##*/}" | ||
24 | done | ||
25 | |||
17 | debug "Moving /dev, /proc and /sys onto rootfs..." | 26 | debug "Moving /dev, /proc and /sys onto rootfs..." |
18 | mount --move /dev $ROOTFS_DIR/dev | 27 | mount --move /dev $ROOTFS_DIR/dev |
19 | mount --move /proc $ROOTFS_DIR/proc | 28 | mount --move /proc $ROOTFS_DIR/proc |
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs index 748c9391c0..1d8a0ae66d 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/rootfs +++ b/meta/recipes-core/initrdscripts/initramfs-framework/rootfs | |||
@@ -67,8 +67,8 @@ rootfs_run() { | |||
67 | # It is unlikely to change, but keep trying anyway. | 67 | # It is unlikely to change, but keep trying anyway. |
68 | # Perhaps we pick a different device next time. | 68 | # Perhaps we pick a different device next time. |
69 | umount $ROOTFS_DIR | 69 | umount $ROOTFS_DIR |
70 | fi | ||
71 | fi | 70 | fi |
71 | fi | ||
72 | fi | 72 | fi |
73 | debug "Sleeping for $delay second(s) to wait root to settle..." | 73 | debug "Sleeping for $delay second(s) to wait root to settle..." |
74 | sleep $delay | 74 | sleep $delay |
diff --git a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live index 4c79f41285..7e92f93322 100644 --- a/meta/recipes-core/initrdscripts/initramfs-framework/setup-live +++ b/meta/recipes-core/initrdscripts/initramfs-framework/setup-live | |||
@@ -1,4 +1,4 @@ | |||
1 | #/bin/sh | 1 | #!/bin/sh |
2 | # Copyright (C) 2011 O.S. Systems Software LTDA. | 2 | # Copyright (C) 2011 O.S. Systems Software LTDA. |
3 | # Licensed on MIT | 3 | # Licensed on MIT |
4 | 4 | ||