mirror of https://github.com/CIRCL/Circlean
Saving files before refreshing line endings
parent
7cd38ee32f
commit
54a6001db1
|
@ -35,7 +35,7 @@ PARTITION_BOOT='/dev/mmcblk0p1'
|
||||||
|
|
||||||
# If you use the img
|
# If you use the img
|
||||||
##### Debian
|
##### Debian
|
||||||
IMAGE='2015-11-06-CIRCLean.img'
|
IMAGE='raspbian-wheezy.img'
|
||||||
OFFSET_ROOTFS=$((122880 * 512))
|
OFFSET_ROOTFS=$((122880 * 512))
|
||||||
OFFSET_BOOT=$((8192 * 512))
|
OFFSET_BOOT=$((8192 * 512))
|
||||||
##### Arch
|
##### Arch
|
||||||
|
|
19
tests/run.sh
19
tests/run.sh
|
@ -2,6 +2,25 @@
|
||||||
|
|
||||||
# http://pub.phyks.me/respawn/mypersonaldata/public/2014-05-20-11-08-01/
|
# http://pub.phyks.me/respawn/mypersonaldata/public/2014-05-20-11-08-01/
|
||||||
|
|
||||||
|
<<<<<<< HEAD
|
||||||
|
# To make debugging easier
|
||||||
|
echo "KittenGroomer: in tests/run.sh" 1>&2
|
||||||
|
|
||||||
|
if [ -z "$1" ]; then
|
||||||
|
echo "Please tell me which partition type to test."
|
||||||
|
echo "VFAT_NORM VFAT_PART NTPS_NORM EXT2 EXT3 EXT4"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
if [ -z "$2" ]; then
|
||||||
|
echo "Please tell me which file type to test."
|
||||||
|
echo "t_images1"
|
||||||
|
exit
|
||||||
|
fi
|
||||||
|
TEST_PART_TYPE=${1}
|
||||||
|
TEST_SOURCE_TYPE=${2}
|
||||||
|
|
||||||
|
=======
|
||||||
|
>>>>>>> master
|
||||||
IMAGE='../raspbian-wheezy.img'
|
IMAGE='../raspbian-wheezy.img'
|
||||||
OFFSET_ROOTFS=$((122880 * 512))
|
OFFSET_ROOTFS=$((122880 * 512))
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue