# HG changeset patch
# User Christopher Rogers <slaxemulator@gmail.com>
# Date 1335293739 0
# Node ID 87aa12b14afa813c28c1df2909ea8b7871127603
# Parent  0c446964a0d04f160661d44d311d8014120d4b8e
initramfs: Update local-mirror script and lighttpd config files. Support new /lib/libtaz.sh script.

diff -r 0c446964a0d0 -r 87aa12b14afa initramfs/etc/lighttpd/vhosts-local-mirror.conf
--- a/initramfs/etc/lighttpd/vhosts-local-mirror.conf	Sun Mar 04 01:55:59 2012 -0500
+++ b/initramfs/etc/lighttpd/vhosts-local-mirror.conf	Tue Apr 24 18:55:39 2012 +0000
@@ -2,7 +2,7 @@
 # mirror.slitaz.org (Server canonical hostname)
 #
 $HTTP["host"] =~ "^mirror([0-9]*)\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/slitaz/mirror"
+  server.document-root = "/home/slitaz/www/mirror"
   server.errorlog = "/var/log/lighttpd/mirror.slitaz.org-error.log"
   accesslog.filename = "/var/log/lighttpd/mirror.slitaz.org-access.log"
   
@@ -31,10 +31,15 @@
 
   alias.url += ( "/webboot" => "/home/slitaz/www/boot/" )
 
+  alias.url += ( "/usbkey" => "/home/slitaz/www/usbkey/")
+
+  alias.url += ( "/roadmap" => "/home/slitaz/www/roadmap/")
+
   alias.url += ( "/pkgs" => "/home/slitaz/www/pkgs/" )
-  index-file.names += ( "search.cgi" )
+  index-file.names += ( "search.sh" )
   cgi.assign += (
-    ".cgi" => "/bin/sh"
+    ".cgi" => "/bin/sh",
+    ".sh" => "/bin/sh"
   )
 
   alias.url += ( "/hg" => "/home/slitaz/www/hg/" )
diff -r 0c446964a0d0 -r 87aa12b14afa initramfs/etc/lighttpd/vhosts-local-tank.conf
--- a/initramfs/etc/lighttpd/vhosts-local-tank.conf	Sun Mar 04 01:55:59 2012 -0500
+++ b/initramfs/etc/lighttpd/vhosts-local-tank.conf	Tue Apr 24 18:55:39 2012 +0000
@@ -35,15 +35,12 @@
 
 # pro.slitaz.org
 #
-$HTTP["host"] =~ "pro\.slitaz\.org$" {
+$HTTP["host"] =~ "(slitaz\.pro$|pro\.slitaz\.org$)" {
   server.document-root = "/home/slitaz/www/pro"
   server.errorlog = "/var/log/lighttpd/pro.slitaz.org-error.log"
   accesslog.filename = "/var/log/lighttpd/pro.slitaz.org-access.log"
-  url.rewrite-final = (
-    "^/system/test/(.*)$" => "/index.php?q=system/test/$1",
-    "^/([^.?]*)\?(.*)$" => "/index.php?q=$1&$2",
-    "^/([^.?]*)$" => "/index.php?q=$1",
-    "^/rss.xml" => "/index.php?q=rss.xml"
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
   )
 }
 
@@ -75,8 +72,9 @@
   server.errorlog = "/var/log/lighttpd/pkgs.slitaz.org-error.log"
   accesslog.filename = "/var/log/lighttpd/pkgs.slitaz.org-access.log"
   cgi.assign = (
-    ".cgi" => "/bin/sh"
+    ".sh" => "/bin/sh"
   )
+  index-file.names += ( "search.sh" )
 }
 
 # bb.slitaz.org (Build Bot)
@@ -153,24 +151,41 @@
     )
 }
 
+# roadmap.slitaz.org
+#
+$HTTP["host"] =~ "roadmap\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/www/roadmap"
+  server.errorlog = "/var/log/lighttpd/roadmap.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/roadmap.slitaz.org-access.log"
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
+  )
+  index-file.names = ( "roadmap.cgi" )
+}
+
 # bugs.slitaz.org
 #
-$HTTP["host"] =~ "bugs\.slitaz\.org$" {
-  #cgi.assign = (
-  #  ".cgi" => "/usr/bin/python"
-  #)
-  #server.document-root = "/home/slitaz/www/bugs"
-  #url.rewrite-once = ( "(.*)" => "/roundup.cgi$1" )
+$HTTP["host"] =~ "^bugs\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/www/bugs"
   server.errorlog = "/var/log/lighttpd/bugs.slitaz.org-error.log"
   accesslog.filename = "/var/log/lighttpd/bugs.slitaz.org-access.log"
-  #url.rewrite = ( "(.*)" => "/bugs$1" )
-  proxy.server = ( "" => ((
-      "host" => "127.0.0.1",
-      "port" => "8917"
-    ))
+  index-file.names = ( "bugs.cgi" )
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
   )
 }
 
+# try.slitaz.org (For testing)
+#
+$HTTP["host"] =~ "(try\.slitaz\.org$)" {
+  server.document-root = "/home/slitaz/www/try"
+  server.errorlog = "/var/log/lighttpd/try.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/try.slitaz.org-access.log"
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
+  )
+  #index-file.names = ( "index.cgi" )
+}
 
 # cloud.slitaz.org
 #
diff -r 0c446964a0d0 -r 87aa12b14afa initramfs/etc/lighttpd/vhosts-tank.conf
--- a/initramfs/etc/lighttpd/vhosts-tank.conf	Sun Mar 04 01:55:59 2012 -0500
+++ b/initramfs/etc/lighttpd/vhosts-tank.conf	Tue Apr 24 18:55:39 2012 +0000
@@ -1,15 +1,6 @@
 # /etc/lighttpd/vhosts.conf : Virtual hosts configuration file.
 #
 
-# Nice url's for Drupal
-#
-#url.rewrite-final = (
-#  "^/system/test/(.*)$" => "/index.php?q=system/test/$1",
-#  "^/([^.?]*)\?(.*)$" => "/index.php?q=$1&$2",
-#  "^/([^.?]*)$" => "/index.php?q=$1",
-#   "^/rss.xml" => "/index.php?q=rss.xml"
-#  )
-
 # tank.slitaz.org (Server canonical hostname)
 #
 $HTTP["host"] =~ "tank\.slitaz\.org$" {
@@ -20,31 +11,25 @@
   index-file.names += ( "index.php" )
 }
 
-# slitaz.org
+# pro.slitaz.org
 #
-$HTTP["host"] =~ "(^|www\.)slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/website"
-  server.errorlog = "/var/log/lighttpd/slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/slitaz.org-access.log"
-  
-  include "awstats.conf"
-  index-file.names += ( "index.cgi", "index.php", "index.html" )
+$HTTP["host"] =~ "(slitaz\.pro$|pro\.slitaz\.org$)" {
+  server.document-root = "/home/slitaz/www/pro"
+  server.errorlog = "/var/log/lighttpd/pro.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/pro.slitaz.org-access.log"
   cgi.assign = (
     ".cgi" => "/bin/sh"
   )
 }
 
-# pro.slitaz.org
+# boot.slitaz.org
 #
-$HTTP["host"] =~ "pro\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/pro"
-  server.errorlog = "/var/log/lighttpd/pro.slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/pro.slitaz.org-access.log"
-  url.rewrite-final = (
-    "^/system/test/(.*)$" => "/index.php?q=system/test/$1",
-    "^/([^.?]*)\?(.*)$" => "/index.php?q=$1&$2",
-    "^/([^.?]*)$" => "/index.php?q=$1",
-    "^/rss.xml" => "/index.php?q=rss.xml"
+$HTTP["host"] =~ "boot\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/www/boot"
+  server.errorlog = "/var/log/lighttpd/boot.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/boot.slitaz.org-access.log"
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
   )
 }
 
@@ -54,18 +39,10 @@
   userdir.path = "Public"
   userdir.exclude-user = ("root")
   server.document-root = "/home/slitaz/www/people"
-  server.errorlog = "/var/log/lighttpd/people.slitaz.org-error.log"
+  server.errorlog = "/var/log/lighttpd/people.slitaz.org-erro.log"
   accesslog.filename = "/var/log/lighttpd/people.slitaz.org-access.log"
 }
 
-# boot.slitaz.org
-#
-$HTTP["host"] =~ "boot\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/boot"
-  server.errorlog = "/var/log/lighttpd/boot.slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/boot.slitaz.org-access.log"
-}
-
 # pkgs.slitaz.org
 #
 $HTTP["host"] =~ "pkgs\.slitaz\.org$" {
@@ -77,156 +54,70 @@
   )
 }
 
-# bb.slitaz.org (Build Bot)
+# cook.slitaz.org
 #
-$HTTP["host"] =~ "bb\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/bb"
-  server.errorlog = "/var/log/lighttpd/bb.slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/bb.slitaz.org-access.log"
+$HTTP["host"] =~ "cook\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/www/cook"
+  server.errorlog = "/var/log/lighttpd/cook.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/cook.slitaz.org-access.log"
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
+  )
+  index-file.names = ( "cooker.cgi" )
 }
 
-# hg.slitaz.org (Mercurial repos)
+# slitaz.me
 #
