Merge remote-tracking branch 'origin/master'

OkaeriArchive · Sep 28, 2019 · 654a878 · 654a878
2 parents 38de958 + 770f163
commit 654a878
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ Simple screen daemon written in Go.
 - `/etc/init.d/screend restart`
 
 ## Removal
-- `update.rc screend remove`
+- `update-rc.d screend remove`
 - `sudo rm -rf /root/screend /etc/init.d/screend`
 
 ## Configuration

diff --git a/screend.sh b/screend.sh
@@ -5,6 +5,7 @@
 # Required-Stop:     $remote_fs $syslog
 # Default-Start:     2 3 4 5
 # Default-Stop:      0 1 6
+# Required-Start:    $all
 # Short-Description: screend init script
 ### END INIT INFO
 
@@ -26,6 +27,12 @@ SCRIPTNAME=/etc/init.d/$NAME
 # and status_of_proc is working.
 . /lib/lsb/init-functions
 
+# Make sure we have started with system locale
+if [ -r /etc/default/locale ]; then
+        . /etc/default/locale
+        export LANG
+fi
+
 #
 # Function that starts the daemon/service
 #
@@ -137,4 +144,4 @@ case "$1" in
   echo "Usage: $SCRIPTNAME {start|stop|status|restart|force-reload}" >&2
   exit 3
   ;;
-esac
+esac