Changeset 580

Timestamp:

11/21/09 12:58:51 (2 years ago)

Author:

tschmitt

Message:

• Linbofs:
  • linbo_cmd.sh, start(): das Beenden der ctorrent-Prozesse wurde an eine frühere Stelle im Startablauf verschoben.
  • init.sh: o neuer Parameter autostart=<int>

autostart=0 unterdrückt generally jegliche Autostart-Definition in der start.conf,
autostart=<nr> setzt den Autostart für das OS an Position <nr> in der start.conf.
Autostarteinträge für andere OS werden unterdrückt.

• Serverskripte:
  • rsync-post.sh: die Zeit für hochgeladene Image- und Torrent-Dateien wird per touch-Befehl auf die Serverzeit gesetzt, andernfalls verweigert Bittorrent den Dienst, falls die hochgeladenen Dateien eine Erstellungszeit in der Zukunft haben.

Location:

main/linuxmuster-linbo/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• linbo/init.sh (modified) (3 diffs)
• linbo/linbo_cmd.sh (modified) (2 diffs)
• share/rsync-post.sh (modified) (1 diff)

main/linuxmuster-linbo/branches/testing/debian/changelog

@@ +1 @@
+linuxmuster-linbo (1.99.13-0) unstable; urgency=low
+
+  * linbofs:
+    - linbo_cmd.sh, start(): moved killing ctorrent processes to earlier position in start process.
+    - init.sh:
+      o handling new parameter autostart=<int>
+        autostart=0 suppresses autostart generally in start.conf,
+        autostart=<nr> sets autostart for OS number nr in start.conf.
+  * server side scripting:
+    - rsync-post.sh: sync time for image and torrent files otherwise bittorrent gets confused
+      if uploaded torrent file time is in future.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 21 Nov 2009 12:01:54 +0100
+
 linuxmuster-linbo (1.99.12-1) unstable; urgency=low
 

main/linuxmuster-linbo/branches/testing/linbo/init.sh

@@ -40 +40 @@
 # Utilities
 
+# test if variable is an integer
+isinteger () {
+ [ $# -eq 1 ] || return 1
+ case $1 in
+ *[!0-9]*|"") return 1;;
+           *) return 0;;
+ esac
+}
+
 # DMA
 enable_dma(){
@@ -301 +310 @@
  fi
  echo "$RET"
+}
+
+# handle autostart from cmdline
+set_autostart() {
+ # count [OS] entries
+ local counts="$(grep -ci ^"\[OS\]" /start.conf)"
+ # return if autostart value is greater than number of OS entries
+ [ $autostart -gt $counts -o $autostart -lt 0 ] && return
+ # return if autostart shall be suppressed generally
+ if [ "$autostart" = "0" ]; then
+  # set all autostart parameters to no
+  sed -e 's|^[Aa][Uu][Tt][Oo][Ss][Tt][Aa][Rr][Tt].*|Autostart = no|g' -i /start.conf
+  return
+ fi
+ # autostart OS at start.conf position given by autostart parameter
+ local c=0
+ local found=0
+ local line=""
+ while read -r line; do
+  if echo "$line" | grep -qi ^"\[OS\]"; then
+   let c=+1
+   [ "$autostart" = "$c" ] && found=1
+  fi
+  # suppress autostart for other OS entries
+  echo "$line" | grep -qi ^autostart || echo "$line" >> /start.conf.new
+  # write autostart line for specific OS
+  if [ "$found" = "1" ]; then
+   echo "Autostart = yes" >> /start.conf.new
+   found=0
+  fi
+ done </start.conf
+ mv /start.conf.new /start.conf
 }
 
@@ -354 +395 @@
  # modify cache in start.conf if cache was given and no extra start.conf was defined
  [ -z "$extra" -a -b "$cache" ] && modify_cache /start.conf
+ # set autostart if given on cmdline
+ isinteger "$autostart" && set_autostart
  # remove reboot flag
  rmlinboreboot

main/linuxmuster-linbo/branches/testing/linbo/linbo_cmd.sh

@@ -598 +598 @@
   return 1
  fi
+ # kill torrents if any
+ ps w | grep ctorrent | grep -v grep &> /dev/null && killall -9 ctorrent
 
  # No more timer interrupts
@@ -609 +611 @@
 
  umount /mnt 2>/dev/null
- # kill torrents if any
- ps w | grep ctorrent | grep -v grep && { killall ctorrent; sleep 3; }
  sendlog
  umount /cache || umount -l /cache 2>/dev/null

main/linuxmuster-linbo/branches/testing/share/rsync-post.sh

@@ -43 +43 @@
    timage="$(btshowmetainfo "$LINBODIR/${FILE##*/}" | grep ^"file name" | awk '{ print $3 }')"
    echo "Torrent file for $timage detected. Restarting bittorrent service." >&2
+   # sync time for image and torrent files otherwise bittorrent gets confused
+   # if uploaded torrent file time is in future
+   touch "${timage}*"
    /etc/init.d/linbo-bittorrent restart >&2
    /etc/init.d/bittorrent restart >&2