-$HTTP["host"] =~ "hg\.slitaz\.org" {
-  cgi.assign = (
-    ".cgi" => "/usr/bin/python"
-  )
-  server.document-root = "/home/slitaz/www/hg"
-  url.rewrite-once = ( "(.*)" => "/hgwebdir.cgi$1" )
-  auth.backend = "plain"
-  auth.backend.plain.userfile = "/etc/lighttpd/plain.passwd"
-  $HTTP["querystring"] =~ "cmd=unmundle" {
-    auth.require = ( "/" => (
-      "method" => "basic",
-      "realm" => "SliTaz Mercurial repositories protected area",
-      "require" => "valid-user"
-      )
-    )
-  }
+$HTTP["host"] =~ "slitaz\.me$" {
+  server.document-root = "/home/slitaz/www/me"
+  server.errorlog = "/var/log/lighttpd/slitaz.me-error.log"
+  accesslog.filename = "/var/log/lighttpd/slitaz.me-access.log"
 }
 
-# repos.slitaz.org (Mercurial repos with auth and write access)
+# roadmap.slitaz.org
 #
-$HTTP["host"] =~ "repos\.slitaz\.org" {
+$HTTP["host"] =~ "roadmap\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/www/roadmap"
+  server.errorlog = "/var/log/lighttpd/roadmap.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/roadmap.slitaz.org-access.log"
   cgi.assign = (
-    ".cgi" => "/usr/bin/python"
+    ".cgi" => "/bin/sh"
   )
-  server.document-root = "/home/slitaz/www/hg"
-  url.rewrite-once = ( "(.*)" => "/hgwebdir.cgi$1" )
-  auth.backend = "plain"
-  auth.backend.plain.userfile = "/etc/lighttpd/plain.passwd"
-  auth.require = ( "/" =>
-    (
-    "method" => "basic",
-    "realm" => "SliTaz Mercurial repositories protected area",
-    "require" => "valid-user"
-    )
-  )
-
-}
-
-# doc.slitaz.org
-#
-$HTTP["host"] =~ "doc\.slitaz\.org" {
-  server.document-root = "/home/slitaz/www/doc"
-  index-file.names = ("doku.php") 
-  var.dokudir = ""
-   # Rewrites for dokuwiki
-    url.rewrite = (
-      "^" + var.dokudir + "/lib/.*$"              => "$0",
-      "^" + var.dokudir + "/_media/(.*)?\?(.*)$"  => var.dokudir + "/lib/exe/fetch.php?media=$1&$2",
-      "^" + var.dokudir + "/_media/(.*)$"         => var.dokudir + "/lib/exe/fetch.php?media=$1",
-      "^" + var.dokudir + "/_detail/(.*)?\?(.*)$" => var.dokudir + "/lib/exe/detail.php?media=$1&$2",
-      "^" + var.dokudir + "/_detail/(.*)?$"       => var.dokudir + "/lib/exe/detail.php?media=$1",
-      "^" + var.dokudir + "/_export/([^/]+)/(.*)\?(.*)$" => var.dokudir + "/doku.php?do=export_$1&id=$2&$3",
-      "^" + var.dokudir + "/_export/([^/]+)/(.*)" => var.dokudir + "/doku.php?do=export_$1&id=$2",
-      "^" + var.dokudir + "/doku.php.*"           => "$0",
-      "^" + var.dokudir + "/feed.php.*"           => "$0",
-      "^" + var.dokudir + "/(.*)\?(.*)"           => var.dokudir + "/doku.php?id=$1&$2",
-      "^" + var.dokudir + "/(.*)"                 => var.dokudir + "/doku.php?id=$1"
-    )
-}
-
-# scn.slitaz.org
-#
-$HTTP["host"] =~ "scn\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/scn"
-  server.errorlog = "/var/log/lighttpd/scn.slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/scn.slitaz.org-access.log"
-  url.rewrite-final = (
-    "^/system/test/(.*)$" => "/index.php?q=system/test/$1",
-    "^/([^.?]*)\?(.*)$" => "/index.php?q=$1&$2",
-    "^/([^.?]*)$" => "/index.php?q=$1",
-    "^/rss.xml" => "/index.php?q=rss.xml"
-  )
-}
-
-# store.slitaz.org
-#
-$HTTP["host"] =~ "store\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/store"
-  server.errorlog = "/var/log/lighttpd/store.slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/store.slitaz.org-access.log"
-}
-
-# groups.slitaz.org
-#
-$HTTP["host"] =~ "groups\.slitaz\.org$" {
-  server.document-root = "/home/slitaz/www/groups"
-  server.errorlog = "/var/log/lighttpd/groups.slitaz.org-error.log"
-  accesslog.filename = "/var/log/lighttpd/groups.slitaz.org-access.log"
-  url.rewrite-final = (
-    "^/system/test/(.*)$" => "/index.php?q=system/test/$1",
-    "^/([^.?]*)\?(.*)$" => "/index.php?q=$1&$2",
-    "^/([^.?]*)$" => "/index.php?q=$1",
-    "^/rss.xml" => "/index.php?q=rss.xml"
-  )
+  index-file.names = ( "roadmap.cgi" )
 }
 
 # bugs.slitaz.org
 #
