No longer modify PATH to point to /root

Thus stop using executables from /root.

Closes: #823069

diff --git a/components/0001-init-vars.sh b/components/0001-init-vars.sh
new file mode 100755 (executable)
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 (executable)
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 (file)
--- 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