# HG changeset patch # User Christophe Lincoln # Date 1304085968 -7200 # Node ID a14abff6be90b12891bd4909cd6a0a293ef4c43c # Parent 1ebe324e953a786d7089bd2c2498bf46a65eafb8 Huge change in boot... we start X as soon as possible by default, for this we have to config keymap, locale, user and home before, let do that in rcS. Also some fixes such as TZ diff -r 1ebe324e953a -r a14abff6be90 etc/init.d/bootopts.sh --- a/etc/init.d/bootopts.sh Wed Apr 06 16:18:42 2011 +0100 +++ b/etc/init.d/bootopts.sh Fri Apr 29 16:06:08 2011 +0200 @@ -37,15 +37,8 @@ addgroup $USER video addgroup $USER tty # /home/$USER files from /etc/skel. - if [ -d /home/$USER ]; then - # Path for user desktop files. - for i in /home/$USER/.local/share/applications/*.desktop - do - sed -i s/"user_name"/"$USER"/g $i - done - else - mkdir -p /home/$USER - fi + # make user be only read/write by user + chmod -R 700 /home/$USER # Slim default user. if [ -f /etc/slim.conf ]; then sed -i s/"default_user .*"/"default_user $USER"/\ @@ -62,86 +55,6 @@ eject) # Eject cdrom. eject /dev/cdrom ;; - autologin) - # Autologin option to skip first graphic login prompt. - echo "auto_login yes" >> /etc/slim.conf ;; - lang=*) - # Check for a specified locale (lang=*). - LANG=${opt#lang=} - echo -n "Setting system locale to: $LANG... " - echo "LANG=$LANG" > /etc/locale.conf - echo "LC_ALL=$LANG" >> /etc/locale.conf - [ ! -d /usr/lib/locale/$LANG ] && localedef \ - -i $LANG -c -f UTF-8 /usr/lib/locale/$LANG & - tazlocale link-files - status ;; - kmap=*) - # Check for a specified keymap (kmap=*). - KEYMAP=${opt#kmap=} - echo -n "Setting system keymap to: $KEYMAP..." - echo "$KEYMAP" > /etc/keymap.conf - status ;; - home=*) - # Check for a specified home partition (home=*) and check for - # user home dir. Note: home=usb is a shorter and easier way to - # have home=/dev/sda1. - DEVICE=${opt#home=} - [ "$DEVICE" = "usb" ] && DEVICE=sda1 - echo "Home has been specified to $DEVICE..." - DEVID=`/sbin/blkid | sed 'p;s/"//g' | grep "$DEVICE" | sed 's/:.*//;q'` - if [ -z "$DEVID" ]; then - USBDELAY=`cat /sys/module/usb_storage/parameters/delay_use` - USBDELAY=$((2+$USBDELAY)) - echo "Sleeping $USBDELAY s to let the kernel detect the device... " - sleep $USBDELAY - fi - USER=`cat /etc/passwd | sed '/:1000:/!d;s/:.*//;q'` - DEVID=$DEVICE - if [ -x /sbin/blkid ]; then - # Can be a label, uuid, type or devname. DEVID gives us first: /dev/name. - DEVID=`/sbin/blkid | sed 'p;s/"//g' | grep "$DEVICE" | sed 's/:.*//;q'` - fi - DEVID=${DEVID##*/} - if [ -n "$DEVID" ] && grep -q "$DEVID" /proc/partitions ; then - echo "Mounting /home on /dev/$DEVID... " - [ -d /home/$USER ] && mv /home/$USER /tmp/$USER-files - mount /dev/$DEVID /home -o uid=1000,gid=1000 2>/dev/null \ - || mount /dev/$DEVID /home - # Check if swap file must be generated in /home: swap=size (Mb). - # This option is only used within home=device. - if grep -q "swap=[1-9]*" /proc/cmdline; then - SWAP_SIZE=`sed 's/.*swap=\([^ ]*\).*/\1/' < /proc/cmdline` - # DD to gen a virtual disk. - echo "Generating swap file: /home/swap ($SWAP_SIZE)..." - dd if=/dev/zero of=/home/swap bs=1M count=$SWAP_SIZE - # Make the Linux swap filesystem. - mkswap /home/swap - add_swap_in_fstab /home/swap - fi - else - echo "Unable to find $DEVICE... " - fi - # Move all user dir if needed. - if [ ! -d "/home/$USER" ] ; then - mv /tmp/$USER-files /home/$USER - chown -R $USER.users /home/$USER - else - rm -rf /tmp/$USER-files - fi - # Install all packages in /home/boot/packages. In live CD and - # USB mode the option home= mounts the device on /home, so we - # already have a boot directory with the Kernel and rootfs. - if [ -d "/home/boot/packages" ]; then - for pkg in /home/boot/packages/*.tazpkg - do - tazpkg install $pkg - done - fi - # We can have custom files in /home/boot/rootfs to overwrite - # the one packed into the Live system. - if [ -d "/home/boot/rootfs" ]; then - cp -a /home/boot/rootfs/* / - fi ;; laptop) # Laptop option to load related Kernel modules. echo "Loading laptop modules: ac, battery, fan, yenta_socket..." @@ -182,29 +95,11 @@ status /packages/install.sh fi ;; - wm=*) - # Check for a Window Manager (for a flavor, default WM can be changed - # with boot options or with an addfile in /etc/X11/wm.default. - WM=${opt#wm=} - mkdir -p /etc/X11 - case $WM in - jwm) - echo "jwm" > /etc/X11/wm.default ;; - ob|openbox|openbox-session) - echo "openbox" > /etc/X11/wm.default ;; - e17|enlightenment|enlightenment_start) - echo "enlightenment" > /etc/X11/wm.default ;; - esac ;; *) continue ;; esac done -# If no default WM fallback to Openbox (we never know). -if [ ! -f /etc/X11/wm.default ]; then - echo "openbox" > /etc/X11/wm.default -fi - # Activate an eventual swap file or partition. if [ "`fdisk -l | grep swap`" ]; then for SWAP_DEV in `fdisk -l | sed '/swap/!d;s/ .*//'`; do diff -r 1ebe324e953a -r a14abff6be90 etc/init.d/hwconf.sh --- a/etc/init.d/hwconf.sh Wed Apr 06 16:18:42 2011 +0100 +++ b/etc/init.d/hwconf.sh Fri Apr 29 16:06:08 2011 +0200 @@ -71,58 +71,3 @@ else echo "Unable to configure sound card." fi - -# Xorg auto configuration. -if [ "$SCREEN" != "text" -a ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then - echo "Configuring Xorg..." - # $HOME is not yet set. - HOME=/root - sed -i 's|/usr/bin/Xvesa|/usr/bin/Xorg|' /etc/slim.conf - sed -i s/"^xserver_arguments"/'\#xserver_arguments'/ /etc/slim.conf - tazx config-xorg -fi - -# Screen size config for slim/Xvesa (last config dialog before login). -# -# NOTE: Xvesa is unmaintained, package will be removed and all related -# code cleaned -# -if [ "$SCREEN" != "text" -a ! -s /etc/X11/screen.conf -a -x /usr/bin/Xvesa ]; then - # $HOME is not yet set. - HOME=/root - if [ -n "$XARG" ]; then - # Add an extra argument to xserver_arguments (xarg=-2button) - sed -i "s| -screen|$XARG -screen|" /etc/slim.conf - fi - if [ -n "$SCREEN" ]; then - case "$SCREEN" in - text) - # Disable X. - echo -n "Disabling X login manager: slim..." - . /etc/rcS.conf - RUN_DAEMONS=`echo $RUN_DAEMONS | sed s/' slim'/''/` - sed -i s/"RUN_DAEMONS.*"/"RUN_DAEMONS=\"$RUN_DAEMONS\"/" /etc/rcS.conf - status ;; - auto) - # Auto detect screen resolution. - export NEW_SCREEN=`Xvesa -listmodes 2>&1 | grep ^0x | \ - awk '{ printf "%s %s\n",$2 }' \ - | sort -nr | grep x[1-2][4-6] | head -n 1` - tazx `cat /etc/X11/wm.default` ;; - 1024x600*|800x480*) - set -- $(echo $SCREEN | sed 's/x/ /g') - 915resolution -l 2>/dev/null | \ - grep " ${1}x" | awk -v h=$1 -v v=$2 \ - 'END {system("915resolution " $2 " " h " " v)}' - # Use specified screen resolution. - export NEW_SCREEN=$SCREEN - tazx `cat /etc/X11/wm.default` ;; - *) - # Use specified screen resolution. - export NEW_SCREEN=$SCREEN - tazx `cat /etc/X11/wm.default` ;; - esac - else - tazx `cat /etc/X11/wm.default` - fi -fi diff -r 1ebe324e953a -r a14abff6be90 etc/init.d/i18n.sh --- a/etc/init.d/i18n.sh Wed Apr 06 16:18:42 2011 +0100 +++ b/etc/init.d/i18n.sh Fri Apr 29 16:06:08 2011 +0200 @@ -6,22 +6,21 @@ . /etc/init.d/rc.functions # Locale config. -echo "Checking if /etc/locale.conf exists... " if [ -s "/etc/locale.conf" ]; then - echo -n "Locale configuration file exists... " - status + . /etc/locale.conf + echo -n "Locale configuration: $LANG" && status else tazlocale fi # Keymap config. if [ -s "/etc/keymap.conf" ]; then - KEYMAP=`cat /etc/keymap.conf` - echo "Keymap configuration: $KEYMAP" + keymap=`cat /etc/keymap.conf` + echo -n "Keymap configuration: $keymap" && status if [ -x /bin/loadkeys ]; then - loadkeys $KEYMAP + loadkeys $keymap else - loadkmap < /usr/share/kmap/$KEYMAP.kmap + loadkmap < /usr/share/kmap/$keymap.kmap fi else tazkeymap @@ -30,8 +29,8 @@ # Timezone config. Set timezone using the keymap config for fr, be, fr_CH # and ca with Montreal. if [ ! -s "/etc/TZ" ]; then - KEYMAP=`cat /etc/keymap.conf` - case "$KEYMAP" in + keymap=`cat /etc/keymap.conf` + case "$keymap" in fr-latin1|be-latin1) echo -n "Setting timezone to Europe/Paris... " echo "Europe/Paris" > /etc/TZ && status @@ -51,46 +50,3 @@ esac fi -# Firefox hack to get the right locale. -if grep -q "fr_*" /etc/locale.conf; then - # But is the fox installed ? - if [ -f "/var/lib/tazpkg/installed/firefox/receipt" ]; then - . /var/lib/tazpkg/installed/firefox/receipt - sed -i 's/en-US/fr/' /etc/firefox/pref/firefox-l10n.js - fi -fi - -# Gen a motd in french if fr_* or in English by default. -if [ ! -s "/etc/motd" ]; then -if grep -q "fr_*" /etc/locale.conf; then - # FR - cat > /etc/motd << "EOF" - - - (°- { Documentation dans /usr/share/doc. Utiliser 'less -EM' pour, - //\ lire des fichiers, devenir root avec 'su' et éditer avec 'nano'. - v_/_ Taper 'startx' pour lancer une session X. } - - SliTaz GNU/Linux est distribuée dans l'espoir qu'elle sera utile, mais - alors SANS AUCUNE GARANTIE. - - -EOF - else - # EN - cat > /etc/motd << "EOF" - - - (°- { Documentation in /usr/share/doc. Use 'less -EM' to read files, - //\ become root with 'su' and edit using 'nano'. - v_/_ Type 'startx' to start a X window session. } - - SliTaz GNU/Linux is distributed in the hope that it will be useful, but - with ABSOLUTELY NO WARRANTY. - - -EOF - - fi - -fi diff -r 1ebe324e953a -r a14abff6be90 etc/init.d/rcS --- a/etc/init.d/rcS Wed Apr 06 16:18:42 2011 +0100 +++ b/etc/init.d/rcS Fri Apr 29 16:06:08 2011 +0200 @@ -29,29 +29,54 @@ /bin/mount proc status -[ "$FBSPLASH" == "yes" ] && echo "10" > /etc/fbsplash/fifo +# Set time zone now to get system events at local time +if [ -s /etc/TZ ]; then + export TZ=$(cat /etc/TZ) +fi + +[ "$FBSPLASH" == "yes" ] && echo "20" > /etc/fbsplash/fifo # Parse cmdline args for earlier boot options. All other boot options # are in /etc/init./bootopts.sh. -echo -n "Searching for early boot options..." +echo "Checking for early boot options..." for opt in `cat /proc/cmdline` do case $opt in - fastbootx|fbx) - export FAST_BOOT_X="yes" ;; cdrom=*) export CDROM=${opt#cdrom=} ;; modprobe=*) export MODPROBE="yes" ;; config=*) export CONFIG=${opt#config=} ;; + xarg=*) + XARG="$XARG ${opt#xarg=}" ;; + screen=text) + echo -n "Text mode option detected..." + SCREEN=text + status ;; + screen=[0-9]*) + SCREEN=${opt#screen=} ;; + autologin) + # Autologin option to skip first graphic login prompt. + echo "auto_login yes" >> /etc/slim.conf ;; + lang=*) + # Check for a specified locale (lang=*). + LANG=${opt#lang=} + echo -n "Setting system locale to: $LANG... " + tazlocale init $LANG + status ;; + kmap=*) + # Check for a specified keymap (kmap=*). + KEYMAP=${opt#kmap=} + echo -n "Setting system keymap to: $KEYMAP..." + tazkeymap init $KEYMAP + status ;; *) continue ;; esac done -status -[ "$FBSPLASH" == "yes" ] && echo "20" > /etc/fbsplash/fifo +[ "$FBSPLASH" == "yes" ] && echo "40" > /etc/fbsplash/fifo # Before mounting filesystems we check fs specified in the file # /etc/rcS.conf and variable $CHECK_FS. @@ -73,9 +98,6 @@ echo -n "Starting udev daemon..." /sbin/udevd --daemon status - echo -n "Udevadm requesting events from the Kernel..." - udevadm trigger - status echo -n "Udevadm waiting for the event queue to finish..." udevadm settle status @@ -84,7 +106,7 @@ status fi -[ "$FBSPLASH" == "yes" ] && echo "30" > /etc/fbsplash/fifo +[ "$FBSPLASH" == "yes" ] && echo "60" > /etc/fbsplash/fifo # Mount filesystems in /etc/fstab. echo "Mounting filesystems in fstab..." @@ -110,7 +132,7 @@ status fi -[ "$FBSPLASH" == "yes" ] && echo "40" > /etc/fbsplash/fifo +[ "$FBSPLASH" == "yes" ] && echo "70" > /etc/fbsplash/fifo # Set up tmp X11 and ICE dir. echo -n "Setting up tmp X11 and ICE unix dir..." @@ -118,15 +140,43 @@ /bin/chmod 1777 /tmp/.X11-unix /tmp/.ICE-unix status -# Fast boot into X for HD install or custom Live system. We need -# keymap settings since Xvesa dumps the console mapping and a correct -# slim configuration for screen resolution. DBUS and HAL must also start -# before X session (manual login or autologin) to have devices in PCmanFM. -if [ "$FAST_BOOT_X" = "yes" ]; then - /etc/init.d/i18n.sh - /etc/init.d/dbus start - /etc/init.d/hald start - /etc/init.d/slim start & +# Start DBUS and HAL deamon so we can use Xorg and a WM to configure +# system locale and keybord on first boot. +[ -x /etc/init.d/dbus ] && /etc/init.d/dbus start +[ -x /etc/init.d/hald ] && /etc/init.d/hald start + +# Requested screen is not text mode and keymap.conf is empty so go +# for an i18n configuration in GUI mode. In cas of screen=text we +# configure locale and keymap just after via i18n.sh +if [ "$SCREEN" != "text" -a ! -s "/etc/locale.conf" -a -x /usr/bin/Xorg ]; then + tazbox boot +fi + +[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo + +# Set the console keymap and configure i18n in case of screen=text and +# no locale.conf or keymap.conf. Add default user for live mode and +# mount an eventual /home partition. +/etc/init.d/i18n.sh +/etc/init.d/user-home.sh + +[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo + +# Now that we have a keymap configuration we can auto configure Xorg. +# We need to set $HOME. +if [ "$SCREEN" != "text" -a ! -s /etc/X11/xorg.conf -a -x /usr/bin/Xorg ]; then + echo "Configuring Xorg..." + HOME=/root + tazx config-xorg +fi + +# Here we finish bootsplash since we start Xorg session. +[ "$FBSPLASH" == "yes" ] && sleep 1 && echo "exit" > /etc/fbsplash/fifo + +# No text mode requested, we have i18n and Xorg settings as well as a +# user, so start a desktop and let boot process finih in backgroud. +if [ "$screen" != "text" -a -x /etc/init.d/slim ]; then + /etc/init.d/slim start fi # Create /dev/cdrom if needed (symlink does not exist on LiveCD). @@ -134,7 +184,7 @@ if [ -n "$CDROM" ]; then DRIVE_NAME=${CDROM#/dev/} else - DRIVE_NAME=`grep -s "drive name" /proc/sys/dev/cdrom/info | cut -f 3` + DRIVE_NAME=$(grep -s "drive name" /proc/sys/dev/cdrom/info | cut -f 3) fi if [ -n "$DRIVE_NAME" -a ! "`readlink /dev/cdrom`" ]; then echo -n "Creating symlink : /dev/cdrom..." @@ -148,6 +198,7 @@ >> /etc/fstab status fi + # Chmod hack on each boot for Asunder and burnbox. Allowing all users # to burn/rip CD/DVD. if [ -n "$DRIVE_NAME" -a "`readlink /dev/cdrom`" ]; then @@ -158,8 +209,6 @@ status fi -[ "$FBSPLASH" == "yes" ] && echo "50" > /etc/fbsplash/fifo - # Handle kernel cmdline parameter modprobe= if [ -n "$MODPROBE" ]; then MODULES=`sed -e 's/.* modprobe=\([^ ]*\).*/\1/' -e 's/,/\n/g' < /proc/cmdline` @@ -202,8 +251,6 @@ status fi -[ "$FBSPLASH" == "yes" ] && echo "60" > /etc/fbsplash/fifo - # Start syslogd and klogd. if [ "$KERNEL_LOG_DAEMONS" = "yes" ]; then echo -n "Starting system log deamon: syslogd..." @@ -225,23 +272,14 @@ # Be quiet on configuration to avoid messages overwriting ncurses dialog echo "0 0 0 0" > /proc/sys/kernel/printk -[ "$FBSPLASH" == "yes" ] && echo "70" > /etc/fbsplash/fifo - # Detect PCI and USB devices with Tazhw from slitaz-tools. We load # kernel modules only at first boot or in LiveCD mode. if [ ! -s /var/lib/detected-modules ]; then /sbin/tazhw init fi -[ "$FBSPLASH" == "yes" ] && echo "80" > /etc/fbsplash/fifo - -# Call udevadm trigger to ensure /dev is fully populate now that all -# modules are loaded. -if [ "$UDEV" = "yes" ]; then - echo -n "Requesting events from the Kernel..." - udevadm trigger - status -fi +# Auto recharge packages list (after network connection of course) +[ "$RECHARGE_PACKAGES_LIST" == "yes" ] && tazpkg recharge & # Start all scripts specified with $RUN_SCRIPTS. echo "Executing all initialization scripts..." @@ -252,15 +290,6 @@ fi done -[ "$FBSPLASH" == "yes" ] && echo "90" > /etc/fbsplash/fifo - -# Re-source main config file. In Live mode, daemons list can be modified -# by boot options (screen=text will remove slim). -. /etc/rcS.conf - -# Auto recharge packages list (after network connection of course) -[ "$RECHARGE_PACKAGES_LIST" == "yes" ] && tazpkg recharge & - # Start all daemons specified with $RUN_DAEMONS. echo "Starting all daemons specified in /etc/rcS.conf..." for daemon in $RUN_DAEMONS @@ -270,8 +299,6 @@ fi done -[ "$FBSPLASH" == "yes" ] && echo "100" > /etc/fbsplash/fifo - # Back to a verbose mode. echo "7 4 1 7" > /proc/sys/kernel/printk @@ -285,6 +312,5 @@ time=$((`date +%s` - $bootdate)) echo $time > /var/log/boot-time echo "SliTaz boot time: ${time}s" -[ "$FBSPLASH" == "yes" ] && echo "exit" > /etc/fbsplash/fifo fi # logged diff -r 1ebe324e953a -r a14abff6be90 etc/init.d/user-home.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/etc/init.d/user-home.sh Fri Apr 29 16:06:08 2011 +0200 @@ -0,0 +1,105 @@ +#!/bin/sh +# /etc/init.d/user.sh - SliTaz default user for live mode and /home. +# +# This script is called from the main boot script /etc/init/rcS +# to add a user for live mode and mount /home before we start Slim +# since we need a user to autologin and provide a desktop +# +# Default user account without password (uid=1000). In live mode the option +# user=name can be used, but user must be added before home= to have home dir. +# This option is not handled by a loop and case like others and has no +# effect on an installed system. +# + +if ! grep -q "100[0-9]:100[0-9]" /etc/passwd; then + if grep -q "user=" /proc/cmdline; then + USER=`cat /proc/cmdline | sed 's/.*user=\([^ ]*\).*/\1/'` + # Avoid usage of an existing system user or root. + if grep -q ^$USER /etc/passwd; then + USER=tux + fi + else + USER=tux + fi + echo -n "Configuring user and group: $USER..." + adduser -D -s /bin/sh -g "SliTaz User" -G users -h /home/$USER $USER + passwd -d $USER >/dev/null + status + # Audio and cdrom group. + addgroup $USER audio + addgroup $USER cdrom + addgroup $USER video + addgroup $USER tty + # /home/$USER files from /etc/skel. + # make user be only read/write by user + chmod -R 700 /home/$USER + # Slim default user. + if [ -f /etc/slim.conf ]; then + sed -i s/"default_user .*"/"default_user $USER"/\ + /etc/slim.conf + fi +fi + +# Check for a specified home partition (home=*) and check for +# user home dir. Note: home=usb is a shorter and easier way to +# have home=/dev/sda1. +# +if grep -q "home=" /proc/cmdline; then + DEVICE=${opt#home=} + [ "$DEVICE" = "usb" ] && DEVICE=sda1 + echo "Home has been specified to $DEVICE..." + DEVID=`/sbin/blkid | sed 'p;s/"//g' | grep "$DEVICE" | sed 's/:.*//;q'` + if [ -z "$DEVID" ]; then + USBDELAY=`cat /sys/module/usb_storage/parameters/delay_use` + USBDELAY=$((2+$USBDELAY)) + echo "Sleeping $USBDELAY s to let the kernel detect the device... " + sleep $USBDELAY + fi + USER=`cat /etc/passwd | sed '/:1000:/!d;s/:.*//;q'` + DEVID=$DEVICE + if [ -x /sbin/blkid ]; then + # Can be a label, uuid, type or devname. DEVID gives us first: /dev/name. + DEVID=`/sbin/blkid | sed 'p;s/"//g' | grep "$DEVICE" | sed 's/:.*//;q'` + fi + DEVID=${DEVID##*/} + if [ -n "$DEVID" ] && grep -q "$DEVID" /proc/partitions ; then + echo "Mounting /home on /dev/$DEVID... " + [ -d /home/$USER ] && mv /home/$USER /tmp/$USER-files + mount /dev/$DEVID /home -o uid=1000,gid=1000 2>/dev/null \ + || mount /dev/$DEVID /home + # Check if swap file must be generated in /home: swap=size (Mb). + # This option is only used within home=device. + if grep -q "swap=[1-9]*" /proc/cmdline; then + SWAP_SIZE=`sed 's/.*swap=\([^ ]*\).*/\1/' < /proc/cmdline` + # DD to gen a virtual disk. + echo "Generating swap file: /home/swap ($SWAP_SIZE)..." + dd if=/dev/zero of=/home/swap bs=1M count=$SWAP_SIZE + # Make the Linux swap filesystem. + mkswap /home/swap + add_swap_in_fstab /home/swap + fi + else + echo "Unable to find $DEVICE... " + fi + # Move all user dir if needed. + if [ ! -d "/home/$USER" ] ; then + mv /tmp/$USER-files /home/$USER + chown -R $USER.users /home/$USER + else + rm -rf /tmp/$USER-files + fi + # Install all packages in /home/boot/packages. In live CD and + # USB mode the option home= mounts the device on /home, so we + # already have a boot directory with the Kernel and rootfs. + if [ -d "/home/boot/packages" ]; then + for pkg in /home/boot/packages/*.tazpkg + do + tazpkg install $pkg + done + fi + # We can have custom files in /home/boot/rootfs to overwrite + # the one packed into the Live system. + if [ -d "/home/boot/rootfs" ]; then + cp -a /home/boot/rootfs/* / + fi +fi diff -r 1ebe324e953a -r a14abff6be90 etc/rcS.conf --- a/etc/rcS.conf Wed Apr 06 16:18:42 2011 +0100 +++ b/etc/rcS.conf Fri Apr 29 16:06:08 2011 +0200 @@ -47,7 +47,7 @@ # Daemons to start at boot time. SliTaz only provides a few daemons: firewall, # Web server (lighttpd), SSH server (dropbear) and rsyncd, so boot order is # not really important, but dbus/hald should be started before slim. -RUN_DAEMONS="dbus hald firewall slim" +RUN_DAEMONS="dbus hald firewall slim tazpanel" # Pre login bold message. MESSAGE="Welcome to your box."