summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRaphaƫl Hertzog <hertzog@debian.org>2016-05-11 10:50:28 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-07-28 14:20:58 +0000
commitb84d334259cf79d8a4df2d979b4f1c4c43f5109e (patch)
treec6482c90290c3d8df1907ef241848771ae151f54
parentCorrecting spelling typo in variable name in live-boot frontend, thanks to Gi... (diff)
downloadsystem-boot-b84d334259cf79d8a4df2d979b4f1c4c43f5109e.tar.xz
system-boot-b84d334259cf79d8a4df2d979b4f1c4c43f5109e.zip
No longer modifying PATH to point to /root and thus stop using executables from /root (Closes: #823069).
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
-rwxr-xr-xcomponents/0001-init-vars.sh11
-rwxr-xr-xcomponents/9990-aaa-fixme.sh30
2 files changed, 11 insertions, 30 deletions
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"