projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix fromiso after switch to /run/live
[live-boot-grml.git]
/
components
/
9990-misc-helpers.sh
diff --git
a/components/9990-misc-helpers.sh
b/components/9990-misc-helpers.sh
index
a565ed5
..
23024eb
100755
(executable)
--- a/
components/9990-misc-helpers.sh
+++ b/
components/9990-misc-helpers.sh
@@
-125,10
+125,10
@@
check_dev ()
fs_type=$(get_fstype "${ISO_DEVICE}")
if is_supported_fs ${fs_type}
then
fs_type=$(get_fstype "${ISO_DEVICE}")
if is_supported_fs ${fs_type}
then
- mkdir /live/fromiso
- mount -t $fs_type "$ISO_DEVICE" /live/fromiso
+ mkdir /
run/
live/fromiso
+ mount -t $fs_type "$ISO_DEVICE" /
run/
live/fromiso
ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
ISO_NAME="$(echo $FROMISO | sed "s|$ISO_DEVICE||")"
- loopdevname=$(setup_loop "/live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
+ loopdevname=$(setup_loop "/
run/
live/fromiso/${ISO_NAME}" "loop" "/sys/block/loop*" "" '')
devname="${loopdevname}"
else
echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
devname="${loopdevname}"
else
echo "Warning: unable to mount $ISO_DEVICE." >>/boot.log
@@
-1054,7
+1054,7
@@
find_persistence_media ()
# in one union together.
#
black_listed_devices=""
# in one union together.
#
black_listed_devices=""
- for d in /
live/rootfs/* /live/findiso
/live/fromiso
+ for d in /
run/live/rootfs/* /run/live/findiso /run
/live/fromiso
do
black_listed_devices="${black_listed_devices} $(what_is_mounted_on d)"
done
do
black_listed_devices="${black_listed_devices} $(what_is_mounted_on d)"
done
@@
-1369,7
+1369,7
@@
do_union ()
get_custom_mounts ()
{
get_custom_mounts ()
{
- # Side-effect: leaves $devices with persistence.conf mounted in /live/persistence
+ # Side-effect: leaves $devices with persistence.conf mounted in /
run/
live/persistence
# Side-effect: prints info to file $custom_mounts
local custom_mounts devices bindings links
# Side-effect: prints info to file $custom_mounts
local custom_mounts devices bindings links
@@
-1400,7
+1400,7
@@
get_custom_mounts ()
if [ -n "${LIVE_BOOT_DEBUG}" ] && [ -e "${include_list}" ]
then
if [ -n "${LIVE_BOOT_DEBUG}" ] && [ -e "${include_list}" ]
then
- cp ${include_list} /live/persistence/${persistence_list}.${device_name}
+ cp ${include_list} /
run/
live/persistence/${persistence_list}.${device_name}
fi
while read dir options # < ${include_list}
fi
while read dir options # < ${include_list}
@@
-1585,7
+1585,7
@@
activate_custom_mounts ()
rootfs_dest_backing=""
if [ -n "${opt_link}" ] || [ -n "${opt_union}" ]
then
rootfs_dest_backing=""
if [ -n "${opt_link}" ] || [ -n "${opt_union}" ]
then
- for d in /live/rootfs/*
+ for d in /
run/
live/rootfs/*
do
if [ -n "${rootmnt}" ]
then
do
if [ -n "${rootmnt}" ]
then