-$HTTP["host"] =~ "bugs\.slitaz\.org$" {
-  #cgi.assign = (
-  #  ".cgi" => "/usr/bin/python"
-  #)
-  #server.document-root = "/home/slitaz/www/bugs"
-  #url.rewrite-once = ( "(.*)" => "/roundup.cgi$1" )
-
-  #url.rewrite = ( "(.*)" => "/bugs$1" )
-  proxy.server = ( "" => ((
-      "host" => "127.0.0.1",
-      "port" => "8917"
-    ))
+$HTTP["host"] =~ "^bugs\.slitaz\.org$" {
+  server.document-root = "/home/slitaz/www/bugs"
+  server.errorlog = "/var/log/lighttpd/bugs.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/bugs.slitaz.org-access.log"
+  index-file.names = ( "bugs.cgi" )
+  cgi.assign = (
+    ".cgi" => "/bin/sh"
   )
 }
 
-# cook.slitaz.org
+# try.slitaz.org (For testing)
 #
-$HTTP["host"] =~ "cook\.slitaz\.org$" {
+$HTTP["host"] =~ "(try\.slitaz\.org$)" {
+  server.document-root = "/home/slitaz/www/try"
+  server.errorlog = "/var/log/lighttpd/try.slitaz.org-error.log"
+  accesslog.filename = "/var/log/lighttpd/try.slitaz.org-access.log"
   cgi.assign = (
+    ".py" => "/usr/bin/python",
+    ".sh" => "/bin/sh",
     ".cgi" => "/bin/sh"
   )
-  index-file.names = ( "cooker.cgi" )
-  server.document-root = "/home/slitaz/www/cook"
+  #index-file.names = ( "index.cgi" )
 }
 
-# cloud.slitaz.org
+# cloud.slitaz.me
 #
-$HTTP["host"] =~ "cloud\.slitaz\.org$" {
-  cgi.assign = (
-   ".cgi" => "/bin/sh"
-  )
-  index-file.names = ( "cloud.cgi" )
+$HTTP["host"] =~ "cloud\.slitaz\.me$" {
   server.document-root = "/home/slitaz/www/cloud"
-  auth.backend = "plain"
-  auth.backend.plain.userfile = "/etc/lighttpd/cloud.users"
-  auth.require = ( "/" =>
-    (
-    "method" => "basic"
-    "realm" => "SliTaz Cloud protected area",
-    "require" => "valid-user"
-    )
-  )
+  server.errorlog = "/var/log/lighttpd/cloud.slitaz.me-error.log"
+  accesslog.filename = "/var/log/lighttpd/cloud.slitaz.me-access.log"
 }
 
 # ssfs.slitaz.org
@@ -250,27 +141,18 @@
 
 # These hosts are personnal website for me and my family, pankso.
 
-
-# libordux
+# pankso.com
 #
-$HTTP["host"] =~ "(^|\.)libordux\.$" {
-  server.document-root = "/home/pankso/vhosts/libordux"
-  server.errorlog = "/var/log/lighttpd/libordux.error.log"
-  accesslog.filename = "/var/log/lighttpd/libordux.access.log"
+$HTTP["host"] =~ "(^|\.)pankso\.com$" {
+  server.document-root = "/home/pankso/vhosts/pankso"
+  server.errorlog = "/var/log/lighttpd/pankso.error.log"
+  accesslog.filename = "/var/log/lighttpd/pankso.access.log"
 }
 
 # lincolm.ch
 #
 $HTTP["host"] =~ "(^|\.)lincolm\.ch$" {
   server.document-root = "/home/pankso/vhosts/lincolm"
-  server.errorlog = "/var/log/lighttpd/lincolm-error.log"
-  accesslog.filename = "/var/log/lighttpd/lincolm-access.log"
+  server.errorlog = "/var/log/lighttpd/lincolm.error.log"
+  accesslog.filename = "/var/log/lighttpd/lincolm.access.log"
 }
-
-# solufina.ch
-#
-$HTTP["host"] =~ "(^|\.)solufina\.ch$" {
-  server.document-root = "/home/pankso/vhosts/solufina"
-  server.errorlog = "/var/log/lighttpd/solufina.log"
-  accesslog.filename = "/var/log/lighttpd/solufina.log"
-}
diff -r 0c446964a0d0 -r 87aa12b14afa initramfs/etc/local-mirror.conf
--- a/initramfs/etc/local-mirror.conf	Sun Mar 04 01:55:59 2012 -0500
+++ b/initramfs/etc/local-mirror.conf	Tue Apr 24 18:55:39 2012 +0000
@@ -3,26 +3,26 @@
  slitaz-doc-wiki-data slitaz-forge slitaz-modular slitaz-pizza \
  slitaz-tools slitaz-vz ssfs tazlito tazpanel tazpkg tazusb \
  tazwok slitaz-dev-tools website wok wok-stable wok-tiny \
- wok-undigest wok-tank my-cookutils piratebox"
-WWW="website people doc pizza cook pkgs mirror boot tank hg \
-lfs absguide man-html piratebox hgbook gimp.en gimp.fr gimp.es"
+ wok-undigest wok-tank my-cookutils tazbug piratebox"
+WWW="website people doc pizza cook pkgs mirror boot try tank hg \
+lfs absguide man-html roadmap usbkey pro piratebox \
+hgbook gimp.en gimp.fr gimp.es"
 IP_ADDR="127.0.0.1"
 ROUTER_IP="192.168.1.1"
 ADDRESS="www.slitaz.org pizza.slitaz.org boot.slitaz.org \
-mirror.slitaz.org tank.slitaz.org doc.slitaz.org \
+mirror.slitaz.org try.slitaz.org tank.slitaz.org doc.slitaz.org \
 pkgs.slitaz.org hg.slitaz.org cook.slitaz.org \
-people.slitaz.org piratebox.lan"
+people.slitaz.org roadmap.slitaz.org usbkey.slitaz.org \
+pro.slitaz.org piratebox.lan"
 VHOST_FILE="/etc/lighttpd/vhosts-local.conf"
 VHOST_MIRROR_FILE="/etc/lighttpd/vhosts-local-mirror.conf"
 VHOST_TANK_FILE="/etc/lighttpd/vhosts-local-tank.conf"
 REPOS_DIR="/repos"
-REPOS_WEB_DIR="/home/slitaz/repos-web"
+REPOS_WEB_DIR="$SLITAZ_HOME/repos-web"
 CUSTOM_WOK="yes"
 MKCHROOT="yes"
 
-MAIN_WWW_DIR="/home/slitaz/www"
+MAIN_WWW_DIR="$SLITAZ_HOME/www"
 
-STABLE="/home/slitaz/stable"
-COOKING="/home/slitaz/cooking"
 #PKGDIR
-#SRCDIR
\ No newline at end of file
+#SRCDIR
diff -r 0c446964a0d0 -r 87aa12b14afa initramfs/usr/bin/local-mirror
--- a/initramfs/usr/bin/local-mirror	Sun Mar 04 01:55:59 2012 -0500
+++ b/initramfs/usr/bin/local-mirror	Tue Apr 24 18:55:39 2012 +0000
@@ -22,27 +22,34 @@
 
 COOKORDER="$(find /mnt/live/mnt/* -maxdepth 1 -name "cookorder.list")"
 CUR_PWD="$PWD"
-version="$(cat /etc/slitaz-release)"
+version="$SLITAZ_RELEASE"
 
-[ -d $SLITAZ_DIR/$version ] || mkdir -p $SLITAZ_DIR/$version
-[ -d $SLITAZ_DIR/repos ] || ln -sf $REPOS_DIR $SLITAZ_DIR/repos
-[ -d $SLITAZ_DIR/repos ] && REPOS_DIR="$SLITAZ_DIR/repos"
+[ -d $SLITAZ_HOME/$version ] || mkdir -p $SLITAZ_HOME/$version
+[ -d $SLITAZ_HOME/repos ] || ln -sf $REPOS_DIR $SLITAZ_HOME/repos
+[ -d $SLITAZ_HOME/repos ] && REPOS_DIR="$SLITAZ_HOME/repos"
+PYTHON_LIB="/usr/lib/python2.7"
 
 if [ -d $PKGDIR ]; then
-	[ -d $SLITAZ_DIR/$version/packages ] || ln -sf $PKGDIR $SLITAZ_DIR/$version/packages
-	[ -d $SLITAZ_DIR/packages ] || ln -sf $PKGDIR $SLITAZ_DIR/packages
+	[ -d $SLITAZ_HOME/$version/packages ] || ln -sf $PKGDIR $SLITAZ_HOME/$version/packages
+	[ -d $SLITAZ_HOME/packages ] || ln -sf $PKGDIR $SLITAZ_HOME/packages
 fi
 if [ -d $SRCDIR ]; then
-	[ -d $SLITAZ_DIR/$version/src ] || ln -sf $SRCDIR $SLITAZ_DIR/$version/src
-	[ -d $SLITAZ_DIR/src ] || ln -sf $SRCDIR $SLITAZ_DIR/src
+	[ -d $SLITAZ_HOME/$version/src ] || ln -sf $SRCDIR $SLITAZ_HOME/$version/src
+	[ -d $SLITAZ_HOME/src ] || ln -sf $SRCDIR $SLITAZ_HOME/src
 fi
 
 #repos folders for website
 PEOPLE_WWW_DIR="$REPOS_DIR/slitaz-forge/people"
+MIRROR_WWW_DIR="$REPOS_DIR/slitaz-forge/mirror/root"
+MIRROR_INFO_WWW_DIR="$REPOS_DIR/slitaz-forge/mirror/info"
+PKGS_WWW_DIR="$REPOS_DIR/slitaz-forge/pkgs"
 DOC_WWW_DIR="$REPOS_DIR/slitaz-forge/doc"
 PIZZA_WWW_DIR="$REPOS_DIR/slitaz-pizza/php"
 BOOT_WWW_DIR="$REPOS_DIR/slitaz-forge/boot"
 TANK_WWW_DIR="$REPOS_DIR/slitaz-forge/tank/web"
+USBKEY_WWW_DIR="$REPOS_DIR/slitaz-forge/usbkey"
+ROADMAP_WWW_DIR="$REPOS_DIR/slitaz-forge/roadmap"
+PRO_WWW_DIR="$REPOS_DIR/slitaz-forge/pro"
 
 if [ "$COMMAND" = "tank-only" ]; then
 	WWW="${WWW/mirror/}"
@@ -63,7 +70,7 @@
 [ -d $REPOS_DIR ] || continue
 
 INCOMING_REPOSITORY="$COOKING/packages-incoming"
-INCOMING="$SLITAZ_DIR/$version/incoming"
+INCOMING="$SLITAZ_HOME/$version/incoming"
 CRON_FILE="/var/spool/cron/crontabs/root"
 
 www() {
@@ -91,9 +98,9 @@
 	
 	case "$b" in
 		website)
-			cd $REPOS_DIR/$b
-			hg update testing
-			cd $CUR_DIR
+			#cd $REPOS_DIR/$b
+			#hg update testing
+			#cd $CUR_DIR
 			[ -d $REPOS_DIR/$b ] && ln -s $REPOS_DIR/$b $MAIN_WWW_DIR
 			if [ -f $MAIN_WWW_DIR/$b/libs/get-feeds.sh ]; then
 				if [ ! $(grep -l "$MAIN_WWW_DIR/$b/libs/get-feeds.sh" $CRON_FILE) ]; then
@@ -103,7 +110,7 @@
 			fi
 		;;
 		people)
-			[ -d $REPOS_DIR/slitaz-forge/people ] && ln -s $REPOS_DIR/slitaz-forge/people $MAIN_WWW_DIR/people
+			[ -d $PEOPLE_WWW_DIR ] && ln -s $PEOPLE_WWW_DIR $MAIN_WWW_DIR/people
 		;;
 		doc)
 			[ -d $DOC_WWW_DIR ] && cp -a $DOC_WWW_DIR $MAIN_WWW_DIR/doc
@@ -117,11 +124,11 @@
 			chmod 777 -R $MAIN_WWW_DIR/doc
 		;;
 		bugs)
-			[ -d $SLITAZ_DIR/bugs ] || mkdir -p $SLITAZ_DIR/bugs
+			[ -d $SLITAZ_HOME/bugs ] || mkdir -p $SLITAZ_HOME/bugs
 			[ -d $MAIN_WWW_DIR/bugs ] || mkdir -p $MAIN_WWW_DIR/bugs
-			[ -d $REPOS_DIR/slitaz-forge/bugs ] && cp -a $REPOS_DIR/slitaz-forge/bugs/roundup.wsgi $SLITAZ_DIR/bugs/roundup.wsgi
-			[ -d $REPOS_DIR/slitaz-forge/bugs ] && cp -a $REPOS_DIR/slitaz-forge/bugs/server.ini $SLITAZ_DIR/bugs/server.ini
-			[ -d $REPOS_DIR/slitaz-forge/bugs/templates/slitaz ] && cp -a $REPOS_DIR/slitaz-forge/bugs/templates/slitaz/* $SLITAZ_DIR/bugs
+			[ -d $REPOS_DIR/slitaz-forge/bugs ] && cp -a $REPOS_DIR/slitaz-forge/bugs/roundup.wsgi $SLITAZ_HOME/bugs/roundup.wsgi
+			[ -d $REPOS_DIR/slitaz-forge/bugs ] && cp -a $REPOS_DIR/slitaz-forge/bugs/server.ini $SLITAZ_HOME/bugs/server.ini
+			[ -d $REPOS_DIR/slitaz-forge/bugs/templates/slitaz ] && cp -a $REPOS_DIR/slitaz-forge/bugs/templates/slitaz/* $SLITAZ_HOME/bugs
 			[ -f /usr/share/roundup/cgi-bin/roundup.cgi ] && ln -sf /usr/share/roundup/cgi-bin/roundup.cgi $MAIN_WWW_DIR/bugs/roundup.cgi
 		;;
 		pizza)
@@ -176,11 +183,11 @@
 			#	make install
 			#	cd $pwd
 			#fi
-			echo "$SLITAZ_DIR/$version/packages" > $LOCALSTATE/mirror
+			echo "$SLITAZ_HOME/$version/packages" > $LOCALSTATE/mirror
 			[ -d $LOCALSTATE/undigest/incoming ] || mkdir -p $LOCALSTATE/undigest/incoming
 			[ -f $LOCALSTATE/undigest/incoming/mirror ] || echo "$INCOMING" > $LOCALSTATE/undigest/incoming/mirror
 			echo "incoming" > $LOCALSTATE/priority
-			[ -d $SLITAZ_DIR/$version/incoming ] || mkdir -p $SLITAZ_DIR/$version/incoming
+			[ -d $SLITAZ_HOME/$version/incoming ] || mkdir -p $SLITAZ_HOME/$version/incoming
 			[ -d /var/www/cooker ] && cp -a /var/www/cooker $MAIN_WWW_DIR/$b
 			[ -f /usr/share/$b/header.html ] && cp -a /usr/share/$b/header.html $MAIN_WWW_DIR/$b/header.html
 			[ -f /etc/slitaz/$b.conf ] && cp -a /etc/slitaz/$b.conf $MAIN_WWW_DIR/$b/$b.conf
@@ -188,51 +195,50 @@
 				if [ -d $PKGDIR ]; then
 					tazpkg recharge
 					tazdev gen-chroot $version
-					[ -d $SLITAZ_DIR/$version/chroot ] && mkdir -p $SLITAZ_DIR/$version/chroot$(dirname $CRON_FILE)
-					[ -d $SLITAZ_DIR/$version/chroot ] && echo "0 */2 * * * /usr/bin/cooker" > $SLITAZ_DIR/$version/chroot${CRON_FILE}
-					[ -d $SLITAZ_DIR/$version/chroot ] && echo "$SLITAZ_DIR/$version/packages" > $SLITAZ_DIR/$version/chroot${LOCALSTATE}/mirror
-					mkdir -p $SLITAZ_DIR/$version/chroot${LOCALSTATE}/undigest/incoming
-					echo "$SLITAZ_DIR/$version/incoming" > $SLITAZ_DIR/$version/chroot${LOCALSTATE}/undigest/incoming/mirror
+					[ -d $SLITAZ_HOME/$version/chroot ] && mkdir -p $SLITAZ_HOME/$version/chroot$(dirname $CRON_FILE)
+					[ -d $SLITAZ_HOME/$version/chroot ] && echo "0 */2 * * * /usr/bin/cooker" > $SLITAZ_HOME/$version/chroot${CRON_FILE}
+					[ -d $SLITAZ_HOME/$version/chroot ] && echo "$SLITAZ_HOME/$version/packages" > $SLITAZ_HOME/$version/chroot${LOCALSTATE}/mirror
+					mkdir -p $SLITAZ_HOME/$version/chroot${LOCALSTATE}/undigest/incoming
+					echo "$SLITAZ_HOME/$version/incoming" > $SLITAZ_HOME/$version/chroot${LOCALSTATE}/undigest/incoming/mirror
 				fi
 			fi
-			[ -d $REPOS_DIR/wok-tank ] && ln -sf $REPOS_DIR/wok-tank $SLITAZ_DIR/$version/wok-hg
-			#[ -d $REPOS_DIR/wok-tank ] && ln -sf $REPOS_DIR/wok-tank $SLITAZ_DIR/$version/wok
-			[ -d $MAIN_WWW_DIR/$b/packages ] || ln -sf $SLITAZ_DIR/$version/packages $MAIN_WWW_DIR/$b/packages
-			[ -d $MAIN_WWW_DIR/$b/incoming ] || ln -sf $SLITAZ_DIR/$version/incoming $MAIN_WWW_DIR/$b/incoming
+			[ -d $REPOS_DIR/wok-tank ] && ln -sf $REPOS_DIR/wok-tank $SLITAZ_HOME/$version/wok-hg
+			#[ -d $REPOS_DIR/wok-tank ] && ln -sf $REPOS_DIR/wok-tank $SLITAZ_HOME/$version/wok
+			[ -d $MAIN_WWW_DIR/$b/packages ] || ln -sf $SLITAZ_HOME/$version/packages $MAIN_WWW_DIR/$b/packages
+			[ -d $MAIN_WWW_DIR/$b/incoming ] || ln -sf $SLITAZ_HOME/$version/incoming $MAIN_WWW_DIR/$b/incoming
 		;;
+		try)
+			[ -d $MAIN_WWW_DIR/tinycm ] || ln -sf $REPOS_DIR/tinycm $MAIN_WWW_DIR/tinycm ;;
 		pkgs)
