Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a8683596 authored by Jean-Baptiste Queru's avatar Jean-Baptiste Queru
Browse files

merge from donut

parents 96d58f4f 1f278215

adb/adb.h

+1 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ 
#define ADB_VERSION_MAJOR 1         // Used for help/version information

#define ADB_VERSION_MINOR 0         // Used for help/version information



#define ADB_SERVER_VERSION    20    // Increment this when we want to force users to start a new adb server

#define ADB_SERVER_VERSION    21    // Increment this when we want to force users to start a new adb server



typedef struct amessage amessage;

typedef struct apacket apacket;

rootdir/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -6,7 +6,6 @@ include $(CLEAR_VARS) 
copy_from := \

	etc/dbus.conf \

	etc/init.goldfish.sh \

	etc/ppp/ip-up-vpn \

	etc/hosts



copy_to := $(addprefix $(TARGET_OUT)/,$(copy_from))

rootdir/etc/ppp/ip-up-vpn

deleted100755 → 0
+0 −18
Original line number Diff line number Diff line 
#!/system/bin/sh



/system/bin/setprop "vpn.dns1" "$DNS1"

/system/bin/setprop "vpn.dns2" "$DNS2"



GATEWAY=${6#*@}

VPNSERVER=${6%@*}



# Protect the route to vpn server

/system/bin/route add -net "$VPNSERVER" netmask 255.255.255.255 gw "$GATEWAY"



if (exp $?) ; then exit $?; fi



# Route all traffic to vpn connection

/system/bin/route add -net 0.0.0.0 netmask 128.0.0.0 gw $IPREMOTE

/system/bin/route add -net 128.0.0.0 netmask 128.0.0.0 gw $IPREMOTE



/system/bin/setprop "vpn.up" "1"

rootdir/init.rc

+3 −4
Original line number Diff line number Diff line
@@ -78,11 +78,10 @@ loglevel 3 
    mkdir /data/misc/keystore 0770 keystore keystore

    mkdir /data/misc/vpn 0770 system system

    mkdir /data/misc/vpn/profiles 0770 system system

    mkdir /data/misc/wifi 0770 wifi system

    chown wifi system /data/misc/wifi

    touch /data/misc/wifi/wpa_supplicant.conf

    # give system access to wpa_supplicant.conf for backup and restore

    mkdir /data/misc/wifi 0770 wifi wifi

    chmod 0770 /data/misc/wifi

    chmod 0660 /data/misc/wifi/wpa_supplicant.conf

    chown wifi system /data/misc/wifi/wpa_supplicant.conf

    mkdir /data/local 0771 shell shell

    mkdir /data/local/tmp 0771 shell shell

    mkdir /data/data 0771 system system

vold/blkdev.c

+1 −1
Original line number Diff line number Diff line
@@ -73,7 +73,7 @@ int blkdev_refresh(blkdev_t *blk) 
    }



    if (ioctl(fd, BLKGETSIZE, &blk->nr_sec)) {

        LOGE("Unable to get device size (%m)");

        LOGE("Unable to get device size (%s)", strerror(errno));

        return -errno;

    }

    close(fd);