diff --git a/etc/rc.d/rc.docker b/etc/rc.d/rc.docker index e5fd7bf85..c86b6c02a 100755 --- a/etc/rc.d/rc.docker +++ b/etc/rc.d/rc.docker @@ -556,7 +556,7 @@ docker_service_stop(){ if [[ $(ps -p $(docker_pid) -o comm= 2>/dev/null) != $DOCKERD ]]; then rm -f $DOCKER_PIDFILE # tear down the bridge - if [[ -e $SYSYEM/docker0 ]]; then + if [[ -e $SYSTEM/docker0 ]]; then run ip link set docker0 down run ip link del docker0 fi diff --git a/etc/rc.d/rc.local b/etc/rc.d/rc.local index 1bef4f90d..d5ce0568b 100755 --- a/etc/rc.d/rc.local +++ b/etc/rc.d/rc.local @@ -105,7 +105,7 @@ obsolete(){ if [[ -e "$CONFIG/plugins/$PLUGIN.plg" ]]; then local VERSION=$(/usr/local/sbin/plugin version "$CONFIG/plugins/$PLUGIN.plg") # assumes all version strings are of form YYYY.MM.DD[.letter] - if [[ $BADVER <= $VERSION ]]; then + if [[ $VERSION < $BADVER || $VERSION == $BADVER ]]; then log "moving obsolete plugin $PLUGIN.plg version $VERSION to $CONFIG/plugins-error" /usr/local/emhttp/webGui/scripts/notify -e "Plugin Removed" -s "$PLUGIN" -d "Plugin '$PLUGIN' version '$VERSION' was removed as it is incompatible with this version of Unraid OS" -m "A replacement *may* be available in Community Apps" -i "alert" -l "/Plugins" mv "$CONFIG/plugins/$PLUGIN.plg" "$CONFIG/plugins-error/"