-			[ -d $MAIN_WWW_DIR/pkgs ] || mkdir -p $MAIN_WWW_DIR/pkgs
 			pwd=$(pwd)
-			#if [ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web ]; then
-			#	cd $REPOS_DIR/slitaz-dev-tools/tazpkg-web
-			#	make install
-			#	cd $pwd
-			#fi
-			[ -d /var/lib/tazpkg-web/style ] && cp -a /var/lib/tazpkg-web/style $MAIN_WWW_DIR/pkgs
-			[ -f /var/lib/tazpkg-web/search.cgi ] && cp -a /var/lib/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs
-			#[ -d $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/style/* $MAIN_WWW_DIR/pkgs
-			#[ -f $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi ] && cp -a $REPOS_DIR/slitaz-dev-tools/tazpkg-web/search.cgi $MAIN_WWW_DIR/pkgs
+			if [ -d $PKGS_WWW_DIR ]; then
+				cd $PKGS_WWW_DIR
+				make install-msg
+				cd $pwd
+			fi
+			[ -d $MAIN_WWW_DIR/pkgs ] || ln -sf $PKGS_WWW_DIR $MAIN_WWW_DIR/pkgs
 			[ -d $REPOS_DIR/flavors ] && ln -sf $REPOS_DIR/flavors $COOKING/flavors
-			#[ -d $REPOS_DIR/flavors-stable ] && ln -sf $REPOS_DIR/flavors-stable $STABLE/flavors
-			#[ -d $COOKING/wok ] || ln -sf $REPOS_DIR/wok $COOKING/clean-wok
-			#[ -d $STABLE/clean-wok ] || ln -sf $REPOS_DIR/wok-stable $STABLE/clean-wok
-			if [ -f "/usr/bin/tazpkg-web" ]; then
-				tazpkg-web cooking
-				if [ ! $(grep -l "/usr/bin/tazpkg-web cooking" $CRON_FILE) ]; then
-					echo "# Update pkgs.slitaz.org pages" >> $CRON_FILE
-					echo "20 02 * * * /usr/bin/tazpkg-web cooking" >> $CRON_FILE
-				fi
-			fi
 		;;
+		usbkey)
+			[ -d $USBKEY_WWW_DIR ] && ln -sf $USBKEY_WWW_DIR $MAIN_WWW_DIR/usbkey ;;
+		pro)
+			[ -d $PRO_WWW_DIR ] && ln -sf $PRO_WWW_DIR $MAIN_WWW_DIR/pro ;;
+		roadmap)
+			[ -d $ROADMAP_WWW_DIR ] && ln -sf $ROADMAP_WWW_DIR $MAIN_WWW_DIR/roadmap ;;
 		mirror)
