Merge branch 'hotfix-1.1.4' into development

* hotfix-1.1.4:
  CHANGELOG: Update latest changes
  A bunch of fixes for timesave.         - Apply shellcheck issues         - Make timesave working properly on RPi images
  CHANGELOG: Add latest RPi fixes
  RPi: Fix r8188eu wifi detection problem
  Remove whitespace
  Changelog Add latest fixes
  Fix for radvd startup on OpenWrt
  IRC: cleaning up stop issues
  Adding latest RPi image generation changelog
This commit is contained in:
Matthias Strubel 2018-02-27 23:47:26 +01:00
commit 553ade13fc
5 changed files with 13 additions and 9 deletions

View File

@ -70,7 +70,7 @@ $(OPENWRT_CONFIG_FOLDER):
sed 's:DROOPY_USE_USER="yes":DROOPY_USE_USER="no":' -i $@/piratebox.conf
sed 's:DROOPY_CHMOD:#DROOPY_CHMOD:' -i $@/piratebox.conf
sed 's:LEASE_FILE_LOCATION=$$PIRATEBOX_FOLDER/tmp/lease.file:LEASE_FILE_LOCATION=/tmp/lease.file:' -i $@/piratebox.conf
sed 's:TIMESAVE_FORMAT="":TIMESAVE_FORMAT="+%C%g%m%d%H%M":' -i $@/piratebox.conf
sed 's:TIMESAVE_FORMAT="+%C%g%m%d %H%M":TIMESAVE_FORMAT="+%C%g%m%d%H%M":' -i $@/piratebox.conf
sed 's:FIREWALL_FETCH_DNS="yes":FIREWALL_FETCH_DNS="no":' -i $@/firewall.conf
sed 's:FIREWALL_FETCH_HTTP="yes":FIREWALL_FETCH_HTTP="no":' -i $@/firewall.conf

View File

@ -11,7 +11,6 @@
# Licenced under GPL-3 @ 2012,2017
# Matthias Strubel matthias.strubel@aod-rgp.de
# Print usage if parameters are not provided
if [ -z "$1" ] || [ -z "$2" ] ; then
echo "Set up a crontab entry for regulary saving the time"

View File

@ -203,14 +203,14 @@ case "$1" in
. $CONF_IRC
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD "
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD --pid-file $PIDFILE_IRC "
if [ ! -z "$IRC_STATEDIR" ] ; then
IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR "
fi
log_daemon_msg "Starting Miniircd..."
start-stop-daemon -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
start-stop-daemon -S -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
log_end_msg $?
fi
fi
@ -226,7 +226,7 @@ case "$1" in
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
log_daemon_msg "Stopping IRC..."
start-stop-daemon -K -q -p $PIDFILE_IRC
start-stop-daemon -s 9 -K -q -p $PIDFILE_IRC
log_end_msg $?
fi

View File

@ -152,6 +152,11 @@ case "$1" in
echo $?
if [ "$IPV6_ENABLE" = "yes" ] && [ "$IPV6_ADVERT" = "radvd" ] ; then
# Ugly hack on PirateBox 1.1.x only
if test -e "/usr/local/usr/sbin/radvd" && test ! -e "/usr/bin/radvd" ; then
echo "Deploy ugly hack for radvd on PirateBox 1.1"
ln -sf /usr/local/usr/sbin/radvd /usr/bin/radvd
fi
echo "Starting radvd..."
start-stop-daemon -S -q -x /usr/bin/radvd -- -p $PIDFILE_RADVD -C $CONF_RADVD
echo $?
@ -195,13 +200,13 @@ case "$1" in
#Start IRC Server
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
. $CONF_IRC
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD "
IRC_PARMS="--setuid $IRC_USER --daemon --motd $IRC_MOTD --pid-file $PIDFILE_IRC "
if [ ! -z "$IRC_STATEDIR" ] ; then
IRC_PARMS=" $IRCPARMS --statedir $IRC_STATEDIR "
fi
echo "Starting Miniircd..."
start-stop-daemon -m -S -p $PIDFILE_IRC -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
start-stop-daemon -S -x $PIRATEBOX/bin/miniircd.py -- $IRC_PARMS
echo $?
fi
fi
@ -254,7 +259,7 @@ case "$1" in
if [ "$ENABLE_IRC_SERVER" = "yes" ] ; then
echo "Stopping IRC..."
start-stop-daemon -K -q -p $PIDFILE_IRC
start-stop-daemon -s 9 -K -q -p $PIDFILE_IRC
echo $?
fi

View File

@ -54,7 +54,7 @@ fi
DRIVER_NAME=$( ls -1 /sys/class/net/"${WIFI_DEVICE}"/device/driver/module/drivers/ )
# Check for r8188eu enabled device
if echo "$DRIVER_NAME" | grep -q "r8188eu:"; then
if echo "$DRIVER_NAME" | grep -q "r8188eu"; then
echo "Found r8188eu enabled device..."
pacman --noconfirm -U --needed "${PACKAGE_PATH}/hostapd-8188eu-"* > /dev/null
sed -i 's/^driver=nl80211/#driver=nl80211/' "${CONFIG_PATH}"