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

some echoed infos

pull/5/head
Tomas M 2012-09-19 02:29:17 -05:00
parent 9941a7eef9
commit aa4a74a689
1 changed files with 38 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
livekitlib
View File

@ -8,9 +8,6 @@
# debug and output functions # debug and output functions
# ================================================================= # =================================================================
# global variable
DEBUG_IS_ENABLED="$(cat /proc/cmdline 2>/dev/null | grep debug)"
debug_log() debug_log()
{ {
if [ "$DEBUG_IS_ENABLED" ]; then if [ "$DEBUG_IS_ENABLED" ]; then
@ -28,12 +25,11 @@ header()
} }
# echogreen will echo $@ in green color # echo green star
# $1 = text
# #
echogreen() echo_green_star()
{ {
echo -ne """$@""" echo -ne """* """
} }
# log - store given text in /var/log/livedbg # log - store given text in /var/log/livedbg
@ -151,11 +147,12 @@ init_devs()
init_zram() init_zram()
{ {
debug_log "init_zram" debug_log "init_zram"
echo_green_star
echo "Setting dynamic RAM compression using ZRAM" echo "Setting dynamic RAM compression using ZRAM"
echo 536870912 > /sys/block/zram0/disksize # 512MB echo 536870912 > /sys/block/zram0/disksize # 512MB
mkswap /dev/zram0
swapon /dev/zram0 -p 32767
echo 100 > /proc/sys/vm/swappiness echo 100 > /proc/sys/vm/swappiness
mkswap /dev/zram0 >/dev/null
swapon /dev/zram0 -p 32767
} }
# load the AUFS kernel module if needed # load the AUFS kernel module if needed
@ -175,11 +172,31 @@ init_aufs()
init_union() init_union()
{ {
debug_log "init_union" debug_log "init_union"
echo_green_star
echo "Setting up union using AUFS 3"
mkdir -p "$1" mkdir -p "$1"
mkdir -p "$2" mkdir -p "$2"
mount -t aufs -o xino="$1/.xino",br="$1" none "$2" mount -t aufs -o xino="$1/.xino",br="$1" none "$2"
} }
# Return device mounted for given directory
# $1 = directory
#
mounted_device()
{
local MNT TARGET
MNT="$1"
while [ "$MNT" != "/" -a "$MNT" != "." -a "$MNT" != "" ]; do
TARGET="$(grep -F " $MNT " /proc/mounts | cut -d " " -f 1)"
if [ "$TARGET" != "" ]; then
echo "$TARGET"
return
fi
MNT="$(dirname $MNT)"
done
}
# Make sure to mount FAT12/16/32 using vfat # Make sure to mount FAT12/16/32 using vfat
# in order to support long filenames # in order to support long filenames
# $1 = device # $1 = device
@ -231,18 +248,25 @@ find_data()
local DATA local DATA
echo_green_star >&2
echo -n "Looking for $LIVEKITNAME data .." >&2 echo -n "Looking for $LIVEKITNAME data .." >&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")" DATA="$(find_data_try "$2")"
if [ "$DATA" != "" ]; then if [ "$DATA" != "" ]; then
echo "$DATA"
echo "" >&2 echo "" >&2
echo "- found in $(mounted_device "$DATA")" >&2
echo "$DATA"
return return
fi fi
sleep 1 sleep 1
done done
echo "" >&2 echo "" >&2
if [ "$DATA" = "" ]; then
fatal "$LIVEKITNAME data not found"
fi
} }
# Mount squashfs filesystem bundles # Mount squashfs filesystem bundles
@ -253,7 +277,11 @@ find_data()
# #
union_append_bundles() union_append_bundles()
{ {
debug_log "union_append_bundles"
echo_green_star
echo "Adding bundles to union"
ls -1 "$1" | grep '.'$BEXT'$' | sort | while read BUNDLE; do ls -1 "$1" | grep '.'$BEXT'$' | sort | while read BUNDLE; do
echo "- $BUNDLE"
mkdir -p "$2/$BUNDLE" mkdir -p "$2/$BUNDLE"
mount -o loop -t squashfs "$1/$BUNDLE" "$2/$BUNDLE" mount -o loop -t squashfs "$1/$BUNDLE" "$2/$BUNDLE"
mount -o remount,add:1:"$2/$BUNDLE" none "$3" mount -o remount,add:1:"$2/$BUNDLE" none "$3"