update live-helper config and add gdm3 patched packageHEADmaster

14 files changed, 377 insertions, 229 deletions

diff --git a/.gitignore b/.gitignore
index 0d09b05..ab7ec9b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 .stage/
 binary.iso
+binary-hybrid.iso
 binary.list
 binary.packages
 binary/
diff --git a/Makefile b/Makefile
index 6fa5ab0..5035ea0 100644
--- a/Makefile
+++ b/Makefile
@@ -7,4 +7,4 @@ clean:
 
 
 superclean: clean
-	rm -rf .stage/ binary.* binary/ cache/ chroot/
+	rm -rf .stage/ binary*.* binary/ cache/ chroot/
diff --git a/config/binary b/config/binary
index b60e8f4..6c91f31 100644
--- a/config/binary
+++ b/config/binary
@@ -1,159 +1,158 @@
-# config/binary - options for live-helper(7), binary stage
+# config/binary - options for live-build(7), binary stage
 
-# $LH_BINARY_FILESYSTEM: set image filesystem
+# $LB_BINARY_FILESYSTEM: set image filesystem
 # (Default: fat16)
-LH_BINARY_FILESYSTEM="fat16"
+LB_BINARY_FILESYSTEM="fat16"
 
-# $LH_BINARY_IMAGES: set image type
-# (Default: iso)
-LH_BINARY_IMAGES="iso"
+# $LB_BINARY_IMAGES: set image type
+# (Default: iso-hybrid)
+LB_BINARY_IMAGES="iso-hybrid"
 
-# $LH_BINARY_INDICES: set apt/aptitude generic indices
+# $LB_BINARY_INDICES: set apt/aptitude generic indices
 # (Default: true)
-LH_BINARY_INDICES="true"
+LB_BINARY_INDICES="true"
 
-# $LH_BOOTAPPEND_LIVE: set boot parameters
+# $LB_BOOTAPPEND_LIVE: set boot parameters
 # (Default: empty)
-#LH_BOOTAPPEND_LIVE="quiet vga=791 splash locale=es_ES.UTF-8 keyb=es nonetworking"
-LH_BOOTAPPEND_LIVE="quiet vga=791 splash nonetworking"
+LB_BOOTAPPEND_LIVE="quiet vga=791 splash nonetworking"
 
-# $LH_BOOTAPPEND_INSTALL: set boot parameters
+# $LB_BOOTAPPEND_INSTALL: set boot parameters
 # (Default: empty)
-LH_BOOTAPPEND_INSTALL=""
+LB_BOOTAPPEND_INSTALL="cdrom-detect/try-usb=true"
 
-# $LH_BOOTLOADER: set bootloader
+# $LB_BOOTLOADER: set bootloader
 # (Default: syslinux)
-LH_BOOTLOADER="syslinux"
+LB_BOOTLOADER="syslinux"
 
-# $LH_CHECKSUMS: set checksums
-# (Default: true)
-LH_CHECKSUMS="true"
+# $LB_CHECKSUMS: set checksums
+# (Default: md5)
+LB_CHECKSUMS="md5"
 
-# ${LH_CHROOT_BUILD: control if we build binary images chrooted
+# ${LB_BUILD_WITH_CHROOT: control if we build binary images chrooted
 # (Default: true)
 # DO NEVER, *NEVER*, *N*E*V*E*R* SET THIS OPTION to false.
-LH_CHROOT_BUILD="true"
+LB_BUILD_WITH_CHROOT="true"
 
-# $LH_DEBIAN_INSTALLER: set debian-installer
+# $LB_DEBIAN_INSTALLER: set debian-installer
 # (Default: false)
-LH_DEBIAN_INSTALLER="false"
+LB_DEBIAN_INSTALLER="false"
 
-# $LH_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
+# $LB_DEBIAN_INSTALLER_DISTRIBUTION: set debian-installer suite
 # (Default: empty)
-LH_DEBIAN_INSTALLER_DISTRIBUTION="lenny"
+LB_DEBIAN_INSTALLER_DISTRIBUTION="squeeze"
 
-# $LH_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
+# $LB_DEBIAN_INSTALLER_PRESEEDFILE: set debian-installer preseed filename/url
 # (Default: )
-LH_DEBIAN_INSTALLER_PRESEEDFILE=""
+LB_DEBIAN_INSTALLER_PRESEEDFILE=""
 
-# $LH_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
-# (Default: true)
-LH_DEBIAN_INSTALLER_GUI="true"
+# $LB_DEBIAN_INSTALLER_GUI: toggle use of GUI debian-installer
+# (Default: false)
+LB_DEBIAN_INSTALLER_GUI="false"
 
-# $LH_ENCRYPTION: set encryption
+# $LB_ENCRYPTION: set encryption
 # (Default: false)
-LH_ENCRYPTION="false"
+LB_ENCRYPTION="false"
 
-# $LH_GRUB_SPLASH: set custom grub splash
+# $LB_GRUB_SPLASH: set custom grub splash
 # (Default: empty)
-LH_GRUB_SPLASH=""
+LB_GRUB_SPLASH=""
 
