diff options
author | Darren Hart <dvhart@linux.intel.com> | 2011-09-15 15:41:37 -0700 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2011-09-16 13:30:26 +0100 |
commit | e4fe5542a5242a62d7fc83bd24f65aeadb4d9390 (patch) | |
tree | a57b7cef66ff224596cdc92513bac5c664b3f687 /meta/recipes-core/initrdscripts/files | |
parent | 6f797c9398be2206dc6f721109a25038a2ce4a87 (diff) | |
download | poky-e4fe5542a5242a62d7fc83bd24f65aeadb4d9390.tar.gz |
Set an explicit path for the initrd scripts
If we don't set PATH, then the shell will specify one for us.
Busybox adds the sbin dirs, but bash does not. I hit an
issue where bash (among other things) ended up in my initrd
and the boot scripts failed due to a bad default PATH. While
that is a separate issue, we should not be at the mercy of the
shell's default PATH. Update the initrdscripts to all specify:
PATH=/sbin:/bin:/usr/sbin:/usr/bin
(From OE-Core rev: 4617ae0f433876037c2c9a0dfdb5e373e7a5c77b)
Signed-off-by: Darren Hart <dvhart@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/initrdscripts/files')
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-boot.sh | 2 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-install.sh | 2 | ||||
-rw-r--r-- | meta/recipes-core/initrdscripts/files/init-live.sh | 4 |
3 files changed, 7 insertions, 1 deletions
diff --git a/meta/recipes-core/initrdscripts/files/init-boot.sh b/meta/recipes-core/initrdscripts/files/init-boot.sh index 9d804fc3a7..e82eba025d 100644 --- a/meta/recipes-core/initrdscripts/files/init-boot.sh +++ b/meta/recipes-core/initrdscripts/files/init-boot.sh | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | PATH=/sbin:/bin:/usr/sbin:/usr/bin | ||
4 | |||
3 | mkdir /proc | 5 | mkdir /proc |
4 | mkdir /sys | 6 | mkdir /sys |
5 | mount -t proc proc /proc | 7 | mount -t proc proc /proc |
diff --git a/meta/recipes-core/initrdscripts/files/init-install.sh b/meta/recipes-core/initrdscripts/files/init-install.sh index fb6cea8d31..d31d994341 100644 --- a/meta/recipes-core/initrdscripts/files/init-install.sh +++ b/meta/recipes-core/initrdscripts/files/init-install.sh | |||
@@ -5,6 +5,8 @@ | |||
5 | # install.sh [device_name] [rootfs_name] [video_mode] [vga_mode] | 5 | # install.sh [device_name] [rootfs_name] [video_mode] [vga_mode] |
6 | # | 6 | # |
7 | 7 | ||
8 | PATH=/sbin:/bin:/usr/sbin:/usr/bin | ||
9 | |||
8 | # We need 20 Mb for the boot partition | 10 | # We need 20 Mb for the boot partition |
9 | boot_size=20 | 11 | boot_size=20 |
10 | 12 | ||
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh index 6a1deba0e2..c054863a2a 100644 --- a/meta/recipes-core/initrdscripts/files/init-live.sh +++ b/meta/recipes-core/initrdscripts/files/init-live.sh | |||
@@ -1,5 +1,7 @@ | |||
1 | #!/bin/sh | 1 | #!/bin/sh |
2 | 2 | ||
3 | PATH=/sbin:/bin:/usr/sbin:/usr/bin | ||
4 | |||
3 | ROOT_MOUNT="/rootfs/" | 5 | ROOT_MOUNT="/rootfs/" |
4 | ROOT_IMAGE="rootfs.img" | 6 | ROOT_IMAGE="rootfs.img" |
5 | MOUNT="/bin/mount" | 7 | MOUNT="/bin/mount" |
@@ -12,7 +14,7 @@ early_setup() { | |||
12 | mount -t proc proc /proc | 14 | mount -t proc proc /proc |
13 | mount -t sysfs sysfs /sys | 15 | mount -t sysfs sysfs /sys |
14 | udevd --daemon | 16 | udevd --daemon |
15 | /sbin/udevadm trigger --action=add | 17 | udevadm trigger --action=add |
16 | } | 18 | } |
17 | 19 | ||
18 | read_args() { | 20 | read_args() { |