-			[ -d $REPOS_DIR/slitaz-dev-tools/mirror-tools/mirror-info ] && cp -a $REPOS_DIR/slitaz-dev-tools/mirror-tools/mirror-info $MAIN_WWW_DIR
-			[ -d $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz ] && cp -a $REPOS_DIR/slitaz-dev-tools/mirror-tools/slitaz $MAIN_WWW_DIR
-			[ -d $MAIN_WWW_DIR/slitaz/mirror/packages ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/packages
-			[ -d $PKGDIR ] && ln -sf $PKGDIR $MAIN_WWW_DIR/slitaz/mirror/packages/$version
-			[ -d /var/www/slitaz ] || ln -sf $MAIN_WWW_DIR/slitaz /var/www/slitaz
+			[ -d $MIRROR_INFO_WWW_DIR ] && cp -a $MIRROR_INFO_WWW_DIR  $MAIN_WWW_DIR/mirror-info
+			[ -d $MIRROR_WWW_DIR ] && cp -a $MIRROR_WWW_DIR $MAIN_WWW_DIR/mirror
+			[ -d $MAIN_WWW_DIR/mirror/packages ] || mkdir -p $MAIN_WWW_DIR/mirror/packages
+			[ -d $PKGDIR ] && ln -sf $PKGDIR $MAIN_WWW_DIR/mirror/packages/$version
+			[ -d /var/www/slitaz ] || mkdir -p /var/www/slitaz
+			[ -d /var/www/slitaz/mirror ] || ln -sf $MAIN_WWW_DIR/mirror /var/www/slitaz/mirror
+			[ -d /var/www/mirror ] || ln -sf $MAIN_WWW_DIR/mirror /var/www/mirror
 			[ -d /var/www/mirror-info ] || ln -sf $MAIN_WWW_DIR/mirror-info /var/www/mirror-info
 			[ -d $MAIN_WWW_DIR/mirror-info/pics ] || mkdir -p $MAIN_WWW_DIR/mirror-info/pics
 			[ -d $MAIN_WWW_DIR/mirror-info/pics/rrd ] || ln -sf $MAIN_WWW_DIR/pics/rrd $MAIN_WWW_DIR/mirror-info/pics/rrd
+			[ -f $REPOS_DIR/slitaz-forge/mirror/files/etc/rsyncd.conf ] && cp -a $REPOS_DIR/slitaz-forge/mirror/files/etc/rsyncd.conf /etc/rsyncd.conf
+			[ -f $REPOS_DIR/slitaz-forge/mirror/files/etc/rsyncd.motd ] && cp -a $REPOS_DIR/slitaz-forge/mirror/files/etc/rsyncd.motd /etc/rsyncd.motd
+			[ -f $REPOS_DIR/slitaz-forge/mirror/files/usr/bin/chkfilelist ] && cp -a $REPOS_DIR/slitaz-forge/mirror/files/usr/bin/chkfilelist /usr/bin/chkfilelist
 			if [ -f /usr/bin/makegraphs ]; then
 				[ -f $MAIN_WWW_DIR/pics/makegraphs ] || cp -a /usr/bin/makegraphs $MAIN_WWW_DIR/pics/makegraphs
 				if [ ! $(grep -l "$MAIN_WWW_DIR/pics/makegraphs" $CRON_FILE) ]; then
@@ -255,8 +261,8 @@
 					mkdir -p $dirlog
 				fi
 			done
-			[ -d $MAIN_WWW_DIR/$b/pics ] || mkdir -p $MAIN_WWW_DIR/$b/pics
-			[ -d $MAIN_WWW_DIR/$b/pics/rrd ] || ln -sf $MAIN_WWW_DIR/pics/rrd $MAIN_WWW_DIR/$b/pics/rrd
+			[ -d $MAIN_WWW_DIR/$b/images ] || mkdir -p $MAIN_WWW_DIR/$b/images
+			[ -d $MAIN_WWW_DIR/$b/graphs/rrd ] || ln -sf $MAIN_WWW_DIR/graphs/rrd $MAIN_WWW_DIR/$b/images/rrd
 			if [ -f /usr/share/awstats/extras/update ]; then
 				if [ ! $(grep -l "/usr/share/awstats/extras/update" $CRON_FILE) ]; then
 					echo "# Update Web stats" >> $CRON_FILE
@@ -273,6 +279,7 @@
 		;;
 		hg)
 			[ -d $MAIN_WWW_DIR/hg ] || mkdir -p $MAIN_WWW_DIR/hg
+			[ -d $REPOS_DIR/slitaz-dev-tools/slitaz-mercurial-style ] && cp -a $REPOS_DIR/slitaz-dev-tools/slitaz-mercurial-style/* $PYTHON_LIB/site-packages/mercurial
 			[ -f /usr/share/examples/mercurial/hgwebdir.cgi ] && cp -a /usr/share/examples/mercurial/hgwebdir.cgi $MAIN_WWW_DIR/hg
 			[ -f /usr/share/examples/mercurial/hgwebdir.cgi ] && cp -a /usr/share/examples/mercurial/hgwebdir.cgi $MAIN_WWW_DIR/hg/hgwebdir.py
 			[ -f $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config ] && cp -a $REPOS_DIR/slitaz-forge/tank/files/etc/mercurial/hgweb.config /etc/mercurial
@@ -327,6 +334,7 @@
 				mkdir -p $MAIN_WWW_DIR/piratebox/share
 				chmod -R 777 $MAIN_WWW_DIR/piratebox/share
 			fi
+			echo "<date>00:00:00</date>&nbsp;&nbsp;<name>PirateBox:</name>&nbsp;&nbsp;&nbsp;<data class='def'>Chat and share files anonymously!</data><br>" > $MAIN_WWW_DIR/piratebox/cgi-bin/data.pso
 			;;
 		linuxgazette)
 			#if [ -d /repos/linuxgazette ]; then
@@ -427,12 +435,13 @@
 up_src_links() {
 	local i
 	if [ -d $SRCDIR ]; then
-		[ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages ] && rm -rf $MAIN_WWW_DIR/slitaz/mirror/sources/packages
+		[ -d $MAIN_WWW_DIR/mirror/sources/packages ] && rm -rf $MAIN_WWW_DIR/mirror/sources/packages
 		for i in $(ls $SRCDIR); do
-			[ -d $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1} ] || mkdir -p $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}
-			[ -f $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i ] || ln -sf $SRCDIR/$i $MAIN_WWW_DIR/slitaz/mirror/sources/packages/${i:0:1}/$i
+			[ -d $MAIN_WWW_DIR/mirror/sources/packages/${i:0:1} ] || mkdir -p $MAIN_WWW_DIR/mirror/sources/packages/${i:0:1}
+			[ -f $MAIN_WWW_DIR/mirror/sources/packages/${i:0:1}/$i ] || ln -sf $SRCDIR/$i $MAIN_WWW_DIR/mirror/sources/packages/${i:0:1}/$i
 		done
 	fi
+	[ -f /usr/bin/chkfilelist ] && /usr/bin/chkfilelist
 }
 
 case "$COMMAND" in 
@@ -446,9 +455,11 @@
 		done
 		#echo "127.0.0.1 localhost $(cat /etc/hostname)" > /etc/hosts
 		[ "$IP_ADDR" == "127.0.0.1" ] && echo "127.0.0.1 tazpanel.slitaz.org" >> /etc/hosts
-		for hostname in $ADDRESS; do 
+		for hostname in $ADDRESS; do
 				if [ "$hostname" = "www.slitaz.org" ]; then
 					echo "$IP_ADDR $hostname slitaz.org" >> /etc/hosts
+				elif [ "$hostname" = "pro.slitaz.org" ]; then
+					echo "$IP_ADDR $hostname slitaz.pro" >> /etc/hosts
 				else
 					echo "$IP_ADDR $hostname" >> /etc/hosts
 				fi
@@ -462,8 +473,8 @@
 				echo "dhcp-option=option:router,$ROUTER_IP" >> /etc/dnsmasq.conf
 			fi
 		fi
-		if [ -d "$SLITAZ_DIR/$version/packages" ]; then
-			echo "$SLITAZ_DIR/$version/packages" > $LOCALSTATE/mirror
+		if [ -d "$SLITAZ_HOME/$version/packages" ]; then
+			echo "$SLITAZ_HOME/$version/packages" > $LOCALSTATE/mirror
 		fi
 		if [ "$COMMAND" = "tank-only" ]; then
 			[ -f $VHOST_TANK_FILE ] && ln -sf $VHOST_TANK_FILE /etc/lighttpd/vhosts.conf
diff -r 0c446964a0d0 -r 87aa12b14afa initramfs/usr/bin/makegraphs
--- a/initramfs/usr/bin/makegraphs	Sun Mar 04 01:55:59 2012 -0500
+++ b/initramfs/usr/bin/makegraphs	Tue Apr 24 18:55:39 2012 +0000
@@ -1,14 +1,13 @@
 #!/bin/sh
-#*/5  * * * * /var/www/mirror-info/bin/makegraphs >/dev/null
+#*/5  * * * * /home/slitaz/www/tank/lib/makegraphs >/dev/null
 
 # RRD database directory
-rrdlog="/var/spool/rrd"
+rrdlog="/home/slitaz/www/graphs/log/rrd"
 
 # Images directory
-rrdgraph="/var/www/vhosts/pics/rrd"
+rrdgraph="/home/slitaz/www/graphs/images/rrd"
 
 # Colors
-#rrdcolors="--color SHADEA#EAE9EE --color SHADEB#EAE9EE --color BACK#EAE9EE" 
 rrdcolors="--color SHADEA#FFFFFF --color SHADEB#FFFFFF --color BACK#FFFFFF" 
 rrdgraphargs="-aPNG -i -z --alt-y-grid -w 600 -h 100 -r $rrdcolors"
 
@@ -18,20 +17,21 @@
 updatecpudata() {
 	[ -e "$rrdlog/cpu.rrd" ] || rrdtool create $rrdlog/cpu.rrd --step=300 \
 			DS:user:COUNTER:600:0:500000000 \
+			DS:nice:COUNTER:600:0:500000000 \
 			DS:system:COUNTER:600:0:500000000 \
 			DS:idle:COUNTER:600:0:500000000 \
+			DS:iowait:COUNTER:600:0:500000000 \
+			DS:irq:COUNTER:600:0:500000000 \
+			DS:softirq:COUNTER:600:0:500000000 \
+			DS:celsius:GAUGE:600:0:50000 \
 			RRA:AVERAGE:0.5:1:576  RRA:AVERAGE:0.5:6:672 \
 			RRA:AVERAGE:0.5:24:732 RRA:AVERAGE:0.5:144:1460
-	grep '^cpu' /proc/stat | while read cpu user nice system idle misc; do
-		rrdtool update $rrdlog/cpu.rrd -t user:system:idle \
-			N:$(( $user + $nice )):$system:$idle
-		break
-	done
-
-	[ -e "$rrdlog/cpu2.rrd" ] &&
-	grep '^cpu' /proc/stat | while read cpu user nice system idle misc; do
-		rrdtool update $rrdlog/cpu2.rrd -t nice:user:system:idle \
-			N:$nice:$user:$system:$idle
+	grep '^cpu' /proc/stat | while read cpu user nice system idle iowait irq softirq misc; do
+		celsius=$(find /sys | grep /temp._input | xargs cat | \
+			awk '{ if ($0 > max) max=$0 } END { print max/1 }')
+		rrdtool update $rrdlog/cpu.rrd \
+			-t celsius:nice:user:system:idle:iowait:irq:softirq \
+			N:$celsius:$nice:$user:$system:$idle:$iowait:$irq:$softirq
 		break
 	done
 }
