mollusk/void-mklive
mollusk/void-mklive
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #27 from pullmoll/master

Browse Source 
installer.sh.in: really fix the md parsing
This commit is contained in:
Juan RP 2015-05-20 11:23:10 +02:00
commit d177ef47d6
4 changed files with 15 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build-arm-images.sh.in
View File

@ -4,7 +4,7 @@ TARGET="$1"
set -e set -e
PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory" PLATFORMS="beaglebone cubieboard2 cubietruck odroid-u2 rpi rpi2 usbarmory"
DATE=$(date '+%Y%m%d') DATE=$(date '+%Y%m%d')
for f in ${PLATFORMS}; do for f in ${PLATFORMS}; do

2
build-rootfs.sh.in
View File

@ -4,7 +4,7 @@ set -e
TARGET="$1" TARGET="$1"
PLATFORMS="beaglebone cubieboard2 odroid-u2 rpi rpi2 usbarmory" PLATFORMS="beaglebone cubieboard2 cubietruck odroid-u2 rpi rpi2 usbarmory"
for f in ${PLATFORMS}; do for f in ${PLATFORMS}; do
if [ -z "$TARGET" -o "$TARGET" = "$f" ]; then if [ -z "$TARGET" -o "$TARGET" = "$f" ]; then

7
installer.sh.in
View File

@ -166,11 +166,12 @@ show_partitions() {
done done
# Software raid (md) # Software raid (md)
for p in $(ls -d /dev/md* 2>/dev/null|grep '[0-9]'); do for p in $(ls -d /dev/md* 2>/dev/null|grep '[0-9]'); do
if cat /proc/mdstat|grep -qw $(echo $p|sed -e 's|/dev/||g'); then part=$(basename $p)
fstype=$(lsblk -nfr /dev/$p|awk '{print $2}') if cat /proc/mdstat|grep -qw $part; then
fstype=$(lsblk -nfr /dev/$part|awk '{print $2}')
[ "$fstype" = "crypto_LUKS" ] && continue [ "$fstype" = "crypto_LUKS" ] && continue
[ "$fstype" = "LVM2_member" ] && continue [ "$fstype" = "LVM2_member" ] && continue
fssize=$(lsblk -nr /dev/$p|awk '{print $4}') fssize=$(lsblk -nr /dev/$part|awk '{print $4}')
echo "$p" echo "$p"
echo "size:${fssize:-unknown};fstype:${fstype:-none}" echo "size:${fssize:-unknown};fstype:${fstype:-none}"
fi fi

14
mkimage.sh.in
View File

@ -113,7 +113,7 @@ fi
# double check PLATFORM is supported... # double check PLATFORM is supported...
case "$PLATFORM" in case "$PLATFORM" in
bananapi|beaglebone|cubieboard2|odroid-u2|rpi|rpi2|usbarmory);; bananapi|beaglebone|cubieboard2|cubietruck|odroid-u2|rpi|rpi2|usbarmory);;
*) die "The $PLATFORM is not supported, exiting..." *) die "The $PLATFORM is not supported, exiting..."
esac esac
@ -175,16 +175,20 @@ fi
echo "UUID=$ROOT_UUID / $ROOT_FSTYPE defaults 0 ${fspassno}" >> ${ROOTFSDIR}/etc/fstab echo "UUID=$ROOT_UUID / $ROOT_FSTYPE defaults 0 ${fspassno}" >> ${ROOTFSDIR}/etc/fstab
echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults${fstab_args} 0 2" >> ${ROOTFSDIR}/etc/fstab echo "UUID=$BOOT_UUID /boot $BOOT_FSTYPE defaults${fstab_args} 0 2" >> ${ROOTFSDIR}/etc/fstab
if [ "$PLATFORM" = "cubieboard2" -o "$PLATFORM" = "bananapi" ]; then case "$PLATFORM" in
bananapi|cubieboard2|cubietruck)
dd if=${ROOTFSDIR}/boot/u-boot-sunxi-with-spl.bin of=${LOOPDEV} bs=1024 seek=8 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/u-boot-sunxi-with-spl.bin of=${LOOPDEV} bs=1024 seek=8 >/dev/null 2>&1
elif [ "$PLATFORM" = "odroid-u2" ]; then ;;
odroid-u2)
dd if=${ROOTFSDIR}/boot/E4412_S.bl1.HardKernel.bin of=${LOOPDEV} seek=1 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/E4412_S.bl1.HardKernel.bin of=${LOOPDEV} seek=1 >/dev/null 2>&1
dd if=${ROOTFSDIR}/boot/bl2.signed.bin of=${LOOPDEV} seek=31 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/bl2.signed.bin of=${LOOPDEV} seek=31 >/dev/null 2>&1
dd if=${ROOTFSDIR}/boot/u-boot.bin of=${LOOPDEV} seek=63 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/u-boot.bin of=${LOOPDEV} seek=63 >/dev/null 2>&1
dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1 dd if=${ROOTFSDIR}/boot/E4412_S.tzsw.signed.bin of=${LOOPDEV} seek=2111 >/dev/null 2>&1
elif [ "$PLATFORM" = "usbarmory" ]; then ;;
usbarmory)
dd if=${ROOTFSDIR}/boot/u-boot.imx of=${LOOPDEV} bs=512 seek=2 conv=fsync dd if=${ROOTFSDIR}/boot/u-boot.imx of=${LOOPDEV} bs=512 seek=2 conv=fsync
fi ;;
esac
mountpoint -q ${ROOTFSDIR}/boot && umount ${ROOTFSDIR}/boot mountpoint -q ${ROOTFSDIR}/boot && umount ${ROOTFSDIR}/boot
umount $ROOTFSDIR umount $ROOTFSDIR