version bumped to 20160410

This commit is contained in:
Calin Crisan 2016-04-09 20:27:38 +03:00
parent de4775cab7
commit 60f13b8d9f
2 changed files with 3 additions and 20 deletions

View File

@ -1,4 +1,4 @@
os_name="motionEyeOS" os_name="motionEyeOS"
os_short_name="motioneyeos" os_short_name="motioneyeos"
os_prefix="meye" os_prefix="meye"
os_version="20160320" os_version="20160410"

View File

@ -61,7 +61,6 @@ function cleanup {
trap cleanup EXIT trap cleanup EXIT
BOOT=$(dirname $0)/.boot BOOT=$(dirname $0)/.boot
ROOT=$(dirname $0)/.root
if ! [ -f $DISK_IMG ]; then if ! [ -f $DISK_IMG ]; then
echo "could not find image file $DISK_IMG" echo "could not find image file $DISK_IMG"
@ -88,36 +87,22 @@ fi
msg "mounting sdcard" msg "mounting sdcard"
mkdir -p $BOOT mkdir -p $BOOT
mkdir -p $ROOT
if [ `uname` == "Darwin" ]; then if [ `uname` == "Darwin" ]; then
if ! [ -x /sbin/mount_fuse-ext2 ]; then
echo "Missing mount_fuse-ext2 for EXT4 mounting! Further configuration stopped."
echo ""
echo "See http://osxdaily.com/2014/03/20/mount-ext-linux-file-system-mac/"
echo "how to install ext4 mount support, please include 'Enabling EXT Write Support'."
echo ""
exit 1
fi
BOOT_DEV=${SDCARD_DEV}s1 # e.g. /dev/disk4s1 BOOT_DEV=${SDCARD_DEV}s1 # e.g. /dev/disk4s1
ROOT_DEV=${SDCARD_DEV}s2 # e.g. /dev/disk4s2
mount_msdos $BOOT_DEV $BOOT mount_msdos $BOOT_DEV $BOOT
mount_fuse-ext2 $ROOT_DEV $ROOT
else # assuming Linux else # assuming Linux
BOOT_DEV=${SDCARD_DEV}p1 # e.g. /dev/mmcblk0p1 BOOT_DEV=${SDCARD_DEV}p1 # e.g. /dev/mmcblk0p1
ROOT_DEV=${SDCARD_DEV}p2 # e.g. /dev/mmcblk0p2
if ! [ -e ${SDCARD_DEV}p1 ]; then if ! [ -e ${SDCARD_DEV}p1 ]; then
BOOT_DEV=${SDCARD_DEV}1 # e.g. /dev/sdc1 BOOT_DEV=${SDCARD_DEV}1 # e.g. /dev/sdc1
ROOT_DEV=${SDCARD_DEV}2 # e.g. /dev/sdc2
fi fi
mount $BOOT_DEV $BOOT mount $BOOT_DEV $BOOT
mount $ROOT_DEV $ROOT
fi fi
# wifi # wifi
if [ -n "$SSID" ]; then if [ -n "$SSID" ]; then
msg "creating wireless configuration" msg "creating wireless configuration"
conf=$ROOT/etc/wpa_supplicant.conf conf=$BOOT/wpa_supplicant.conf
echo "update_config=1" > $conf echo "update_config=1" > $conf
echo "ctrl_interface=/var/run/wpa_supplicant" >> $conf echo "ctrl_interface=/var/run/wpa_supplicant" >> $conf
echo "network={" >> $conf echo "network={" >> $conf
@ -132,7 +117,7 @@ fi
# static ip # static ip
if [ -n "$IP" ] && [ -n "$GW" ] && [ -n "$DNS" ]; then if [ -n "$IP" ] && [ -n "$GW" ] && [ -n "$DNS" ]; then
msg "setting static IP configuration" msg "setting static IP configuration"
conf=$ROOT/etc/static_ip.conf conf=$BOOT/static_ip.conf
echo "static_ip=\"$IP\"" > $conf echo "static_ip=\"$IP\"" > $conf
echo "static_gw=\"$GW\"" >> $conf echo "static_gw=\"$GW\"" >> $conf
echo "static_dns=\"$DNS\"" >> $conf echo "static_dns=\"$DNS\"" >> $conf
@ -141,9 +126,7 @@ fi
msg "unmounting sdcard" msg "unmounting sdcard"
sync sync
umount $BOOT umount $BOOT
umount $ROOT
rmdir $BOOT rmdir $BOOT
rmdir $ROOT
msg "you can now remove the sdcard" msg "you can now remove the sdcard"