-# $LH_HOSTNAME: set hostname
-# (Default: tcos-server)
-LH_HOSTNAME="tcos-server"
+# $LB_HOSTNAME: set hostname
+# (Default: debian)
+LB_HOSTNAME="tcos-server"
 
-# $LH_ISO_APPLICATION: set iso author
+# $LB_ISO_APPLICATION: set iso author
 # (Default: Debian Live)
-LH_ISO_APPLICATION="TCOS Debian Live"
+LB_ISO_APPLICATION="TCOS Debian Live"
 
-# $LH_ISO_PREPARER: set iso preparer
-# (Default: live-helper 2.0~a8-1; http://packages.qa.debian.org/live-helper)
-LH_ISO_PREPARER="live-helper 2.0~a8-1; http://packages.qa.debian.org/live-helper"
+# $LB_ISO_PREPARER: set iso preparer
+# (Default: live-build $VERSION; http://packages.qa.debian.org/live-build)
+LB_ISO_PREPARER="live-build $VERSION; http://packages.qa.debian.org/live-build"
 
-# $LH_ISO_PUBLISHER: set iso publisher
-# (Default: Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org)
-LH_ISO_PUBLISHER="Debian Live project; http://debian-live.alioth.debian.org/; debian-live@lists.debian.org"
+# $LB_ISO_PUBLISHER: set iso publisher
+# (Default: Debian Live project; http://live.debian.net/; debian-live@lists.debian.org)
+LB_ISO_PUBLISHER="Debian Live project; http://live.debian.net/; debian-live@lists.debian.org"
 
-# $LH_ISO_VOLUME: set iso volume (max 32 chars)
-# (Default: Debian TCOS 20100307-17:57)
-LH_ISO_VOLUME="Debian TCOS 20100307-17:57"
+# $LB_ISO_VOLUME: set iso volume (max 32 chars)
+# (Default: Debian squeeze $(date +%Y%m%d-%H:%M))
+LB_ISO_VOLUME="Debian TCOS $(date +%Y%m%d-%H:%M)"
 
-# $LH_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
+# $LB_JFFS2_ERASEBLOCK: set jffs2 eraseblock size
 # (Default: unset)
-LH_JFFS2_ERASEBLOCK=""
+LB_JFFS2_ERASEBLOCK=""
 
-# $LH_MEMTEST: set memtest
+# $LB_MEMTEST: set memtest
 # (Default: memtest86+)
-LH_MEMTEST="memtest86+"
+LB_MEMTEST="memtest86+"
 
-# $LH_WIN32_LOADER: set win32-loader
+# $LB_WIN32_LOADER: set win32-loader
 # (Default: false)
-LH_WIN32_LOADER="false"
+LB_WIN32_LOADER="false"
 
-# $LH_NET_ROOT_FILESYSTEM: set netboot filesystem
+# $LB_NET_ROOT_FILESYSTEM: set netboot filesystem
 # (Default: nfs)
-LH_NET_ROOT_FILESYSTEM="nfs"
+LB_NET_ROOT_FILESYSTEM="nfs"
 
-# $LH_NET_ROOT_MOUNTOPTIONS: set nfsopts
+# $LB_NET_ROOT_MOUNTOPTIONS: set nfsopts
 # (Default: empty)
-LH_NET_ROOT_MOUNTOPTIONS=""
+LB_NET_ROOT_MOUNTOPTIONS=""
 
-# $LH_NET_ROOT_PATH: set netboot server directory
+# $LB_NET_ROOT_PATH: set netboot server directory
 # (Default: /srv/debian-live)
-LH_NET_ROOT_PATH="/srv/debian-live"
+LB_NET_ROOT_PATH="/srv/debian-live"
 
-# $LH_NET_ROOT_SERVER: set netboot server address
+# $LB_NET_ROOT_SERVER: set netboot server address
 # (Default: 192.168.1.1)
-LH_NET_ROOT_SERVER="192.168.1.1"
+LB_NET_ROOT_SERVER="192.168.1.1"
 
-# $LH_NET_COW_FILESYSTEM: set net client cow filesystem
+# $LB_NET_COW_FILESYSTEM: set net client cow filesystem
 # (Default: nfs)
-LH_NET_COW_FILESYSTEM="nfs"
+LB_NET_COW_FILESYSTEM="nfs"
 
-# $LH_NET_COW_MOUNTOPTIONS: set cow mount options
+# $LB_NET_COW_MOUNTOPTIONS: set cow mount options
 # (Default: empty)
-LH_NET_COW_MOUNTOPTIONS=""
+LB_NET_COW_MOUNTOPTIONS=""
 
-# $LH_NET_COW_PATH: set cow directory
+# $LB_NET_COW_PATH: set cow directory
 # (Default: )
-LH_NET_COW_PATH=""
+LB_NET_COW_PATH=""
 
-# $LH_NET_COW_SERVER: set cow server
+# $LB_NET_COW_SERVER: set cow server
 # (Default: )
-LH_NET_COW_SERVER=""
+LB_NET_COW_SERVER=""
 
-# $LH_NET_TARBALL: set net tarball
+# $LB_NET_TARBALL: set net tarball
 # (Default: gzip)
