flavors rev 35
core+justx: clean-up and modify pkgs list
| author | Christophe Lincoln <pankso@slitaz.org> |
|---|---|
| date | Thu Mar 25 23:17:57 2010 +0100 (2010-03-25) |
| parents | ff3391c4ce78 |
| children | 971a5b4393f1 |
| files | core/packages.list core/rootfs/etc/init.d/bootopts.sh core/rootfs/etc/init.d/network.sh core/rootfs/etc/lxpanel/default/panels/panel core/rootfs/etc/skel/Desktop/slitaz-doc.desktop justx/packages.list justx/rootfs/etc/xdg/openbox/autostart.sh justx/rootfs/etc/xdg/tint2/tint2rc |
line diff
1.1 --- a/core/packages.list Tue Mar 23 20:48:04 2010 +0100 1.2 +++ b/core/packages.list Thu Mar 25 23:17:57 2010 +0100 1.3 @@ -112,7 +112,6 @@ 1.4 xorg-rgb 1.5 xorg-xauth 1.6 xorg-xcompmgr 1.7 -xorg-xrandr 1.8 xterm 1.9 zlib 1.10 libcrypto
2.1 --- a/core/rootfs/etc/init.d/bootopts.sh Tue Mar 23 20:48:04 2010 +0100 2.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 2.3 @@ -1,212 +0,0 @@ 2.4 -#!/bin/sh 2.5 -# /etc/init.d/bootopts.sh - SliTaz boot options from the cmdline. 2.6 -# 2.7 -# Earlier boot options are in rcS, ex: config= and modprobe= 2.8 -# 2.9 -. /etc/init.d/rc.functions 2.10 - 2.11 -# Update fstab for swapon/swapoff 2.12 -add_swap_in_fstab() 2.13 -{ 2.14 - grep -q "$1 " /etc/fstab || cat >> /etc/fstab <<EOT 2.15 -$1 swap swap default 0 0 2.16 -EOT 2.17 -} 2.18 - 2.19 -# Default user account without password (uid=1000). In live mode the option 2.20 -# user=name can be used, but user must be added before home= to have home dir. 2.21 -# This option is not handled by a loop and case like others and has no 2.22 -# effect on an installed system. 2.23 -if ! grep -q "100[0-9]:100[0-9]" /etc/passwd; then 2.24 - if grep -q "user=" /proc/cmdline; then 2.25 - USER=`cat /proc/cmdline | sed 's/.*user=\([^ ]*\).*/\1/'` 2.26 - # Avoid usage of an existing system user or root. 2.27 - if grep -q ^$USER /etc/passwd; then 2.28 - USER=tux 2.29 - fi 2.30 - else 2.31 - USER=tux 2.32 - fi 2.33 - echo -n "Configuring user and group: $USER..." 2.34 - echo "$USER:x:1000:1000:SliTaz User,,,:/home/$USER:/bin/sh" >> /etc/passwd 2.35 - echo "$USER::14035:0:99999:7:::" >> /etc/shadow 2.36 - echo "$USER:x:1000:" >> /etc/group 2.37 - echo "$USER:!::" >> /etc/gshadow 2.38 - status 2.39 - # Audio and cdrom group. 2.40 - addgroup $USER audio 2.41 - addgroup $USER cdrom 2.42 - # /home/$USER files from /etc/skel. 2.43 - if [ -d /etc/skel ]; then 2.44 - cp -a /etc/skel /home/$USER 2.45 - # Path for user desktop files. 2.46 - for i in /home/$USER/.local/share/applications/*.desktop 2.47 - do 2.48 - sed -i s/"user_name"/"$USER"/g $i 2.49 - done 2.50 - else 2.51 - mkdir -p /home/$USER 2.52 - fi 2.53 - # Set permissions. 2.54 - chown -R $USER.$USER /home/$USER 2.55 - # Slim default user. 2.56 - if [ -f /etc/slim.conf ]; then 2.57 - sed -i s/"default_user .*"/"default_user $USER"/\ 2.58 - /etc/slim.conf 2.59 - fi 2.60 -fi 2.61 - 2.62 -# Parse /proc/cmdline for boot options. 2.63 -echo "Parsing kernel cmdline for SliTaz live options... " 2.64 - 2.65 -for opt in `cat /proc/cmdline` 2.66 -do 2.67 - case $opt in 2.68 - eject) 2.69 - # Eject cdrom. 2.70 - eject /dev/cdrom ;; 2.71 - autologin) 2.72 - # Autologin option to skip first graphic login prompt. 2.73 - echo "auto_login yes" >> /etc/slim.conf ;; 2.74 - lang=*) 2.75 - # Check for a specified locale (lang=*). 2.76 - LANG=${opt#lang=} 2.77 - echo -n "Setting system locale to: $LANG... " 2.78 - echo "LANG=$LANG" > /etc/locale.conf 2.79 - echo "LC_ALL=$LANG" >> /etc/locale.conf 2.80 - [ ! -d /usr/lib/locale/$LANG ] && localedef \ 2.81 - -i $LANG -c -f UTF-8 /usr/lib/locale/$LANG & 2.82 - status ;; 2.83 - kmap=*) 2.84 - # Check for a specified keymap (kmap=*). 2.85 - KEYMAP=${opt#kmap=} 2.86 - echo -n "Setting system keymap to: $KEYMAP..." 2.87 - echo "$KEYMAP" > /etc/keymap.conf 2.88 - status ;; 2.89 - home=*) 2.90 - # Check for a specified home partition (home=*) and check for 2.91 - # user home dir. Note: home=usb is a shorter and easier way to 2.92 - # have home=/dev/sda1. 2.93 - DEVICE=${opt#home=} 2.94 - [ "$DEVICE" = "usb" ] && DEVICE=sda1 2.95 - echo "Home has been specified to $DEVICE..." 2.96 - USBDELAY=`cat /sys/module/usb_storage/parameters/delay_use` 2.97 - USBDELAY=$((1+$USBDELAY)) 2.98 - echo "Sleeping $USBDELAY s to let the kernel detect the device... " 2.99 - sleep $USBDELAY 2.100 - USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1` 2.101 - DEVID=$DEVICE 2.102 - if [ -x /sbin/blkid ]; then 2.103 - # Can be a label, uuid or devname. DEVID gives us first: /dev/name. 2.104 - DEVID=`/sbin/blkid | grep $DEVICE | cut -d: -f1` 2.105 - DEVID=${DEVID##*/} 2.106 - fi 2.107 - if [ -n "$DEVID" ] && grep -q "$DEVID" /proc/partitions ; then 2.108 - echo "Mounting /home on /dev/$DEVID... " 2.109 - [ -d /home/$USER ] && mv /home/$USER /tmp/$USER-files 2.110 - mount /dev/$DEVID /home -o uid=1000,gid=1000 2>/dev/null \ 2.111 - || mount /dev/$DEVID /home 2.112 - # Check if swap file must be generated in /home: swap=size (Mb). 2.113 - # This option is only used within home=device. 2.114 - if grep -q "swap=[1-9]*" /proc/cmdline; then 2.115 - SWAP_SIZE=`cat /proc/cmdline | sed 's/.*swap=\([^ ]*\).*/\1/'` 2.116 - # DD to gen a virtual disk. 2.117 - echo "Generating swap file: /home/swap ($SWAP_SIZE)..." 2.118 - dd if=/dev/zero of=/home/swap bs=1M count=$SWAP_SIZE 2.119 - # Make the Linux swap filesystem. 2.120 - mkswap /home/swap 2.121 - add_swap_in_fstab /home/swap 2.122 - fi 2.123 - else 2.124 - echo "Unable to find $DEVICE... " 2.125 - fi 2.126 - # Move all user dir if needed. 2.127 - if [ ! -d "/home/$USER" ] ; then 2.128 - mv /tmp/$USER-files /home/$USER 2.129 - chown -R $USER.$USER /home/$USER 2.130 - else 2.131 - rm -rf /tmp/$USER-files 2.132 - fi 2.133 - # Install all packages in /home/boot/packages. In live CD and 2.134 - # USB mode the option home= mounts the device on /home, so we 2.135 - # already have a boot directory with the Kernel and rootfs. 2.136 - if [ -d "/home/boot/packages" ]; then 2.137 - for pkg in /home/boot/packages/*.tazpkg 2.138 - do 2.139 - tazpkg install $pkg 2.140 - done 2.141 - fi ;; 2.142 - laptop) 2.143 - # Laptop option to load related Kernel modules. 2.144 - echo "Loading laptop modules: ac, battery, fan, yenta_socket..." 2.145 - for mod in ac battery fan yenta_socket 2.146 - do 2.147 - modprobe $mod 2.148 - done 2.149 - grep -qs batt /etc/lxpanel/default/panels/panel || 2.150 - sed -i 's/= cpu/= batt\n}\n\nPlugin {\n type = cpu/' \ 2.151 - /etc/lxpanel/default/panels/panel 2> /dev/null 2.152 - # Enable Kernel Laptop mode. 2.153 - echo "5" > /proc/sys/vm/laptop_mode ;; 2.154 - mount) 2.155 - # Mount all ext3 partitions found (opt: mount). 2.156 - # Get the list of partitions. 2.157 - DEVICES_LIST=`fdisk -l | grep 83 | cut -d " " -f 1` 2.158 - # Mount filesystems rw. 2.159 - for device in $DEVICES_LIST 2.160 - do 2.161 - name=${device#/dev/} 2.162 - # Device can be already used by home=usb. 2.163 - if ! mount | grep ^$device >/dev/null; then 2.164 - echo "Mounting partition: $name on /mnt/$name" 2.165 - mkdir /mnt/$name 2.166 - mount $device /mnt/$name 2.167 - fi 2.168 - done ;; 2.169 - mount-packages) 2.170 - # Mount and install packages-XXX.iso (useful without Internet 2.171 - # connection). 2.172 - PKGSIGN="LABEL=\"packages-$(cat /etc/slitaz-release)\" TYPE=\"iso9660\"" 2.173 - PKGDEV=$(blkid | grep "$PKGSIGN" | cut -d: -f1) 2.174 - [ -z "$PKGDEV" -a -L /dev/cdrom ] && \ 2.175 - PKGDEV=$(blkid /dev/cdrom | grep "$PKGSIGN" | cut -d: -f1) 2.176 - if [ -n "$PKGDEV" ]; then 2.177 - echo -n "Mounting packages archive from $PKGDEV..." 2.178 - mkdir /packages && mount -t iso9660 -o ro $PKGDEV /packages 2.179 - status 2.180 - /packages/install.sh 2.181 - fi ;; 2.182 - wm=*) 2.183 - # Check for a Window Manager (for a flavor, default WM can be changed 2.184 - # with boot options or with an addfile in /etc/X11/wm.default. 2.185 - WM=${opt#wm=} 2.186 - mkdir -p /etc/X11 2.187 - case $WM in 2.188 - jwm) 2.189 - echo "jwm" > /etc/X11/wm.default ;; 2.190 - ob|openbox|openbox-session) 2.191 - echo "openbox" > /etc/X11/wm.default ;; 2.192 - e17|enlightenment|enlightenment_start) 2.193 - echo "enlightenment" > /etc/X11/wm.default ;; 2.194 - esac ;; 2.195 - *) 2.196 - continue ;; 2.197 - esac 2.198 -done 2.199 - 2.200 -# If no default WM fallback to Openbox (we never know). 2.201 -if [ ! -f /etc/X11/wm.default ]; then 2.202 - echo "openbox" > /etc/X11/wm.default 2.203 -fi 2.204 - 2.205 -# Activate an eventual swap file or partition. 2.206 -if [ "`fdisk -l | grep swap`" ]; then 2.207 - for SWAP_DEV in `fdisk -l | grep swap | awk '{ print $1 }'`; do 2.208 - echo "Swap memory detected on: $SWAP_DEV" 2.209 - add_swap_in_fstab $SWAP_DEV 2.210 - done 2.211 -fi 2.212 -if grep -q swap /etc/fstab; then 2.213 - echo "Activating swap memory..." 2.214 - swapon -a 2.215 -fi
3.1 --- a/core/rootfs/etc/init.d/network.sh Tue Mar 23 20:48:04 2010 +0100 3.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 3.3 @@ -1,216 +0,0 @@ 3.4 -#!/bin/sh 3.5 -# /etc/init.d/network.sh - Network initialization boot script. 3.6 -# Config file is: /etc/network.conf 3.7 -# 3.8 -. /etc/init.d/rc.functions 3.9 - 3.10 -if [ -z "$2" ]; then 3.11 - . /etc/network.conf 3.12 -else 3.13 - . $2 3.14 -fi 3.15 - 3.16 - 3.17 -Boot() { 3.18 - # Set hostname. 3.19 - echo -n "Setting hostname..." 3.20 - /bin/hostname -F /etc/hostname 3.21 - status 3.22 - 3.23 - # Configure loopback interface. 3.24 - echo -n "Configuring loopback..." 3.25 - /sbin/ifconfig lo 127.0.0.1 up 3.26 - /sbin/route add 127.0.0.1 lo 3.27 - status 3.28 -} 3.29 - 3.30 - 3.31 -eth() { 3.32 -# Use ethernet 3.33 - ifconfig $INTERFACE up 3.34 -} 3.35 - 3.36 -wifi() { 3.37 - # For wifi. Users just have to enable it through yes and usually 3.38 - # essid any will work and the interface is autodetected. 3.39 - if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then 3.40 - ifconfig $INTERFACE down 3.41 - 3.42 - # Confirm if $WIFI_INTERFACE is the wifi interface 3.43 - if [ ! -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then 3.44 - echo "$WIFI_INTERFACE is not a wifi interface, changing it." 3.45 - WIFI_INTERFACE=$(grep : /proc/net/dev | cut -d: -f1 | \ 3.46 - while read dev; do iwconfig $dev 2>&1 | \ 3.47 - grep -iq "essid" && { echo $dev ; break; }; \ 3.48 - done) 3.49 - [ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf 3.50 - fi 3.51 - 3.52 - echo -n "Configuring $WIFI_INTERFACE..." 3.53 - ifconfig $WIFI_INTERFACE up 3.54 - if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then 3.55 - iwconfig $WIFI_INTERFACE txpower on 3.56 - fi 3.57 - status 3.58 - 3.59 - [ -n "$WPA_DRIVER" ] || WPA_DRIVER="wext" 3.60 - 3.61 - 3.62 - IWCONFIG_ARGS="" 3.63 - [ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE" 3.64 - [ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL" 3.65 - 3.66 - if [ "$WIFI_KEY_TYPE" == "" ]; then 3.67 - iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS 3.68 - fi 3.69 - 3.70 - [ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in 3.71 - wep|WEP) 3.72 - IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY" 3.73 - iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS 3.74 -# wpa_supplicant can also deal with wep encryption but iwconfig is preferred 3.75 -# Tip: Use unquoted strings for hexadecimal key in wep_key0 3.76 -# cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 3.77 -# cat >> /tmp/wpa.conf <<EOF 3.78 -#ctrl_interface=/var/run/wpa_supplicant 3.79 -#ctrl_interface_group=0 3.80 -#ap_scan=1 3.81 -#network={ 3.82 -# ssid="$WIFI_ESSID" 3.83 -# scan_ssid=1 3.84 -# key_mgmt=NONE 3.85 -# wep_key0="$WIFI_KEY" 3.86 -# wep_tx_keyidx=0 3.87 -# priority=5 3.88 -#} 3.89 -#EOF 3.90 - ;; 3.91 - wpa|WPA) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf # load pre-configured multiple profiles 3.92 - cat >> /tmp/wpa.conf <<EOF 3.93 -ctrl_interface=/var/run/wpa_supplicant 3.94 -ctrl_interface_group=0 3.95 -ap_scan=1 3.96 -network={ 3.97 - ssid="$WIFI_ESSID" 3.98 - scan_ssid=1 3.99 - proto=WPA RSN 3.100 - key_mgmt=WPA-PSK 3.101 - psk="$WIFI_KEY" 3.102 - priority=5 3.103 -} 3.104 -EOF 3.105 - echo "Starting wpa_supplicant for WPA-PSK..." 3.106 - wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 3.107 - ;; 3.108 - any|ANY) cat /etc/wpa_supplicant.conf > /tmp/wpa.conf 3.109 - cat >> /tmp/wpa.conf <<EOF 3.110 -ctrl_interface=/var/run/wpa_supplicant 3.111 -ctrl_interface_group=0 3.112 -ap_scan=1 3.113 -network={ 3.114 - ssid="$WIFI_ESSID" 3.115 - scan_ssid=1 3.116 - key_mgmt=WPA-EAP WPA-PSK IEEE8021X NONE 3.117 - group=CCMP TKIP WEP104 WEP40 3.118 - pairwise=CCMP TKIP 3.119 - psk="$WIFI_KEY" 3.120 - priority=5 3.121 -} 3.122 -EOF 3.123 - echo "Starting wpa_supplicant for any key type..." 3.124 - wpa_supplicant -B -W -c/tmp/wpa.conf -D$WPA_DRIVER -i$WIFI_INTERFACE 3.125 - ;; 3.126 - esac 3.127 - 3.128 - rm -f /tmp/wpa.conf 3.129 - 3.130 - INTERFACE=$WIFI_INTERFACE 3.131 - fi 3.132 - 3.133 -} 3.134 - 3.135 -wpa() 3.136 -{ 3.137 - DHCP_SCRIPT="/etc/init.d/wpa_action.sh" 3.138 - wpa_cli -a$DHCP_SCRIPT -B 3.139 -} 3.140 - 3.141 -dhcp() { 3.142 - 3.143 -# For a dynamic IP with DHCP. 3.144 - if [ "$DHCP" = "yes" ] ; then 3.145 - echo "Starting udhcpc client on: $INTERFACE..." 3.146 - if [ -d /var/run/wpa_supplicant ]; then # wpa wireless && wpa_ctrl_open interface is up 3.147 - wpa 3.148 - else # fallback on udhcpc: wep, eth 3.149 - /sbin/udhcpc -b -T 1 -A 12 -i $INTERFACE -p /var/run/udhcpc.$INTERFACE.pid 3.150 - fi 3.151 - fi 3.152 - 3.153 -} 3.154 - 3.155 -static_ip() { 3.156 -# For a static IP. 3.157 - if [ "$STATIC" = "yes" ] ; then 3.158 - echo "Configuring static IP on $INTERFACE: $IP..." 3.159 - /sbin/ifconfig $INTERFACE $IP netmask $NETMASK up 3.160 - /sbin/route add default gateway $GATEWAY 3.161 - # Dirty trick: wpa_supplicant waits for wpa_cli 3.162 - wpa_cli -B 3.163 - # Multi-DNS server in $DNS_SERVER. 3.164 - /bin/mv /etc/resolv.conf /tmp/resolv.conf.$$ 3.165 - for NS in $DNS_SERVER 3.166 - do 3.167 - echo "nameserver $NS" >> /etc/resolv.conf 3.168 - done 3.169 - fi 3.170 -} 3.171 - 3.172 -# Stopping everything 3.173 -Stop() { 3.174 - echo "Stopping all interfaces" 3.175 - ifconfig $INTERFACE down 3.176 - ifconfig $WIFI_INTERFACE down 3.177 - 3.178 - echo "Killing all daemons" 3.179 - killall udhcpc 3.180 - killall wpa_supplicant 2>/dev/null 3.181 - 3.182 - if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then 3.183 - echo "Shutting down wifi card" 3.184 - iwconfig $WIFI_INTERFACE txpower off 3.185 - fi 3.186 -} 3.187 - 3.188 -Start() { 3.189 - eth 3.190 - wifi 3.191 - dhcp 3.192 - static_ip 3.193 -} 3.194 - 3.195 - 3.196 -# looking for arguments: 3.197 -if [ -z "$1" ]; then 3.198 - Boot 3.199 - Start 3.200 -else 3.201 - case $1 in 3.202 - start) 3.203 - Start ;; 3.204 - stop) 3.205 - Stop ;; 3.206 - restart) 3.207 - Stop 3.208 - Start ;; 3.209 - *) 3.210 - echo "" 3.211 - echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" 3.212 - echo "" 3.213 - echo -e " Default configuration file is \033[1m/etc/network.conf\033[0m" 3.214 - echo -e " You can specify another configuration file in the second argument:" 3.215 - echo -e " \033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart] file.conf" 3.216 - echo "" 3.217 - 3.218 - esac 3.219 -fi
4.1 --- a/core/rootfs/etc/lxpanel/default/panels/panel Tue Mar 23 20:48:04 2010 +0100 4.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 4.3 @@ -1,185 +0,0 @@ 4.4 -# lxpanel <profile> config file. Manually editing is not recommended. 4.5 -# Use preference dialog in lxpanel to adjust config when you can. 4.6 - 4.7 -Global { 4.8 - edge=bottom 4.9 - allign=center 4.10 - margin=0 4.11 - widthtype=percent 4.12 - width=100 4.13 - height=24 4.14 - transparent=1 4.15 - tintcolor=#000000 4.16 - alpha=0 4.17 - autohide=0 4.18 - heightwhenhidden=2 4.19 - setdocktype=1 4.20 - setpartialstrut=1 4.21 - usefontcolor=1 4.22 - fontcolor=#ffffff 4.23 - background=0 4.24 - backgroundfile=/usr/share/lxpanel/images/background.png 4.25 - iconsize=24 4.26 -} 4.27 - 4.28 -Plugin { 4.29 - type = space 4.30 - Config { 4.31 - Size=4 4.32 - } 4.33 -} 4.34 - 4.35 -Plugin { 4.36 - type = menu 4.37 - Config { 4.38 - image=/usr/share/pixmaps/slitaz-menu.png 4.39 - system { 4.40 - } 4.41 - separator { 4.42 - } 4.43 - item { 4.44 - image=/usr/share/icons/SliTaz/16x16/categories/applications-system.png 4.45 - command=run 4.46 - } 4.47 - separator { 4.48 - } 4.49 - item { 4.50 - image=/usr/share/pixmaps/logout.png 4.51 - command=logout 4.52 - } 4.53 - } 4.54 -} 4.55 - 4.56 -Plugin { 4.57 - type = space 4.58 - Config { 4.59 - Size=4 4.60 - } 4.61 -} 4.62 - 4.63 -Plugin { 4.64 - type = launchbar 4.65 - Config { 4.66 - Button { 4.67 - id=xterm.desktop 4.68 - } 4.69 - Button { 4.70 - id=midori.desktop 4.71 - } 4.72 - } 4.73 -} 4.74 - 4.75 -Plugin { 4.76 - type = pager 4.77 -} 4.78 - 4.79 -Plugin { 4.80 - type = wincmd 4.81 - Config { 4.82 - image=window-manager 4.83 - Button1=iconify 4.84 - Button2=shade 4.85 - Toggle=0 4.86 - } 4.87 -} 4.88 - 4.89 -Plugin { 4.90 - type = taskbar 4.91 - expand=1 4.92 - Config { 4.93 - tooltips=1 4.94 - IconsOnly=0 4.95 - ShowAllDesks=0 4.96 - UseMouseWheel=1 4.97 - UseUrgencyHint=1 4.98 - FlatButton=1 4.99 - MaxTaskWidth=200 4.100 - spacing=1 4.101 - GroupedTasks=0 4.102 - } 4.103 -} 4.104 - 4.105 -Plugin { 4.106 - type = space 4.107 - Config { 4.108 - Size=4 4.109 - } 4.110 -} 4.111 - 4.112 -Plugin { 4.113 - type = tray 4.114 -} 4.115 - 4.116 -Plugin { 4.117 - type = volumealsa 4.118 -} 4.119 - 4.120 -Plugin { 4.121 - type = space 4.122 - Config { 4.123 - Size=4 4.124 - } 4.125 -} 4.126 - 4.127 -Plugin { 4.128 - type = netstatus 4.129 - Config { 4.130 - iface=eth0 4.131 - configtool=subox netbox %i 4.132 - } 4.133 -} 4.134 - 4.135 -Plugin { 4.136 - type = space 4.137 - Config { 4.138 - Size=4 4.139 - } 4.140 -} 4.141 - 4.142 -Plugin { 4.143 - type = batt 4.144 - Config { 4.145 - HideIfNoBattery=0 4.146 - AlarmCommand=xmessage Battery low 4.147 - AlarmTime=5 4.148 - BackgroundColor=black 4.149 - BorderWidth=1 4.150 - ChargingColor1=#28f200 4.151 - ChargingColor2=#22cc00 4.152 - DischargingColor1=#ffee00 4.153 - DischargingColor2=#d9ca00 4.154 - Size=8 4.155 - } 4.156 -} 4.157 - 4.158 -Plugin { 4.159 - type = cpu 4.160 -} 4.161 - 4.162 -Plugin { 4.163 - type = space 4.164 - Config { 4.165 - Size=2 4.166 - } 4.167 -} 4.168 - 4.169 -Plugin { 4.170 - type = launchbar 4.171 - Config { 4.172 - Button { 4.173 - id=tazpkgbox.desktop 4.174 - } 4.175 - } 4.176 -} 4.177 - 4.178 -Plugin { 4.179 - type = dclock 4.180 - Config { 4.181 - ClockFmt=%R 4.182 - TooltipFmt=%A %x 4.183 - Action=desktopbox calendar 4.184 - BoldFont=0 4.185 - IconOnly=0 4.186 - } 4.187 -} 4.188 -
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000 5.2 +++ b/core/rootfs/etc/skel/Desktop/slitaz-doc.desktop Thu Mar 25 23:17:57 2010 +0100 5.3 @@ -0,0 +1,5 @@ 5.4 +[Desktop Entry] 5.5 +Name=Documentation 5.6 +Exec=GtkLauncher file:///usr/share/doc/slitaz/index.html 5.7 +Icon=slitaz-doc.png 5.8 +Type=Application
6.1 --- a/justx/packages.list Tue Mar 23 20:48:04 2010 +0100 6.2 +++ b/justx/packages.list Thu Mar 25 23:17:57 2010 +0100 6.3 @@ -1,6 +1,6 @@ 6.4 busybox 6.5 bzlib 6.6 -cairo 6.7 +cairo-xcb 6.8 cdrkit 6.9 conspy 6.10 dbus 6.11 @@ -92,6 +92,6 @@ 6.12 xorg-xf86-input-keyboard 6.13 xorg-xf86-input-mouse 6.14 xorg-xf86-video-vesa 6.15 -xorg-xrandr 6.16 +xorg-xsetroot 6.17 xterm 6.18 zlib
7.1 --- a/justx/rootfs/etc/xdg/openbox/autostart.sh Tue Mar 23 20:48:04 2010 +0100 7.2 +++ b/justx/rootfs/etc/xdg/openbox/autostart.sh Thu Mar 25 23:17:57 2010 +0100 7.3 @@ -23,13 +23,16 @@ 7.4 #xcompmgr -c -r 10 & 7.5 7.6 # Set a background image using hsetroot (depends on imlib2). 7.7 -hsetroot -fill /usr/share/images/slitaz-background.jpg & 7.8 +#hsetroot -fill /usr/share/images/slitaz-background.jpg & 7.9 7.10 # Start Tint2 desktop panel 7.11 -tint2 & 7.12 +#tint2 & 7.13 7.14 # Background color with xsetroot. 7.15 -#xsetroot -solid "#222222" & 7.16 +xsetroot -solid "#222222" & 7.17 + 7.18 +# Start a Xterm 7.19 +xterm & 7.20 7.21 # Wbar icons panel. 7.22 #(sleep 2 && wbar -above-desk -pos top center -jumpf 0 -zoomf 1.5 -bpress -balfa 0) &
8.1 --- a/justx/rootfs/etc/xdg/tint2/tint2rc Tue Mar 23 20:48:04 2010 +0100 8.2 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 8.3 @@ -1,92 +0,0 @@ 8.4 -#--------------------------------------------- 8.5 -# TINT2 CONFIG FILE 8.6 -#--------------------------------------------- 8.7 - 8.8 -#--------------------------------------------- 8.9 -# BACKGROUND AND BORDER 8.10 -#--------------------------------------------- 8.11 -rounded = 8 8.12 -border_width = 1 8.13 -background_color = #000000 60 8.14 -border_color = #ffffff 18 8.15 - 8.16 -rounded = 5 8.17 -border_width = 0 8.18 -background_color = #ffffff 40 8.19 -border_color = #ffffff 50 8.20 - 8.21 -rounded = 5 8.22 -border_width = 0 8.23 -background_color = #ffffff 18 8.24 -border_color = #ffffff 70 8.25 - 8.26 -#--------------------------------------------- 8.27 -# PANEL 8.28 -#--------------------------------------------- 8.29 -panel_monitor = all 8.30 -panel_position = bottom center 8.31 -panel_size = 92% 30 8.32 -panel_margin = 0 0 8.33 -panel_padding = 7 0 8.34 -font_shadow = 0 8.35 -panel_background_id = 1 8.36 - 8.37 -#--------------------------------------------- 8.38 -# TASKBAR 8.39 -#--------------------------------------------- 8.40 -taskbar_mode = single_monitor 8.41 -taskbar_padding = 2 3 2 8.42 -taskbar_background_id = 0 8.43 - 8.44 -#--------------------------------------------- 8.45 -# TASKS 8.46 -#--------------------------------------------- 8.47 -task_icon = 1 8.48 -task_text = 1 8.49 -task_width = 140 8.50 -task_centered = 1 8.51 -task_padding = 6 3 8.52 -task_font = sans 7 8.53 -task_font_color = #ffffff 70 8.54 -task_active_font_color = #ffffff 85 8.55 -task_background_id = 3 8.56 -task_active_background_id = 2 8.57 - 8.58 -#--------------------------------------------- 8.59 -# SYSTRAYBAR 8.60 -#--------------------------------------------- 8.61 -systray_padding = 0 4 5 8.62 -systray_background_id = 0 8.63 - 8.64 -#--------------------------------------------- 8.65 -# CLOCK 8.66 -#--------------------------------------------- 8.67 -time1_format = %H:%m 8.68 -time1_font = sans 9 8.69 -#time2_format = %A %d %B 8.70 -#time2_font = sans 8 8.71 -clock_font_color = #ffffff 96 8.72 -clock_padding = 1 0 8.73 -clock_background_id = 0 8.74 - 8.75 -#--------------------------------------------- 8.76 -# BATTERY 8.77 -#--------------------------------------------- 8.78 -battery = 0 8.79 -battery_low_status = 7 8.80 -battery_low_cmd = desktopbox notify "Battery low" 8.81 -bat1_font = sans 8 8.82 -bat2_font = sans 8 8.83 -battery_font_color = #ffffff 96 8.84 -battery_padding = 1 0 8.85 -battery_background_id = 0 8.86 - 8.87 - 8.88 -#--------------------------------------------- 8.89 -# MOUSE ACTION ON TASK 8.90 -#--------------------------------------------- 8.91 -mouse_middle = none 8.92 -mouse_right = close 8.93 -mouse_scroll_up = toggle 8.94 -mouse_scroll_down = iconify 8.95 -