projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'live-systems/debian' into debian
[live-boot-grml.git]
/
components
/
9990-aaa-fixme.sh
diff --git
a/components/9990-aaa-fixme.sh
b/components/9990-aaa-fixme.sh
index
416d6b4
..
3309c81
100755
(executable)
--- a/
components/9990-aaa-fixme.sh
+++ b/
components/9990-aaa-fixme.sh
@@
-1,6
+1,7
@@
#!/bin/sh
#!/bin/sh
-export PATH="/root/usr/bin:/root/usr/sbin:/root/bin:/root/sbin:/usr/bin:/usr/sbin:/bin:/sbin"
+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
echo "/root/lib" >> /etc/ld.so.conf
echo "/root/usr/lib" >> /etc/ld.so.conf
@@
-12,39
+13,18
@@
LIVE_MEDIA_PATH="live"
HOSTNAME="host"
mkdir -p "${mountpoint}"
HOSTNAME="host"
mkdir -p "${mountpoint}"
-tried="/tmp/tried"
+mkdir -p /var/lib/live/boot
# Create /etc/mtab for debug purpose and future syncs
# Create /etc/mtab for debug purpose and future syncs
-if [ ! -d /etc ]
-then
- mkdir /etc/
-fi
-
-if [ ! -f /etc/mtab ]
-then
- touch /etc/mtab
-fi
+mkdir -p /etc
+touch /etc/mtab
if [ ! -x "/bin/fstype" ]
then
# klibc not in path -> not in initramfs
if [ ! -x "/bin/fstype" ]
then
# klibc not in path -> not in initramfs
- export PATH="${PATH}:/usr/lib/klibc/bin"
-fi
-
-# handle upgrade path from old udev (using udevinfo) to
-# recent versions of udev (using udevadm info)
-if [ -x /sbin/udevadm ]
-then
- udevinfo='/sbin/udevadm info'
-else
- udevinfo='udevinfo'
+ PATH="${PATH}:/usr/lib/klibc/bin"
+ export PATH
fi
custom_overlay_label="persistence"
persistence_list="persistence.conf"
fi
custom_overlay_label="persistence"
persistence_list="persistence.conf"
-old_persistence_list="live-persistence.conf"
-
-if [ ! -f /live.vars ]
-then
- touch /live.vars
-fi