From b21724820ca99a2c5d43d3a68977881aa7837bb0 Mon Sep 17 00:00:00 2001 From: Lorenzo Stoakes Date: Sun, 6 Mar 2016 18:47:43 +0000 Subject: tools: fix path on create-image.sh chroot. When chroot'ing into the generated debian rootfs PATH is inherited from the host and assumed to reference each of: /bin, /sbin, /usr/bin, /usr/sbin, /usr/local/bin and /usr/local/sbin. Not all distros use all of these, so enforce these in the chroot command. --- tools/create-image.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tools/create-image.sh b/tools/create-image.sh index 3f62c961b..3b73b95be 100755 --- a/tools/create-image.sh +++ b/tools/create-image.sh @@ -24,7 +24,8 @@ ssh-keygen -f ssh/id_rsa -t rsa -N '' cat ssh/id_rsa.pub | sudo tee wheezy/root/.ssh/authorized_keys # Install some misc packages. -sudo chroot wheezy /bin/bash -c "apt-get update; ( yes | apt-get install curl tar time strace)" +sudo chroot wheezy /bin/bash -c "export PATH=/bin:/sbin:/usr/bin:/usr/sbin:/usr/local/bin:/usr/local/sbin; " \ +"apt-get update; apt-get install --yes curl tar time strace" # Build a disk image dd if=/dev/zero of=wheezy.img bs=1M seek=1023 count=1 @@ -33,4 +34,3 @@ sudo mkdir -p /mnt/wheezy sudo mount -o loop wheezy.img /mnt/wheezy sudo cp -a wheezy/. /mnt/wheezy/. sudo umount /mnt/wheezy - -- cgit mrf-deployment From a286670358f07e66dd14fd10707c46ce4d55e0fa Mon Sep 17 00:00:00 2001 From: Lorenzo Stoakes Date: Sun, 6 Mar 2016 18:55:04 +0000 Subject: Update AUTHORS/CONTRIBUTORS. --- AUTHORS | 1 + CONTRIBUTORS | 1 + 2 files changed, 2 insertions(+) diff --git a/AUTHORS b/AUTHORS index 5491e3af7..fbcac1fe6 100644 --- a/AUTHORS +++ b/AUTHORS @@ -7,3 +7,4 @@ Google Inc. Baozeng Ding +Lorenzo Stoakes diff --git a/CONTRIBUTORS b/CONTRIBUTORS index e5dc4a21a..c48c9101d 100644 --- a/CONTRIBUTORS +++ b/CONTRIBUTORS @@ -8,3 +8,4 @@ Google Inc. Andrey Konovalov David Drysdale Baozeng Ding +Lorenzo Stoakes -- cgit mrf-deployment