@@ -39,22 +39,30 @@
 updatecpugraph() {
 	period=$1
 	info="$(grep '^model name' /proc/cpuinfo | cut -d: -f2 \
-		| sed 's/ * / /g' | head -1)"
+		| sed 's/ * / /g' | awk '
+{ s=$0 ; n++ }                    
+END { if (n > 1) printf " %dx",n; print s }')"
 	rrdtool graph "$rrdgraph/cpu-$period.png" --start -1$period \
 		$rrdgraphargs -l 0 -u 100 -t "cpu usage per $period [$info ]" \
 		DEF:user=$rrdlog/cpu.rrd:user:AVERAGE \
 		DEF:system=$rrdlog/cpu.rrd:system:AVERAGE \
 		DEF:idle=$rrdlog/cpu.rrd:idle:AVERAGE \
-		'CDEF:total=user,system,idle,+,+' \
+		DEF:nice=$rrdlog/cpu.rrd:nice:AVERAGE \
+		DEF:celsius=$rrdlog/cpu.rrd:celsius:AVERAGE \
+		'CDEF:total=user,system,idle,nice,+,+,+' \
 		'CDEF:userpct=100,user,total,/,*' \
 		'CDEF:systempct=100,system,total,/,*' \
 		'CDEF:idlepct=100,idle,total,/,*' \
+		'CDEF:nicepct=100,nice,total,/,*' \
+		'CDEF:temp=celsius,1000,/' \
 		'AREA:userpct#0000FF:user cpu usage' \
+		'STACK:nicepct#C0C0FF:nice cpu usage' \
 		'STACK:systempct#FF0000:system cpu usage' \
-		'STACK:idlepct#00FF00:idle cpu usage\j'
+		'STACK:idlepct#00FF00:idle cpu usage' \
+		'LINE1:temp#000000:temperature\g' \
+		'GPRINT:temp:MAX:max %2.0lfC\j'
 }
 
-
 updatememgraph() {
 	period=$1
 	info="$(free | awk '\
@@ -115,15 +123,15 @@
 
 	while read tag count unit; do
 		case "$tag" in
-		MemTotal:)  memtotal=$(($count * 1024));;
-		MemFree:)   memfree=$(($count * 1024))
+		MemTotal:)  memtotal=$count;;
+		MemFree:)   memfree=$count
 			    memused=$(($memtotal - $memfree))
 			    memshared=0;;
-		MemShared:) memshared=$(($count * 1024));;
-		Buffers:)   membuffers=$(($count * 1024));;
-		Cached:)    memcache=$(($count * 1024));;
-		SwapTotal:) swaptotal=$(($count * 1024));;
-		SwapFree:)  swapfree=$(($count * 1024))
+		MemShared:) memshared=$count;;
+		Buffers:)   membuffers=$count;;
+		Cached:)    memcache=$count;;
+		SwapTotal:) swaptotal=$count;;
+		SwapFree:)  swapfree=$count
 			    swapused=$(( $swaptotal - $swapfree));;
 		esac
 	done < /proc/meminfo