-LH_NET_TARBALL="gzip"
+LB_NET_TARBALL="gzip"
 
-# $LH_SYSLINUX_SPLASH: set custom syslinux splash
+# $LB_SYSLINUX_SPLASH: set custom syslinux splash
 # (Default: empty)
-LH_SYSLINUX_SPLASH=""
+LB_SYSLINUX_SPLASH=""
 
-# $LH_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
+# $LB_SYSLINUX_TIMEOUT: set custom syslinux timeout in seconds
 # (Default: 0)
-LH_SYSLINUX_TIMEOUT="0"
+LB_SYSLINUX_TIMEOUT="0"
 
-# $LH_SYSLINUX_CFG: set custom syslinux configuration file
+# $LB_SYSLINUX_CFG: set custom syslinux configuration file
 # (Default: empty)
-LH_SYSLINUX_CFG=""
+LB_SYSLINUX_CFG=""
 
-# $LH_SYSLINUX_MENU: set syslinux menu
+# $LB_SYSLINUX_MENU: set syslinux menu
 # (Default: true)
-LH_SYSLINUX_MENU="true"
+LB_SYSLINUX_MENU="true"
 
-# $LH_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
+# $LB_SYSLINUX_MENU_LIVE_ENTRY: set text to be used on the menu for live entries
 # (Default: Live)
-LH_SYSLINUX_MENU_LIVE_ENTRY="TCOS"
+LB_SYSLINUX_MENU_LIVE_ENTRY="TCOS"
 
-# $LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
+# $LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY: set text to be used on the menu for live entries (failsafe ones)
 # (Default: )
-LH_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY=""
+LB_SYSLINUX_MENU_LIVE_FAILSAFE_ENTRY=""
 
-# $LH_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
+# $LB_SYSLINUX_MENU_MEMTEST_ENTRY: set text to be used on the menu for memtest entry
 # (Default: Memory test)
-LH_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
+LB_SYSLINUX_MENU_MEMTEST_ENTRY="Memory test"
 
-# $LH_USERNAME: set username
-# (Default: admin)
-LH_USERNAME="admin"
+# $LB_USERNAME: set username
+# (Default: user)
+LB_USERNAME="admin"
diff --git a/config/bootstrap b/config/bootstrap
index 99eb301..1397bba 100644
--- a/config/bootstrap
+++ b/config/bootstrap
@@ -1,53 +1,73 @@
-# config/bootstrap - options for live-helper(7), bootstrap stage
+# config/bootstrap - options for live-build(7), bootstrap stage
 
-# $LH_ARCHITECTURE: select chroot architecture
+# $LB_ARCHITECTURE: select chroot architecture
 # (Default: autodetected)
-LH_ARCHITECTURE="i386"
+LB_ARCHITECTURE="i386"
 
-# $LH_BOOTSTRAP_CONFIG: set distribution config directory
+# $LB_BOOTSTRAP_CONFIG: set distribution config directory
 # (Default: empty)
-LH_BOOTSTRAP_CONFIG=""
+LB_BOOTSTRAP_CONFIG=""
 
-# $LH_BOOTSTRAP_INCLUDE: include packages on base
+# $LB_BOOTSTRAP_INCLUDE: include packages on base
 # (Default: empty)
-LH_BOOTSTRAP_INCLUDE=""
+LB_BOOTSTRAP_INCLUDE=""
 
-# $LH_BOOTSTRAP_EXCLUDE: exclude packages on base
+# $LB_BOOTSTRAP_EXCLUDE: exclude packages on base
 # (Default: empty)
-LH_BOOTSTRAP_EXCLUDE=""
+LB_BOOTSTRAP_EXCLUDE=""
 
-# $LH_BOOTSTRAP_FLAVOUR: select flavour to use
+# $LB_BOOTSTRAP_FLAVOUR: select flavour to use
 # (Default: empty)
-LH_BOOTSTRAP_FLAVOUR=""
+LB_BOOTSTRAP_FLAVOUR=""
 
-# $LH_BOOTSTRAP_KEYRING: set distribution keyring
+# $LB_BOOTSTRAP_KEYRING: set distribution keyring
 # (Default: empty)
-LH_BOOTSTRAP_KEYRING=""
+LB_BOOTSTRAP_KEYRING=""
 
-# $LH_DISTRIBUTION: select distribution to use
-# (Default: sid)
-LH_DISTRIBUTION="sid"
+# $LB_DISTRIBUTION: select distribution to use
+# (Default: squeeze)
+LB_DISTRIBUTION="sid"
 
-# $LH_MIRROR_BOOTSTRAP: set mirror to bootstrap from
-# (Default: http://ftp.fi.debian.org/debian/)
-LH_MIRROR_BOOTSTRAP="http://ftp.fi.debian.org/debian/"
+# $LB_MIRROR_BOOTSTRAP: set mirror to bootstrap from
+# (Default: http://ftp.de.debian.org/debian/)
+LB_MIRROR_BOOTSTRAP="http://ftp.fi.debian.org/debian/"
 
