From 5bd93e7ff8ce525169ce504a91048883faee492d Mon Sep 17 00:00:00 2001 From: Cosmin Gorgovan Date: Mon, 27 Mar 2017 00:25:37 +0100 Subject: [PATCH] Fixes for the disable-wifi and release-ip scripts disable-wifi: use pkill instead of killall, which is unavailable release-ip: reset the ip address of the interface --- build_rootfs.sh | 2 +- files/disable-wifi.sh | 3 ++- files/release-ip.sh | 3 ++- src/koreader-pkg/DEBIAN/control | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/build_rootfs.sh b/build_rootfs.sh index d914e99..0760ac0 100755 --- a/build_rootfs.sh +++ b/build_rootfs.sh @@ -87,7 +87,7 @@ config_rootfs() { install_packages() { cp src/linux-okreader-modules_2.6.35.3-1_armhf.deb rootfs/ cp src/firmware-okreader_1.0-1_armhf.deb rootfs/ - cp src/koreader_2017.03-2_armhf.deb rootfs/ + cp src/koreader_2017.03-3_armhf.deb rootfs/ cp src/kobo_hwconfig/kobo-hwconfig_1.0-1_armhf.deb rootfs/ chroot rootfs/ bash -c "dpkg -i /*.deb" diff --git a/files/disable-wifi.sh b/files/disable-wifi.sh index 8d8d488..d088f84 100755 --- a/files/disable-wifi.sh +++ b/files/disable-wifi.sh @@ -2,7 +2,8 @@ # Disable wifi, and remove all modules. -killall dhcpcd default.script wpa_supplicant 2>/dev/null +pkill dhcpcd +pkill wpa_supplicant ifconfig wlan0 down diff --git a/files/release-ip.sh b/files/release-ip.sh index a3ba619..e066adb 100755 --- a/files/release-ip.sh +++ b/files/release-ip.sh @@ -1,3 +1,4 @@ #!/bin/sh -pkill -9 -f 'dhcpcd' +pkill 'dhcpcd' +ifconfig wlan0 0.0.0.0 diff --git a/src/koreader-pkg/DEBIAN/control b/src/koreader-pkg/DEBIAN/control index 4475901..0f51b73 100644 --- a/src/koreader-pkg/DEBIAN/control +++ b/src/koreader-pkg/DEBIAN/control @@ -1,5 +1,5 @@ Package: koreader -Version: 2017.03-2 +Version: 2017.03-3 Maintainer: Cosmin Gorgovan Architecture: armhf Description: An ebook viewer application.