@@ -151,6 +159,10 @@
 	info="[ $(fdisk -l 2> /dev/null | grep "^Disk $2:" | \
 		  sed "s|Disk $2: \(.*\), .*|\1|") ]"
 	if [ -e /sys/block/${2#/dev/}/device/iodone_cnt ]; then
+	err=$(printf "%d\n" $(cat /sys/block/${2#/dev/}/device/ioerr_cnt) )
+	done=$(printf "%d\n" $(cat /sys/block/${2#/dev/}/device/iodone_cnt) )
+	rate=$(echo | awk "BEGIN { printf \"%.0e\\n\",$err/$done }")
+	[ $err -eq 0 ] &&  rate="0"
 #		--right-axis-label "I/O state %"
 	rrdtool graph "$rrdgraph/disk-$period.png" --start -1$period \
 		$rrdgraphargs -t "disk access per $period $info" \
@@ -164,10 +176,12 @@
 		"CDEF:writepct=100,write,$maxdisk,/,*" \
 		"CDEF:errpct=100,err,req,/,*" \
 		"CDEF:donepct=100,done,req,/,*" \
+		"CDEF:errrate=err,done,/" \
 		'AREA:readpct#0000FF:sectors read from disk' \
+		"COMMENT:I/O error rate $rate" \
 		'STACK:writepct#00FF00:sectors written to disk' \
-		'LINE2:donepct#FFFF00:I/O complete' \
-		'LINE2:errpct#FF0000:I/O error\j'
+		'LINE2:donepct#FFFF00:% I/O complete' \
+		'LINE2:errpct#FF0000:% I/O error\j'
 	else
 	rrdtool graph "$rrdgraph/disk-$period.png" --start -1$period \
 		$rrdgraphargs -t "disk access per $period $info" \
@@ -219,6 +233,8 @@
 		DEF:incoming=$rrdlog/$interface.rrd:incoming:AVERAGE \
 		DEF:outgoing=$rrdlog/$interface.rrd:outgoing:AVERAGE \
 		'AREA:incoming#00FF00:incoming traffic' \
+		'GPRINT:incoming:MAX:max input%8.3lf %sBps' \
+		'GPRINT:outgoing:MAX:max output%8.3lf %sBps' \
 		'LINE1:outgoing#0000FF:outgoing traffic\j'
 }
 
@@ -274,8 +290,9 @@
 	for i in /dev/* ; do 
 		[ $(stat -c "%02t%02T" $i) == $d ] || continue
 		echo $i
-		break
+		return
 	done
+	df $1 | sed '$!d;s/ .*$//'
 }
 
 ###
diff -r 0c446964a0d0 -r 87aa12b14afa initramfs/usr/bin/slitaz-modular
--- a/initramfs/usr/bin/slitaz-modular	Sun Mar 04 01:55:59 2012 -0500
+++ b/initramfs/usr/bin/slitaz-modular	Tue Apr 24 18:55:39 2012 +0000
@@ -8,11 +8,12 @@
 CDNAME="slitaz"
 QUIET="y"
 FORCE="y"
-export LABEL="slitaz_${1}_$(date +%Y%m)"
+export LABEL="slitaz_$1_$(date +%F)"
+VOLUME_ID="$LABEL"
 PUBLISHER="Slitaz-$1"
 APPLICATION="Slitaz-$1"
 EXT="xz"
-COMPRESSION="xz -Xbcj x86"
+COMPRESSION="-comp xz -Xbcj x86"
 WORKING="$PROFILE/working"
 INITRAMFS="$WORKING/initramfs"
 UNION="$WORKING/union"
@@ -42,8 +43,9 @@
 SOURCES_REPOSITORY="$LOCAL_REPOSITORY/src"
 HG_LIST="flavors flavors-stable slitaz-base-files slitaz-boot-scripts \
  slitaz-configs slitaz-dev-tools slitaz-doc slitaz-doc-wiki-data slitaz-forge \
- slitaz-modular slitaz-pizza slitaz-tools tazlito tazpanel tazpkg tazusb tazweb \
- tazwok website wok wok-stable wok-tiny wok-undigest"
+ slitaz-modular slitaz-pizza slitaz-tools slitaz-vz ssfs tazlito tazpanel \
+ tazpkg tazusb tazweb tazwok tiny-slitaz website wok wok-stable \
+ wok-tiny wok-undigest"
 
 error () { echo -e "\033[1;31;40m!!! \033[1;37;40m$@\033[1;0m"; }
 warn ()  { echo -e "\033[1;33;40m*** \033[1;37;40m$@\033[1;0m"; }
@@ -82,7 +84,7 @@
 
 look_for_dep()
 {
-		grep -m1 ^$1$'\t' $INCOMING_REPOSITORY/wok-depends.txt | \
+		grep -m1 ^$1$'\t' $INCOMING_REPOSITORY/depends.txt | \
 			cut -f 2 | sed 's|^[ \t]*||g' | sed 's| |\n|g' | sed '/^$/d'
 }
 
@@ -117,7 +119,7 @@
 
 	info "Making bootable image"
 	cat "$BASEDIR/initramfs/initramfs.list" | grep -v "^#" | while read pkgname; do
-		if [ ! -f ${INITRAMFS}/var/lib/tazpkg/installed/${pkgname}/files.list ]; then
+		if [ ! -f ${INITRAMFS}${INSTALLED}/${pkgname}/files.list ]; then
 			tazpkg get-install $pkgname --root=$INITRAMFS | tee -a $LOG/initramfs.log
 			if [ ! $(grep -l "^${pkgname}$" $ISODIR/packages-order.txt) ]; then
 				echo "$pkgname" >> $ISODIR/packages-order.txt
@@ -197,7 +199,7 @@
 		done
 		[ -d $CUR_DIR ] || mkdir $CUR_DIR
 		md5sum $PKGNAME.tazpkg > $PKGNAME/fs/$INSTALLED/$PACKAGE/pkgmd5
-		create_module $PKGNAME/fs $CUR_DIR/$PKGNAME.$EXT /var/lib/tazpkg/installed
+		create_module $PKGNAME/fs $CUR_DIR/$PKGNAME.$EXT $INSTALLED
 	fi
 }
 
@@ -224,7 +226,7 @@
 	#	fi
 	#fi
 	[ -f "$2" ] && rm -f "$2" # overwrite, never append to existing file
-	mksquashfs "$1" "$2" -b 256K -comp $COMPRESSION >/dev/null
+	mksquashfs "$1" "$2" -b 256K $COMPRESSION >/dev/null
 	if [ $? -ne 0 ]; then return 1; fi
 	chmod a-wx "$2" # remove execute and write attrib
 	chmod a+r "$2" # add read for everyone
@@ -314,7 +316,7 @@
 	fi
 	
 	[ -d $INCOMING_REPOSITORY ] || mkdir -p $INCOMING_REPOSITORY
-	tazwok gen-wok-db --WOK=$SLITAZ_DIR/repos/wok
+	cooker gen-wok-db $SLITAZ_DIR/repos/wok-tank
 
 	local i
 	for flavors in $FLAVORS_LIST; do
@@ -328,56 +330,114 @@
 backup_pkg() {
 	if [ "${BACKUP_PACKAGES}" = "yes" ]; then
 		[ -d $PKGISO_DIR ] && rm -r $PKGISO_DIR
+		[ -f $LOG/backup_pkg.log ] && rm -rf $LOG/backup_pkg.log
 		mkdir -p $PKGISO_DIR
-		WOK=${HG_DIR}/wok/home/slitaz/repos/wok
 		info "Making cooking list based installed packages in union"
 		# this is to filter out packages build by get- 
 		# packages that don't exist in repo or wok
-		cat $ISODIR/packages-order.txt | while read pkg; do
+		cat $ISODIR/packages-installed.list | while read pkg; do
 			if [ ! -f $WOK/$pkg/receipt ]; then
-				sed -i "s|^${pkg}$||g" $ISODIR/packages-order.txt
+				sed -i "s|$pkg||g" $ISODIR/packages-installed.list
 			fi
 		done
-		tazwok gen-cooklist $ISODIR/packages-order.txt > $ISODIR/cookorder.list
-		[ -f $INCOMING_REPOSITORY/wok-wanted.txt ] || tazwok gen-wok-db
+		local pkg wanted rwanted pkg_VERSION incoming_pkg_VERSION cache_pkg_VERSION
+		cook gen-cooklist $ISODIR/packages-installed.list > $ISODIR/cookorder.list
+		[ -f $PKGS/fullco.txt ] || cook gen-wok-db $WOKHG
+		cookorder=$ISODIR/cookorder.list
+		[ "$BACKUP_ALL" = "yes" ] && cookorder=$PKGS/fullco.txt
+		[ "$BACKUP_ALL" = "yes" ] && cp -a $cookorder $PKGISO_DIR/fullco.txt
+		CACHE_REPOSITORY="$CACHE_DIR/$(cat /etc/slitaz-release)/packages"
+		[ -f $PROFILE/list/backupall.banned ] && cp -a $PROFILE/list/backupall.banned $ISODIR/blocked
 		
-		CACHE_REPOSITORY="$CACHE_DIR/$(cat /etc/slitaz-release)/packages"
-
-		cat $ISODIR/cookorder.list | grep -v "^#" | while read pkg; do
-			rwanted=$(grep $'\t'$pkg$ $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 1)
+		cat $cookorder | grep -v "^#" | while read pkg; do
+			[ -f "$WOK/$pkg/receipt" ] || continue
+			unset rwanted pkg_VERSION incoming_pkg_VERSION cache_pkg_VERSION
+			rwanted=$(grep $'\t'$pkg$ $PKGS/wanted.txt | cut -f 1)
 			pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $PACKAGES_REPOSITORY/packages.txt | \
 				tail -1 | sed 's/ *//')"
 			incoming_pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $INCOMING_REPOSITORY/packages.txt | \
 				tail -1 | sed 's/ *//')"
+			cache_pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $LOCALSTATE/packages.txt | \
+					tail -1 | sed 's/ *//')"
 			for wanted in $rwanted; do
+				if [ -f $PROFILE/list/backupall.banned ]; then
+					if [ "$BACKUP_ALL" = "yes" ]; then
+						[ $(grep -l "^$wanted$" $PROFILE/list/backupall.banned) ] && continue
+					fi
+				fi
+
 				if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then
+					info "Backing up $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
 					ln -sf $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$incoming_pkg_VERSION.tazpkg
 				elif [ -f $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg ]; then
+					info "Backing up $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
 					ln -sf $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
-				elif [ -f $CACHE_REPOSITORY/$Wanted-$pkg_VERSION.tazpkg ]; then
-					ln -sf $CACHE_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
+				elif [ -f $CACHE_REPOSITORY/$Wanted-$cache_pkg_VERSION.tazpkg ]; then
+					info "Backing up $CACHE_REPOSITORY/$wanted-$cache_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
+					ln -sf $CACHE_REPOSITORY/$wanted-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$cache_pkg_VERSION.tazpkg
 				fi
 			done
-		
-			for i in $(ls $WOK/$pkg/receipt); do
-				unset SOURCE TARBALL WANTED PACKAGE VERSION pkg_VERSION COOK_OPT
-				source $i
-				pkg_VERSION="$(grep -m1 -A1 ^$PACKAGE$ $PACKAGES_REPOSITORY/packages.txt | \
-					tail -1 | sed 's/ *//')"
-				incoming_pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $INCOMING_REPOSITORY/packages.txt | \
-					tail -1 | sed 's/ *//')"
-				[ "$WGET_URL" ] || continue
-				if [ -f $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg ]; then
-					ln -sf $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$incoming_pkg_VERSION.tazpkg
-				elif [ -f $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg ]; then
-					ln -sf $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg
-				elif [ -f $CACHE_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg ]; then
-					ln -sf $CACHE_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg
+			
+			if [ -f $PROFILE/list/backupall.banned ]; then
+				if [ "$BACKUP_ALL" = "yes" ]; then
+					[ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue
 				fi
-			done
+			fi
+			
+			if [ -f $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg ]; then
+				info "Backing up $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
+				ln -sf $INCOMING_REPOSITORY/$pkg-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$incoming_pkg_VERSION.tazpkg
+			elif [ -f $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg ]; then
+				info "Backing up $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
+				ln -sf $PACKAGES_REPOSITORY/$pkg-$pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$pkg_VERSION.tazpkg
+			elif [ -f $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg ]; then
+				info "Backing up $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg" | tee -a $LOG/backup_pkg.log
+				ln -sf $CACHE_REPOSITORY/$pkg-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$pkg-$cache_pkg_VERSION.tazpkg
+			fi
 		done
 		
-		[ -d $PKGISO_DIR ] && tazwok gen-list $PKGISO_DIR
+		if [ "$SRC_PKG" = "yes" ]; then
+			cat $cookorder | grep -v "^#" | while read pkg; do
+				[ -f "$WOK/$pkg/receipt" ] || continue
+				[ $(grep ^$pkg$ $PROFILE/list/srcpkg.banned) ] && continue
+				for i in $(grep -l "^SOURCE=\"$pkg\"" $WOK/*/receipt); do
+					unset SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT WGET_URL
+					unset pkg_VERSION incoming_pkg_VERSION cache_pkg_VERSION src_pkg src_ver 
+					#source $i
+					src_pkg=$(grep ^PACKAGE= $WOK/$pkg/receipt | cut -d "=" -f 2 | sed -e 's/"//g')
+					src_ver=$(grep ^VERSION= $WOK/$pkg/receipt | cut -d "=" -f 2 | sed -e 's/"//g')
+					[ "$VERSION" = "$src_ver" ] || continue
+					pkg_VERSION="$(grep -m1 -A1 ^$src_pkg$ $PACKAGES_REPOSITORY/packages.txt | \
+						tail -1 | sed 's/ *//')"
+					incoming_pkg_VERSION="$(grep -m1 -A1 ^$src_pkg$ $INCOMING_REPOSITORY/packages.txt | \
+						tail -1 | sed 's/ *//')"
+					cache_pkg_VERSION="$(grep -m1 -A1 ^$src_pkg$ $LOCALSTATE/packages.txt | \
+						tail -1 | sed 's/ *//')"
+					rwanted=$(grep $'\t'$src_pkg$ $PKGS/wanted.txt | cut -f 1)
+					
+					for wanted in $rwanted; do
+						if [ -f $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg ]; then
+							ln -sf $INCOMING_REPOSITORY/$wanted-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$incoming_pkg_VERSION.tazpkg
+						elif [ -f $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg ]; then
+							ln -sf $PACKAGES_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
+						elif [ -f $CACHE_REPOSITORY/$Wanted-$pkg_VERSION.tazpkg ]; then
+							ln -sf $CACHE_REPOSITORY/$wanted-$pkg_VERSION.tazpkg $PKGISO_DIR/$wanted-$pkg_VERSION.tazpkg
+						fi
+					done
+					
+					if [ -f $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg ]; then
+						ln -sf $INCOMING_REPOSITORY/$PACKAGE-$incoming_pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$incoming_pkg_VERSION.tazpkg
+					elif [ -f $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg ]; then
+						ln -sf $PACKAGES_REPOSITORY/$PACKAGE-$pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg
+					elif [ -f $CACHE_REPOSITORY/$PACKAGE-$cache_pkg_VERSION.tazpkg ]; then
+						ln -sf $CACHE_REPOSITORY/$PACKAGE-$cache_pkg_VERSION.tazpkg $PKGISO_DIR/$PACKAGE-$cache_pkg_VERSION.tazpkg
+					fi
+				done
+			done
+		fi
+		
+		[ -f $LOG/packages-gen-list.log ] && rm -f $LOG/packages-gen-list.log
+		[ -d $PKGISO_DIR ] && cook pkgdb $PKGISO_DIR | tee -a $LOG/packages-gen-list.log
 	fi
 	
 }
@@ -385,46 +445,68 @@
 backup_src() {
 
 	if [ "${BACKUP_PACKAGES}" = "yes" -a "${BACKUP_SOURCES}" = "yes" ]; then
-			[ -d $SOURCES_REPOSITORY ] || mkdir -p $SOURCES_REPOSITORY
-			[ -d $SRCISO_DIR ] && rm -r $SRCISO_DIR
-			mkdir -p $SRCISO_DIR
-			WOK=${HG_DIR}/wok/home/slitaz/repos/wok
-			cat $ISODIR/cookorder.list | grep -v "^#"| while read pkg; do
-				#rwanted=$(grep $'\t'$pkg$ $INCOMING_REPOSITORY/wok-wanted.txt | cut -f 1)
-				for i in $(ls $WOK/$pkg/receipt); do
-					unset SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT
-					source $i
-					{ [ ! "$TARBALL" ] || [ ! "$WGET_URL" ] ; } && continue
-					if [ ! -f "$SOURCES_REPOSITORY/$TARBALL" ] && \
-						[ ! -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ]; then
-						tazwok get-src $PACKAGE --nounpack
-						if [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
-							ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
-						elif [ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ]; then
-							ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
-						fi
-					else
-						[ -f "$SOURCES_REPOSITORY/$TARBALL" ] && ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
-						[ -f "$SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma" ] && ln -sf $SOURCES_REPOSITORY/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma $SRCISO_DIR/${SOURCE:-$PACKAGE}-$VERSION.tar.lzma
+		[ -d $SOURCES_REPOSITORY ] || mkdir -p $SOURCES_REPOSITORY
+		[ -d $SRCISO_DIR ] && rm -r $SRCISO_DIR
+		mkdir -p $SRCISO_DIR
+		local pkg cookorder pkg_VERSION
+		cookorder=$ISODIR/cookorder.list
+		[ "$BACKUP_ALL" = "yes" ] && cookorder=$PKGS/fullco.txt
+		[ -f $LOG/cook-getsrc.log ] && rm -rf $LOG/cook-getsrc.log
+		[ -f $LOG/backup_src.log ] && rm -rf $LOG/backup_src.log
+		cat $cookorder | grep -v "^#" | while read pkg; do
+			if [ -f $PROFILE/list/backupall.banned ]; then
+				if [ "$BACKUP_ALL" = "yes" ]; then
+					[ $(grep -l "^$pkg$" $PROFILE/list/backupall.banned) ] && continue
+				fi
+			fi
+			unset PATCH SOURCE TARBALL WANTED PACKAGE VERSION COOK_OPT WGET_URL KBASEVER
+			unset pkg_VERSION
+			[ -f $WOK/$pkg/receipt ] || continue
+			source $WOK/$pkg/receipt
+			[ "$WGET_URL" ] || continue
+			[ "$TARBALL" ] || continue
+			pkg_VERSION="$(grep -m1 -A1 ^$pkg$ $PKGISO_DIR/packages.txt | \
+				tail -1 | sed 's/ *//')"
+			[ -f "$PKGISO_DIR/$PACKAGE-$pkg_VERSION.tazpkg" ] || continue
+			#{ [ ! "$TARBALL" ] || [ ! "$WGET_URL" ] ; } && continue
+			LZMA_TARBALL="${SOURCE:-$PACKAGE}-${KBASEVER:-$VERSION}.tar.lzma"
+			if [ "$PATCH" ]; then
+				if [ -f "$SOURCES_REPOSITORY/$(basename $PATCH)" ]; then
+					info "Backing up $SOURCES_REPOSITORY/$(basename $PATCH)" | tee -a $LOG/backup_src.log
+					ln -sf $SOURCES_REPOSITORY/$(basename $PATCH) $SRCISO_DIR/$(basename $PATCH)
+				else
+					cook $PACKAGE --getsrc | tee -a $LOG/cook-getsrc.log
+					if [ -f "$SOURCES_REPOSITORY/$(basename $PATCH)" ]; then
+						info "Backing up $SOURCES_REPOSITORY/$(basename $PATCH)" | tee -a $LOG/backup_src.log
+						ln -sf $SOURCES_REPOSITORY/$(basename $PATCH) $SRCISO_DIR/$(basename $PATCH)
 					fi
-				done
-			done
-			cd $SRCISO_DIR
-			info "Make md5sum file for sources"
-			find * -not -type d | grep -v md5sum | xargs md5sum > md5sum
-			cd $WORKING
+				fi
+			fi
+			if [ -f "$SOURCES_REPOSITORY/$LZMA_TARBALL" ]; then
+				info "Backing up $SOURCES_REPOSITORY/$LZMA_TARBALL" | tee -a $LOG/backup_src.log
+				ln -sf $SOURCES_REPOSITORY/$LZMA_TARBALL $SRCISO_DIR/$LZMA_TARBALL
+			elif [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
+				info "Backing up $SOURCES_REPOSITORY/$TARBALL" | tee -a $LOG/backup_src.log
+				ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
+			else
+				cook $PACKAGE --getsrc | tee -a $LOG/cook-getsrc.log
+				if [ -f "$SOURCES_REPOSITORY/$TARBALL" ]; then
+					info "Backing up $SOURCES_REPOSITORY/$TARBALL" | tee -a $LOG/backup_src.log
+					ln -sf $SOURCES_REPOSITORY/$TARBALL $SRCISO_DIR/$TARBALL
+				elif [ -f "$SOURCES_REPOSITORY/$LZMA_TARBALL" ]; then
+					info "Backing up $SOURCES_REPOSITORY/$LZMA_TARBALL" | tee -a $LOG/backup_src.log
+					ln -sf $SOURCES_REPOSITORY/$LZMA_TARBALL $SRCISO_DIR/$LZMA_TARBALL
+				fi
+			fi
+		done
+		cd $SRCISO_DIR
+		info "Make md5sum file for sources"
+		find * -not -type d | grep -v md5sum | xargs md5sum > md5sum
+		cd $WORKING
 	fi
 	
 }
 
-backup_all()
-{
-	if [ "${BACKUP_ALL}" = "yes" ]; then
-		[ -d $SRCISO_DIR ] || ln -sf $SOURCES_REPOSITORY $SRCISO_DIR
-		[ -d $PKGISO_DIR ] || ln -sf $PACKAGES_REPOSITORY $PKGISO_DIR
-	fi
-}
-
 imgcommon () {
 	
 	build_modules
@@ -438,16 +520,20 @@
 		fi
 	fi
 	
-	[ -d $SRCISO_DIR ] && rm -r $SRCISO_DIR
-	[ -d $PKGISO_DIR ] && rm -r $PKGISO_DIR
-	
-	if [ -d ${HG_DIR}/wok ]; then
-		backup_pkg
-		backup_src
+	if [ "$DONT_UPDATE_MIRROR" = "no" ]; then
+		[ -d $SRCISO_DIR ] && rm -r $SRCISO_DIR
+		[ -d $PKGISO_DIR ] && rm -r $PKGISO_DIR	
+		if [ -d ${HG_DIR}/wok-tank/repos/wok-tank/.hg ]; then
+			WOK=${HG_DIR}/wok-tank/repos/wok-tank
+			backup_pkg
+			backup_src
+		elif [ -d ${HG_DIR}/wok/repos/wok/.hg ]; then
+			WOK=${HG_DIR}/wok/repos/wok
+			backup_pkg
+			backup_src
+		fi
 	fi
 	
-	backup_all
-	
 	info "====> Making bootable image"
 
 	# Sanity checks
@@ -496,11 +582,11 @@
 	fi
 
 	info "Creating ISO image..."
-	genisoimage -R -l -f -o $IMGNAME -b boot/isolinux/isolinux.bin \
+	genisoimage -R -l -f -V $VOLUME_ID -o $IMGNAME -b boot/isolinux/isolinux.bin \
 	-c boot/isolinux/boot.cat -no-emul-boot -boot-load-size 4 \
 	-uid 0 -gid 0 \
 	-udf -allow-limited-size -iso-level 3 \
-	-V "SliTaz" -input-charset utf-8 -boot-info-table $ISODIR
+	-P $PUBLISHER -input-charset utf-8 -boot-info-table $ISODIR
 	if [ -x /usr/bin/isohybrid ]; then
 		info "Creating hybrid ISO..."
 		isohybrid "${IMGNAME}"