-# $LH_MIRROR_CHROOT: set mirror to fetch packages from
-# (Default: http://ftp.fi.debian.org/debian/)
-LH_MIRROR_CHROOT="http://ftp.fi.debian.org/debian/"
+# $LB_MIRROR_CHROOT: set mirror to fetch packages from
+# (Default: http://ftp.de.debian.org/debian/)
+LB_MIRROR_CHROOT="http://ftp.fi.debian.org/debian/"
 
-# $LH_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
+# $LB_MIRROR_CHROOT_SECURITY: set security mirror to fetch packages from
 # (Default: http://security.debian.org/)
-LH_MIRROR_CHROOT_SECURITY="http://security.debian.org/"
+LB_MIRROR_CHROOT_SECURITY="none"
 
-# $LH_MIRROR_BINARY: set mirror which ends up in the image
-# (Default: http://ftp.fi.debian.org/debian/)
-LH_MIRROR_BINARY="http://ftp.fi.debian.org/debian/"
+# $LB_MIRROR_CHROOT_VOLATILE: set volatile mirror to fetch packages from
+# (Default: none)
+LB_MIRROR_CHROOT_VOLATILE="none"
 
-# $LH_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
+# $LB_MIRROR_CHROOT_BACKPORTS: set backports mirror to fetch packages from
+# (Default: http://backports.debian.org/debian-backports/)
+LB_MIRROR_CHROOT_BACKPORTS="http://backports.debian.org/debian-backports/"
+
+# $LB_MIRROR_BINARY: set mirror which ends up in the image
+# (Default: http://cdn.debian.net/debian/)
+LB_MIRROR_BINARY="http://ftp.fi.debian.org/debian/"
+
+# $LB_MIRROR_BINARY_SECURITY: set security mirror which ends up in the image
 # (Default: http://security.debian.org/)
-LH_MIRROR_BINARY_SECURITY="http://security.debian.org/"
+LB_MIRROR_BINARY_SECURITY="none"
+
+# $LB_MIRROR_BINARY_VOLATILE: set volatile mirror which ends up in the image
+# (Default: none)
+LB_MIRROR_BINARY_VOLATILE="none"
+
+# $LB_MIRROR_BINARY_BACKPORTS: set backports mirror which ends up in the image
+# (Default: http://backports.debian.org/debian-backports/)
+LB_MIRROR_BINARY_BACKPORTS="none"
+
+# $LB_MIRROR_DEBIAN_INSTALLER: set debian-installer mirror
+# (Default: http://ftp.de.debian.org/debian/)
+LB_MIRROR_DEBIAN_INSTALLER="http://ftp.fi.debian.org/debian/"
 
-# $LH_ARCHIVE_AREAS: select archive areas to use
+# $LB_ARCHIVE_AREAS: select archive areas to use
 # (Default: main)
-LH_ARCHIVE_AREAS="main"
+LB_ARCHIVE_AREAS="main contrib non-free"
diff --git a/config/chroot b/config/chroot
index 838b886..41aebe2 100644
--- a/config/chroot
+++ b/config/chroot
@@ -1,65 +1,77 @@
-# config/chroot - options for live-helper(7), chroot stage
+# config/chroot - options for live-build(7), chroot stage
 
-# $LH_CHROOT_FILESYSTEM: set chroot filesystem
+# $LB_CHROOT_FILESYSTEM: set chroot filesystem
 # (Default: squashfs)
-LH_CHROOT_FILESYSTEM="squashfs"
+LB_CHROOT_FILESYSTEM="squashfs"
 
-# $LH_UNION_FILESYSTEM: set union filesystem
+# $LB_UNION_FILESYSTEM: set union filesystem
 # (Default: aufs)
-LH_UNION_FILESYSTEM="aufs"
+LB_UNION_FILESYSTEM="aufs"
 
-# $LH_VIRTUAL_ROOT_SIZE: set virtual-hdd filesystem size
+# $LB_VIRTUAL_ROOT_SIZE: set virtual-hdd filesystem size
 # (Default: 10000)
-LH_VIRTUAL_ROOT_SIZE="10000"
+LB_VIRTUAL_ROOT_SIZE="10000"
 
-# $LH_EXPOSED_ROOT: expose root as read only
+# $LB_EXPOSED_ROOT: expose root as read only
 # (Default: false)
-LH_EXPOSED_ROOT="false"
+LB_EXPOSED_ROOT="false"
 
-# $LH_HOOKS: set hook commands
+# $LB_HOOKS: set hook commands
 # (Default: empty)
-LH_HOOKS=""
+LB_HOOKS=""
 
-# $LH_INTERACTIVE: set interactive build
+# $LB_INTERACTIVE: set interactive build
 # (Default: false)
-LH_INTERACTIVE="false"
+LB_INTERACTIVE="false"
 
-# $LH_KEYRING_PACKAGES: set keyring packages
+# $LB_KEYRING_PACKAGES: set keyring packages
 # (Default: empty)
-LH_KEYRING_PACKAGES="debian-archive-keyring"
+LB_KEYRING_PACKAGES="debian-archive-keyring"
 
-# $LH_LANGUAGE: set language to use
+# $LB_LANGUAGE: set language to use
 # (Default: empty)
