From 3d23fcaf465503f855db42473311835e540340a0 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Rapha=C3=ABl=20Hertzog?= <hertzog@debian.org>
Date: Wed, 11 May 2016 12:50:28 +0200
Subject: [PATCH] No longer modify PATH to point to /root

Thus stop using executables from /root.

Closes: #823069
---
 components/0001-init-vars.sh | 11 +++++++++++
 components/9990-aaa-fixme.sh | 30 ------------------------------
 debian/changelog             |  2 ++
 3 files changed, 13 insertions(+), 30 deletions(-)
 create mode 100755 components/0001-init-vars.sh
 delete mode 100755 components/9990-aaa-fixme.sh

diff --git a/components/0001-init-vars.sh b/components/0001-init-vars.sh
new file mode 100755
index 0000000..7e69956
--- /dev/null
+++ b/components/0001-init-vars.sh
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+mountpoint="/live/medium"
+alt_mountpoint="/media"
+LIVE_MEDIA_PATH="live"
+HOSTNAME="host"
+custom_overlay_label="persistence"
+persistence_list="persistence.conf"
+
+mkdir -p "${mountpoint}"
+mkdir -p /var/lib/live/boot
diff --git a/components/9990-aaa-fixme.sh b/components/9990-aaa-fixme.sh
deleted file mode 100755
index 3309c81..0000000
--- a/components/9990-aaa-fixme.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
-export PATH
-
-echo "/root/lib" >> /etc/ld.so.conf
-echo "/root/usr/lib" >> /etc/ld.so.conf
-
-mountpoint="/live/medium"
-alt_mountpoint="/media"
-LIVE_MEDIA_PATH="live"
-
-HOSTNAME="host"
-
-mkdir -p "${mountpoint}"
-mkdir -p /var/lib/live/boot
-
-# Create /etc/mtab for debug purpose and future syncs
-mkdir -p /etc
-touch /etc/mtab
-
-if [ ! -x "/bin/fstype" ]
-then
-	# klibc not in path -> not in initramfs
-	PATH="${PATH}:/usr/lib/klibc/bin"
-	export PATH
-fi
-
-custom_overlay_label="persistence"
-persistence_list="persistence.conf"
diff --git a/debian/changelog b/debian/changelog
index b4514da..58ca28c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ live-boot (1:20160511) UNRELEASED; urgency=medium
 
   * Update build system to rely on "dpkg-parsechangelog -S Version" instead
     of outdated VERSION file.
+  * No longer modify PATH to point to /root and thus stop using executables
+    from /root. Closes: #823069
 
  -- Raphaël Hertzog <hertzog@debian.org>  Wed, 11 May 2016 11:40:37 +0200
 
-- 
2.1.4