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

Update livekitlib

pull/13/head
Peter Jin 2015-08-10 23:47:29 -05:00
parent 94583b4d64
commit 0bfa3780d0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
livekitlib
View File

@ -113,7 +113,7 @@ create_bundle()
{ {
debug_log "create_module" "$*" debug_log "create_module" "$*"
rm -f "$2" # overwrite, never append to existing file rm -f "$2" # overwrite, never append to existing file
mksquashfs "$1" "$2" -comp xz -b 512K $3 $4 $5 $6 $7 $8 $9>/dev/null mksquashfs "$1" "$2" -comp "${COMP:-xz}" -b 512K $3 $4 $5 $6 $7 $8 $9>/dev/null
} }
@ -131,7 +131,7 @@ transfer_initramfs()
cp -a /??* $SWITCH 2>/dev/null # only copy two-and-more-letter directories cp -a /??* $SWITCH 2>/dev/null # only copy two-and-more-letter directories
cd $SWITCH cd $SWITCH
echo "This file indicates that we successfully escaped initramfs" > $SWITCH/lib/initramfs_escaped echo "This file indicates that we successfully escaped initramfs" > $SWITCH/lib/initramfs_escaped
exec switch_root -c /dev/console . $0 exec busybox switch_root -c /dev/console . $0
fi fi
} }
@ -247,7 +247,7 @@ device_bestfs()
local FS local FS
FS="$(blkid "$1" | sed -r "s/.*TYPE=//" | tr -d '"' | tr [A-Z] [a-z])" FS="$(blkid "$1" | sed -r "s/.*TYPE=//" | tr -d '"' | tr [A-Z] [a-z])"
if [ "$FS" = "msdos" -o "$FS" = "fat" -o "$FS" = "vfat" ]; then if [ "$FS" = "msdos" -o "$FS" = "fat" ]; then
FS="vfat" FS="vfat"
elif [ "$FS" = "ntfs" ]; then elif [ "$FS" = "ntfs" ]; then
FS="ntfs-3g" FS="ntfs-3g"
@ -644,4 +644,4 @@ change_root()
mount -n -o remount,ro aufs . mount -n -o remount,ro aufs .
pivot_root . mnt/live pivot_root . mnt/live
exec $CHROOT . $INIT < dev/console > dev/console 2>&1 exec $CHROOT . $INIT < dev/console > dev/console 2>&1
} }