-LH_LANGUAGE="es"
+LB_LANGUAGE="es"
 
-# $LH_LINUX_FLAVOURS: set kernel flavour to use
+# $LB_LINUX_FLAVOURS: set kernel flavour to use
 # (Default: autodetected)
-LH_LINUX_FLAVOURS="486 686"
+LB_LINUX_FLAVOURS="486 686"
 
-# $LH_LINUX_PACKAGES: set kernel packages to use
+# $LB_LINUX_PACKAGES: set kernel packages to use
 # (Default: autodetected)
-LH_LINUX_PACKAGES="linux-image-2.6"
+LB_LINUX_PACKAGES="linux-image-2.6"
 
-# $LH_PACKAGES: set packages to install
+# $LB_REPOSITORIES: enable available third-party repositories
 # (Default: empty)
-LH_PACKAGES="squashfs-tools"
+LB_REPOSITORIES=""
 
-# $LH_PACKAGES_LISTS: set package list to install
+# $LB_PACKAGES: set packages to install
+# (Default: empty)
+LB_PACKAGES="squashfs-tools"
+
+# $LB_PACKAGES_LISTS: set package list to install
 # (Default: standard)
-LH_PACKAGES_LISTS="standard"
+LB_PACKAGES_LISTS="standard"
 
-# $LH_TASKS: set tasks to install
+# $LB_TASKS: set tasks to install
 # (Default: empty)
-LH_TASKS=""
+LB_TASKS=""
 
-# $LH_SECURITY: enable security updates
+# $LB_SECURITY: enable security updates
+# (Default: true)
+LB_SECURITY="false"
+
+# $LB_VOLATILE: enable volatile updates
 # (Default: false)
-LH_SECURITY="false"
+LB_VOLATILE="false"
+
+# $LB_BACKPORTS: enable backports updates
+# (Default: )
+LB_BACKPORTS=""
 
-# $LH_SYMLINKS: enable symlink convertion
+# $LB_SYMLINKS: enable symlink convertion
 # (Default: false)
-LH_SYMLINKS="false"
+LB_SYMLINKS="false"
 
-# $LH_SYSVINIT: enable sysvinit
+# $LB_SYSVINIT: enable sysvinit
 # (Default: false)
-LH_SYSVINIT="false"
+LB_SYSVINIT="false"
diff --git a/config/chroot_local-hooks/configuretcos.sh b/config/chroot_local-hooks/configuretcos.sh
index 745ab96..2142fc9 100755
--- a/config/chroot_local-hooks/configuretcos.sh
+++ b/config/chroot_local-hooks/configuretcos.sh
@@ -13,7 +13,7 @@ TEMPLATE_DESCRIPTION="Plantilla generada por tcosconfig"
 
 # conf based on template
 TCOS_BASED_TEMPLATE=tcos.conf.all
-TCOS_KERNEL="2.6.32-2-486"
+TCOS_KERNEL="2.6.32-5-486"
 TCOS_COMPCACHE=1
 TCOS_COMPCACHE_PERCENT=25
 
@@ -47,4 +47,17 @@ chmod 755 /etc/init.d/tcos
 
 # Create symlinks for each runlevel
 # eg /etc/rcS.d/S40tcos for runlevel S, etc
-update-rc.d tcos start 40 S .
+#update-rc.d tcos start 40 S .
+update-rc.d tcos start 00 S . >/dev/null || exit $?
+
+
+echo "I: Configure locales Spanish and Portuguesse Brasil"
+
+cat << EOF >> /etc/locale.gen
+
+es_ES UTF-8
+pt_BR UTF-8
+EOF
+
+locale-gen
+
diff --git a/config/chroot_local-includes/etc/gdm3/daemon.conf b/config/chroot_local-includes/etc/gdm3/daemon.conf
new file mode 100644
index 0000000..d374784
--- a/dev/null
+++ b/config/chroot_local-includes/etc/gdm3/daemon.conf
@@ -0,0 +1,24 @@
+[daemon]
+
+TimedLoginEnable=true
+AutomaticLoginEnable=true
+AutomaticLogin=admin
+TimedLoginDelay=5
+
+
+[xdmcp]
+Enable=true
+DisplaysPerHost=4
+MaxPending=4
+MaxSessions=16
+MaxWait=30
+MaxWaitIndirect=30
+PingIntervalSeconds=60
+
+
+[security]
+DisallowTCP=false
+
+[greeter]
+
+[debug]
diff --git a/config/chroot_local-includes/etc/init.d/tcos b/config/chroot_local-includes/etc/init.d/tcos
index 874fedb..2874be7 100644
--- a/config/chroot_local-includes/etc/init.d/tcos
+++ b/config/chroot_local-includes/etc/init.d/tcos
@@ -1,19 +1,57 @@
 #! /bin/sh
 # /etc/init.d/tcos
 #
