Briq
/
linux-live
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

support from=livekit.iso

pull/5/head
Tomas M 2012-11-20 06:35:49 -06:00
parent dd5599ecbc
commit 93b88bcadc
2 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
TODO
View File

@ -1,3 +1,2 @@
* copy DOC/* to Live Kit created * copy DOC/* to Live Kit created
* describe meaning of special files in bundles * describe meaning of special files in bundles
* support from=slax.iso

26
livekitlib
View File

@ -209,7 +209,7 @@ mounted_device()
local MNT TARGET local MNT TARGET
MNT="$1" MNT="$1"
while [ "$MNT" != "/" -a "$MNT" != "." -a "$MNT" != "" ]; do while [ "$MNT" != "/" -a "$MNT" != "." -a "$MNT" != "" ]; do
TARGET="$(grep -F " $MNT " /proc/mounts | cut -d " " -f 1)" TARGET="$(grep -F " $MNT " /proc/mounts | cut -d " " -f 1 | head -n 1)"
if [ "$TARGET" != "" ]; then if [ "$TARGET" != "" ]; then
echo "$TARGET:$MNT" echo "$TARGET:$MNT"
return return
@ -261,19 +261,33 @@ find_data_try()
{ {
debug_log "find_data_try" "$*" debug_log "find_data_try" "$*"
local DEVICE FS MNT OPTIONS local DEVICE FS FROM OPTIONS
mkdir -p "$1" mkdir -p "$1"
blkid | sort | cut -d: -f 1 | grep -E -v "/loop|/ram|/zram" | while read DEVICE; do blkid | sort | cut -d: -f 1 | grep -E -v "/loop|/ram|/zram" | while read DEVICE; do
FROM="$2"
FS="$(device_bestfs "$DEVICE")" FS="$(device_bestfs "$DEVICE")"
OPTIONS="$(fs_options $FS)" OPTIONS="$(fs_options $FS)"
mount -r "$DEVICE" "$1" $FS $OPTIONS 2>/dev/null mount -r "$DEVICE" "$1" $FS $OPTIONS 2>/dev/null
if [ "$(find "$1/$2" -maxdepth 1 -name "*.$BEXT" 2>/dev/null)" != "" ]; then
# if the FROM parameter is actual file, mount it again as loop (eg. iso)
if [ -f "$1/$FROM" ]; then
mount -o remount,rw "$DEVICE" "$1" 2>/dev/null
mkdir -p "$1/../iso"
mount -o loop,ro "$1/$FROM" "$1/../iso" 2>/dev/null
FROM="../iso/$LIVEKITNAME"
fi
# search for bundles in the mounted directory
if [ "$(find "$1/$FROM" -maxdepth 1 -name "*.$BEXT" 2>/dev/null)" != "" ]; then
# we found at least one bundle/module here # we found at least one bundle/module here
mount -o remount,rw "$DEVICE" "$1" 2>/dev/null mount -o remount,rw "$DEVICE" "$1" 2>/dev/null
echo "$1/$2" | tr -s "/" echo "$1/$FROM" | tr -s "/" | sed -r "s:/[^/]+/../:/:g"
return return
fi fi
# unmount twice, since there could be mounted ISO as loop too. If not, it doesn't hurt
umount "$1" 2>/dev/null
umount "$1" 2>/dev/null umount "$1" 2>/dev/null
done done
} }
@ -293,13 +307,13 @@ find_data()
if [ "$FROM" = "" ]; then FROM="$LIVEKITNAME"; fi if [ "$FROM" = "" ]; then FROM="$LIVEKITNAME"; fi
echo_green_star >&2 echo_green_star >&2
echo -n "Looking for $LIVEKITNAME data in /$FROM/ .." | tr -s "/" >&2 echo -n "Looking for $LIVEKITNAME data in /$FROM .." | tr -s "/" >&2
for timeout in $(seq 1 $1); do for timeout in $(seq 1 $1); do
echo -n "." >&2 echo -n "." >&2
DATA="$(find_data_try "$2" "$FROM")" DATA="$(find_data_try "$2" "$FROM")"
if [ "$DATA" != "" ]; then if [ "$DATA" != "" ]; then
echo "" >&2 echo "" >&2
echo "* Found on $(mounted_device "$DATA" | cut -d : -f 1)" >&2 echo "* Found on $(mounted_device "$2" | cut -d : -f 1)" >&2
echo "$DATA" echo "$DATA"
return return
fi fi