[oe-commits] Darren Hart : Set an explicit path for the initrd scripts
git version control
git at git.openembedded.org
Fri Sep 16 12:30:31 UTC 2011
Module: openembedded-core.git
Branch: master
Commit: 4617ae0f433876037c2c9a0dfdb5e373e7a5c77b
URL: http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=4617ae0f433876037c2c9a0dfdb5e373e7a5c77b
Author: Darren Hart <dvhart at linux.intel.com>
Date: Thu Sep 15 15:41:37 2011 -0700
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
Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>
---
meta/recipes-core/initrdscripts/files/init-boot.sh | 2 ++
.../initrdscripts/files/init-install.sh | 2 ++
meta/recipes-core/initrdscripts/files/init-live.sh | 4 +++-
.../initrdscripts/initramfs-boot_1.0.bb | 2 +-
.../initrdscripts/initramfs-live-boot_1.0.bb | 2 +-
.../initrdscripts/initramfs-live-install_1.0.bb | 2 +-
6 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/meta/recipes-core/initrdscripts/files/init-boot.sh b/meta/recipes-core/initrdscripts/files/init-boot.sh
index 9d804fc..e82eba0 100644
--- a/meta/recipes-core/initrdscripts/files/init-boot.sh
+++ b/meta/recipes-core/initrdscripts/files/init-boot.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
mkdir /proc
mkdir /sys
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 fb6cea8..d31d994 100644
--- a/meta/recipes-core/initrdscripts/files/init-install.sh
+++ b/meta/recipes-core/initrdscripts/files/init-install.sh
@@ -5,6 +5,8 @@
# install.sh [device_name] [rootfs_name] [video_mode] [vga_mode]
#
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
# We need 20 Mb for the boot partition
boot_size=20
diff --git a/meta/recipes-core/initrdscripts/files/init-live.sh b/meta/recipes-core/initrdscripts/files/init-live.sh
index 6a1deba..c054863 100644
--- a/meta/recipes-core/initrdscripts/files/init-live.sh
+++ b/meta/recipes-core/initrdscripts/files/init-live.sh
@@ -1,5 +1,7 @@
#!/bin/sh
+PATH=/sbin:/bin:/usr/sbin:/usr/bin
+
ROOT_MOUNT="/rootfs/"
ROOT_IMAGE="rootfs.img"
MOUNT="/bin/mount"
@@ -12,7 +14,7 @@ early_setup() {
mount -t proc proc /proc
mount -t sysfs sysfs /sys
udevd --daemon
- /sbin/udevadm trigger --action=add
+ udevadm trigger --action=add
}
read_args() {
diff --git a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
index 704c271..6f9b4c2 100644
--- a/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-boot_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-boot.sh"
-PR = "r1"
+PR = "r2"
do_install() {
install -m 0755 ${WORKDIR}/init-boot.sh ${D}/init
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
index 6d354b7..b404f8c 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-boot_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-live.sh"
-PR = "r5"
+PR = "r6"
do_install() {
install -m 0755 ${WORKDIR}/init-live.sh ${D}/init
diff --git a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
index fc35e5c..793a4b7 100644
--- a/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
+++ b/meta/recipes-core/initrdscripts/initramfs-live-install_1.0.bb
@@ -3,7 +3,7 @@ LICENSE = "MIT"
LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420"
SRC_URI = "file://init-install.sh"
-PR = "r5"
+PR = "r6"
RDEPENDS_${PN} = "grub parted e2fsprogs-mke2fs"
More information about the Openembedded-commits
mailing list