+### BEGIN INIT INFO
+# Provides:		tcos
+# Required-Start:
+# Required-Stop:
+# Should-Start:
+# Should-Stop:
+# Default-Start:	S
+# Default-Stop:
+# Short-Description:	TCOS Debian Live - System Configuration Scripts
+# Description:		tcos contains the scripts that configure a TCOS Debian server
+# X-Start-Before:
+# X-Stop-After:
+# X-Interactive:	true
+### END INIT INFO
+
+GROUPS="dialout cdrom floppy audio video plugdev netdev powerdev fuse tcos"
 
 create_users() {
+ cat << EOF > /etc/hosts
+127.0.0.1       localhost tcos-server
+127.0.1.1       tcos-server
+
+# The following lines are desirable for IPv6 capable hosts
+::1     localhost ip6-localhost ip6-loopback
+fe00::0 ip6-localnet
+ff00::0 ip6-mcastprefix
+ff02::1 ip6-allnodes
+ff02::2 ip6-allrouters
+
+
+
+EOF
  for i in $(seq 10 30); do
    adduser --disabled-password --gecos "tcos${i}" "tcos${i}" > /dev/null 2>&1
    adduser "tcos${i}" fuse >/dev/null 2>&1
    echo "tcos${i}:tcos${i}" | chpasswd --md5 > /dev/null 2>&1
    echo "192.168.0.${i} tcos${i}" >> /etc/hosts
  done
+ for _group in $GROUPS; do
+   adduser "admin" $_group >/dev/null 2>&1
+ done
+
+ echo "admin:live" | chpasswd --md5 > /dev/null 2>&1
+ echo "root:live" | chpasswd --md5 > /dev/null 2>&1
+
+ grep -q admin /etc/sudoers || echo "admin	ALL=NOPASSWD: ALL" >> /etc/sudoers
 }
 
 configure_server() {
   # configure GDM
-  /usr/sbin/tcos-gdm-autologin --configure
+  /usr/sbin/tcos-gdm-autologin --configure > /dev/null 2>&1
 
   # copy tcosmonitor launcher in admin desktop
   mkdir -p /etc/skel/Desktop
@@ -22,18 +60,58 @@ configure_server() {
   # desktop icon
   install -d --owner=admin /home/admin/Desktop
   install --owner=admin --mode=755 /usr/share/applications/tcosmonitor.desktop /home/admin/Desktop/
+
+  # tcosmonitor
+  cat << EOF > /home/admin/.tcosmonitor.conf
+xmlrpc_username=root
+xmlrpc_password=root
+EOF
+  chown admin /home/admin/.tcosmonitor.conf
+
   # readme file
   # DNS
   cat << EOF > /etc/resolv.conf
 nameserver 192.168.0.254
-nameserver 8.8.8.8
+nameserver 8.8.4.4
 EOF
 }
 
+configure_locales() {
+  # read cmdline and set /etc/default/locale
+  for _PARAM in $(cat /proc/cmdline); do
+     case ${_PARAM} in
+       live-config.locales=es)
+          echo "LANG=es_ES.UTF-8" >> /etc/default/locale
+          cat << EOF > /etc/default/keyboard
+XKBMODEL="pc105"
+XKBLAYOUT="es"
+XKBVARIANT=""
+XKBOPTIONS="lv3:ralt_switch"
+EOF
+        ;;
+       live-config.locales=pt_BR)
+          echo "LANG=pt_BR.UTF-8" >> /etc/default/locale
+          cat << EOF > /etc/default/keyboard
+XKBMODEL="pc105"
+XKBLAYOUT="abnt2"
+XKBVARIANT=""
+XKBOPTIONS="lv3:ralt_switch"
+EOF
+        ;;
+     esac
+  done
+}
+
 
 case "$1" in
   start)
     echo "Starting TCOS server "
+
+    configure_locales
+
+    # create admin user if not exists
+    [ ! -d /home/admin ] && adduser --disabled-password --gecos "admin" "admin" > /dev/null 2>&1
+
     # configure server
     configure_server
 
diff --git a/config/chroot_local-includes/etc/resolv.conf.real b/config/chroot_local-includes/etc/resolv.conf.real
index 0507da3..276c26b 100644
--- a/config/chroot_local-includes/etc/resolv.conf.real
+++ b/config/chroot_local-includes/etc/resolv.conf.real
@@ -1,2 +1,2 @@
 nameserver 8.8.8.8
-nameserver 4.4.4.4
+nameserver 8.8.4.4
diff --git a/config/chroot_local-packages/gdm3_2.30.5-2.1_i386.deb b/config/chroot_local-packages/gdm3_2.30.5-2.1_i386.deb
new file mode 100644
index 0000000..4c40b0d
--- a/dev/null
+++ b/config/chroot_local-packages/gdm3_2.30.5-2.1_i386.deb
diff --git a/config/chroot_local-packageslists/tcos.list b/config/chroot_local-packageslists/tcos.list
index b409f17..85bc112 100644
--- a/config/chroot_local-packageslists/tcos.list
+++ b/config/chroot_local-packageslists/tcos.list
@@ -5,7 +5,7 @@ bash-completion dnsutils htop binutils rsync ntfs-3g openssh-client less acpid
 mesa-utils
 
 #include <gnome-core>
