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

fix module order

pull/5/head
Tomas M 2013-01-15 05:53:25 -06:00
parent 4e2f904136
commit e4f414c68d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
livekitlib
View File

@ -534,6 +534,13 @@ copy_to_ram()
fi fi
} }
# sort modules by number even if they are in subdirectory
#
sortmod()
{
cat - | sed -r "s,(.*/(.*)),\\2:\\1," | sort -n | cut -d : -f 2-
}
# Mount squashfs filesystem bundles # Mount squashfs filesystem bundles
# and add them to union # and add them to union
# $1 = directory where to search for bundles # $1 = directory where to search for bundles
@ -548,7 +555,7 @@ union_append_bundles()
echo_green_star echo_green_star
echo "Adding bundles to union" echo "Adding bundles to union"
( ls -1 "$1" | sort -n ; cd "$1" ; find modules/ 2>/dev/null | sort -n ) | grep '[.]'$BEXT'$' | while read BUNDLE; do ( ls -1 "$1" | sort -n ; cd "$1" ; find modules/ 2>/dev/null | sortmod) | grep '[.]'$BEXT'$' | while read BUNDLE; do
echo "* $BUNDLE" echo "* $BUNDLE"
BUN="$(basename "$BUNDLE")" BUN="$(basename "$BUNDLE")"
mkdir -p "$2/$BUN" mkdir -p "$2/$BUN"