-gnome-media gnome-audio evince file-roller zip unzip synaptic gdm-themes dmz-cursor-theme
+gnome-media gnome-audio evince file-roller zip unzip synaptic dmz-cursor-theme
 
 # internet
 iceweasel iceweasel-l10n-es-es iceweasel-l10n-pt-br
@@ -25,6 +25,6 @@ openoffice.org-l10n-es openoffice.org-l10n-pt-br
 # tcos
 vlc dnsmasq xfs xfstt 
 tcos tcos-configurator tcosmonitor tcosconfig
-tcos-extra-modules-486 tcos-usplash
+tcos-extra-modules-486
 ltspfs fuse-utils
 mtools dropbear p910nd genisoimage mbr syslinux
diff --git a/config/common b/config/common
index 66445cd..92c1a7a 100644
--- a/config/common
+++ b/config/common
@@ -1,105 +1,105 @@
-# config/common - common options for live-helper(7)
+# config/common - common options for live-build(7)
 
-# LH_CONFIG_VERSION: internal version of the configuration file format
-LH_CONFIG_VERSION="2.0~a8"
+# LB_CONFIG_VERSION: internal version of the configuration file format
+LB_CONFIG_VERSION="2.0.1"
 
-# $LH_APT: set package manager
+# $LB_APT: set package manager
 # (Default: apt)
-LH_APT="apt"
+LB_APT="apt"
 
-# $LH_APT_FTP_PROXY: set apt/aptitude ftp proxy
+# $LB_APT_FTP_PROXY: set apt/aptitude ftp proxy
 # (Default: autodetected or empty)
-LH_APT_FTP_PROXY=""
+LB_APT_FTP_PROXY=""
 
-# $LH_APT_HTTP_PROXY: set apt/aptitude http proxy
+# $LB_APT_HTTP_PROXY: set apt/aptitude http proxy
 # (Default: autodetected or empty)
-LH_APT_HTTP_PROXY=""
+LB_APT_HTTP_PROXY=""
 
-# $LH_APT_PDIFFS: set apt/aptitude pdiff indices
+# $LB_APT_PDIFFS: set apt/aptitude pdiff indices
 # (Default: true)
-LH_APT_PDIFFS="true"
+LB_APT_PDIFFS="false"
 
-# $LH_APT_PIPELINE: set apt/aptitude pipeline depth
+# $LB_APT_PIPELINE: set apt/aptitude pipeline depth
 # (Default: )
-LH_APT_PIPELINE=""
+LB_APT_PIPELINE=""
 
-# $LH_APT_RECOMMENDS: set apt/aptitude recommends
+# $LB_APT_RECOMMENDS: set apt/aptitude recommends
 # (Default: true)
-LH_APT_RECOMMENDS="false"
+LB_APT_RECOMMENDS="false"
 
-# $LH_APT_SECURE: set apt/aptitude security
+# $LB_APT_SECURE: set apt/aptitude security
 # (Default: true)
-LH_APT_SECURE="true"
+LB_APT_SECURE="true"
 
-# $LH_BOOTSTRAP: set bootstrap program
+# $LB_BOOTSTRAP: set bootstrap program
 # (Default: debootstrap)
-LH_BOOTSTRAP="debootstrap"
+LB_BOOTSTRAP="debootstrap"
 
-# $LH_CACHE: control cache
+# $LB_CACHE: control cache
 # (Default: true)
-LH_CACHE="true"
+LB_CACHE="true"
 
-# $LH_CACHE_INDICES: control if downloaded package indices should be cached
+# $LB_CACHE_INDICES: control if downloaded package indices should be cached
 # (Default: false)
-LH_CACHE_INDICES="false"
+LB_CACHE_INDICES="false"
 
-# $LH_CACHE_PACKAGES: control if downloaded packages files should be cached
+# $LB_CACHE_PACKAGES: control if downloaded packages files should be cached
 # (Default: true)
-LH_CACHE_PACKAGES="true"
+LB_CACHE_PACKAGES="true"
 
-# $LH_CACHE_STAGES: control if completed stages should be cached
+# $LB_CACHE_STAGES: control if completed stages should be cached
 # (Default: bootstrap)
-LH_CACHE_STAGES="bootstrap"
+LB_CACHE_STAGES="bootstrap"
 
-# $LH_DEBCONF_FRONTEND: set debconf(1) frontend to use
+# $LB_DEBCONF_FRONTEND: set debconf(1) frontend to use
 # (Default: noninteractive)
-LH_DEBCONF_FRONTEND="noninteractive"
+LB_DEBCONF_FRONTEND="noninteractive"
 
-# $LH_DEBCONF_NOWARNINGS: set debconf(1) warnings
+# $LB_DEBCONF_NOWARNINGS: set debconf(1) warnings
 # (Default: yes)
-LH_DEBCONF_NOWARNINGS="yes"
+LB_DEBCONF_NOWARNINGS="yes"
 
-# $LH_DEBCONF_PRIORITY: set debconf(1) priority to use
+# $LB_DEBCONF_PRIORITY: set debconf(1) priority to use
 # (Default: critical)
-LH_DEBCONF_PRIORITY="critical"
+LB_DEBCONF_PRIORITY="critical"
 
-# $LH_INITRAMFS: set initramfs hook
-# (Default: live-initramfs)
-LH_INITRAMFS="live-initramfs"
+# $LB_INITRAMFS: set initramfs hook
+# (Default: auto)
+LB_INITRAMFS="auto"
 
-# $LH_FDISK: set fdisk program
+# $LB_FDISK: set fdisk program
 # (Default: autodetected)
-LH_FDISK="fdisk"
+LB_FDISK="fdisk.distrib"
 
-# $LH_LOSETUP: set losetup program
+# $LB_LOSETUP: set losetup program
 # (Default: autodetected)
-LH_LOSETUP="losetup"
+LB_LOSETUP="losetup"
 
-# $LH_MODE: set distribution mode
+# $LB_MODE: set distribution mode
 # (Default: debian)
-LH_MODE="debian"
+LB_MODE="debian"
 
-# $LH_ROOT_COMMAND: use sudo or equivalent
+# $LB_ROOT_COMMAND: use sudo or equivalent
 # (Default: empty)
-#LH_ROOT_COMMAND="sudo"
+#LB_ROOT_COMMAND="sudo"
 
-# $LH_USE_FAKEROOT: use fakeroot/fakechroot
+# $LB_USE_FAKEROOT: use fakeroot/fakechroot
 # (Default: false)
-LH_USE_FAKEROOT="false"
+LB_USE_FAKEROOT="false"
 
-# $LH_TASKSEL: set tasksel program
+# $LB_TASKSEL: set tasksel program
 # (Default: tasksel)
-LH_TASKSEL="tasksel"
+LB_TASKSEL="tasksel"
 
-# $LH_INCLUDES: set includes
-# (Default: /usr/share/live-helper/includes)
-LH_INCLUDES="/usr/share/live-helper/includes"
+# $LB_INCLUDES: set includes
+# (Default: /usr/share/live/build/includes)
+LB_INCLUDES="/usr/share/live/build/includes"
 
-# $LH_TEMPLATES: set templates
-# (Default: /usr/share/live-helper/templates)
-LH_TEMPLATES="config/templates"
+# $LB_TEMPLATES: set templates
+# (Default: /usr/share/live/build/templates)
+LB_TEMPLATES="config/templates"
 
-# Live-helper options
+# live-build options
 
 # $_BREAKPOINTS: enable breakpoints
 # (Default: false)
@@ -129,3 +129,4 @@ _QUIET="false"
 APT_OPTIONS="--yes"
 APTITUDE_OPTIONS="--assume-yes"
 GZIP_OPTIONS="--best  --rsyncable"
+ISOHYBRID_OPTIONS=""
diff --git a/config/source b/config/source
index a5097ae..93a022a 100644
--- a/config/source
+++ b/config/source
@@ -1,9 +1,9 @@
-# config/source - options for live-helper(7), source stage
+# config/source - options for live-build(7), source stage
 
-# $LH_SOURCE: set source option
+# $LB_SOURCE: set source option
 # (Default: false)
-LH_SOURCE="false"
+LB_SOURCE="false"
 
-# $LH_SOURCE_IMAGES: set image type
+# $LB_SOURCE_IMAGES: set image type
 # (Default: tar)
-LH_SOURCE_IMAGES="tar"
+LB_SOURCE_IMAGES="tar"
diff --git a/config/templates/syslinux/common/live.cfg b/config/templates/syslinux/common/live.cfg
index 58f8cf4..5e18344 100644
--- a/config/templates/syslinux/common/live.cfg
+++ b/config/templates/syslinux/common/live.cfg
@@ -1,17 +1,17 @@
 
-label live
-	menu label TCOS Debian live English
-	kernel /live/vmlinuz
-	append initrd=/live/initrd.img boot=live quiet vga=791 splash nonetworking username=admin hostname=tcos-server union=aufs 
-
 label livees
 	menu label TCOS Debian live Spanish
-	kernel /live/vmlinuz
-	append initrd=/live/initrd.img boot=live quiet vga=791 splash nonetworking username=admin hostname=tcos-server union=aufs locale=es_ES.UTF-8 keyb=es klayout=es kmodel=pc105
+	kernel /live/vmlinuz1
+	append initrd=/live/initrd1.img boot=live quiet vga=791 splash nonetworking live-config.username=admin live-config.hostname=tcos-server union=aufs live-config.locales=es
+
+label live
+	menu label TCOS Debian live English
+	kernel /live/vmlinuz1
+	append initrd=/live/initrd1.img boot=live quiet vga=791 splash nonetworking live-config.username=admin live-config.hostname=tcos-server union=aufs 
 
 label livebr
 	menu label TCOS Debian live Brazil
-	kernel /live/vmlinuz
-	append initrd=/live/initrd.img boot=live quiet vga=791 splash nonetworking username=admin hostname=tcos-server union=aufs locale=pt_BR.UTF-8 keyb=br klayout=br kmodel=abnt2
+	kernel /live/vmlinuz1
+	append initrd=/live/initrd1.img boot=live quiet vga=791 splash nonetworking live-config.username=admin live-config.hostname=tcos-server union=aufs live-config.locales=pt_BR live-config.kmodel=abnt2