# HG changeset patch # User Christophe Lincoln # Date 1269184425 -3600 # Node ID f4bb5be6b33791feec7a789c9bf8ec12c595426e # Parent 11e6966b7a35d0143e8b8bd51ffc29e9054fd550 core: add 915resolution and last bootscript diff -r 11e6966b7a35 -r f4bb5be6b337 core/packages.list --- a/core/packages.list Mon Mar 08 18:44:20 2010 +0100 +++ b/core/packages.list Sun Mar 21 16:13:45 2010 +0100 @@ -1,7 +1,7 @@ atk busybox bzlib -cairo +cairo-xcb cdrkit clearlooks conspy @@ -146,5 +146,8 @@ beaver lua epdfview +915resolution +libunique libwebkit midori +gettext-base diff -r 11e6966b7a35 -r f4bb5be6b337 core/rootfs/etc/init.d/bootopts.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/rootfs/etc/init.d/bootopts.sh Sun Mar 21 16:13:45 2010 +0100 @@ -0,0 +1,212 @@ +#!/bin/sh +# /etc/init.d/bootopts.sh - SliTaz boot options from the cmdline. +# +# Earlier boot options are in rcS, ex: config= and modprobe= +# +. /etc/init.d/rc.functions + +# Update fstab for swapon/swapoff +add_swap_in_fstab() +{ + grep -q "$1 " /etc/fstab || cat >> /etc/fstab <> /etc/passwd + echo "$USER::14035:0:99999:7:::" >> /etc/shadow + echo "$USER:x:1000:" >> /etc/group + echo "$USER:!::" >> /etc/gshadow + status + # Audio and cdrom group. + addgroup $USER audio + addgroup $USER cdrom + # /home/$USER files from /etc/skel. + if [ -d /etc/skel ]; then + cp -a /etc/skel /home/$USER + # 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 + # Set permissions. + chown -R $USER.$USER /home/$USER + # Slim default user. + if [ -f /etc/slim.conf ]; then + sed -i s/"default_user .*"/"default_user $USER"/\ + /etc/slim.conf + fi +fi + +# Parse /proc/cmdline for boot options. +echo "Parsing kernel cmdline for SliTaz live options... " + +for opt in `cat /proc/cmdline` +do + case $opt in + 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 & + 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..." + USBDELAY=`cat /sys/module/usb_storage/parameters/delay_use` + USBDELAY=$((1+$USBDELAY)) + echo "Sleeping $USBDELAY s to let the kernel detect the device... " + sleep $USBDELAY + USER=`cat /etc/passwd | grep 1000 | cut -d ":" -f 1` + DEVID=$DEVICE + if [ -x /sbin/blkid ]; then + # Can be a label, uuid or devname. DEVID gives us first: /dev/name. + DEVID=`/sbin/blkid | grep $DEVICE | cut -d: -f1` + DEVID=${DEVID##*/} + fi + 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=`cat /proc/cmdline | sed 's/.*swap=\([^ ]*\).*/\1/'` + # 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.$USER /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 ;; + laptop) + # Laptop option to load related Kernel modules. + echo "Loading laptop modules: ac, battery, fan, yenta_socket..." + for mod in ac battery fan yenta_socket + do + modprobe $mod + done + grep -qs batt /etc/lxpanel/default/panels/panel || + sed -i 's/= cpu/= batt\n}\n\nPlugin {\n type = cpu/' \ + /etc/lxpanel/default/panels/panel 2> /dev/null + # Enable Kernel Laptop mode. + echo "5" > /proc/sys/vm/laptop_mode ;; + mount) + # Mount all ext3 partitions found (opt: mount). + # Get the list of partitions. + DEVICES_LIST=`fdisk -l | grep 83 | cut -d " " -f 1` + # Mount filesystems rw. + for device in $DEVICES_LIST + do + name=${device#/dev/} + # Device can be already used by home=usb. + if ! mount | grep ^$device >/dev/null; then + echo "Mounting partition: $name on /mnt/$name" + mkdir /mnt/$name + mount $device /mnt/$name + fi + done ;; + mount-packages) + # Mount and install packages-XXX.iso (useful without Internet + # connection). + PKGSIGN="LABEL=\"packages-$(cat /etc/slitaz-release)\" TYPE=\"iso9660\"" + PKGDEV=$(blkid | grep "$PKGSIGN" | cut -d: -f1) + [ -z "$PKGDEV" -a -L /dev/cdrom ] && \ + PKGDEV=$(blkid /dev/cdrom | grep "$PKGSIGN" | cut -d: -f1) + if [ -n "$PKGDEV" ]; then + echo -n "Mounting packages archive from $PKGDEV..." + mkdir /packages && mount -t iso9660 -o ro $PKGDEV /packages + 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 | grep swap | awk '{ print $1 }'`; do + echo "Swap memory detected on: $SWAP_DEV" + add_swap_in_fstab $SWAP_DEV + done +fi +if grep -q swap /etc/fstab; then + echo "Activating swap memory..." + swapon -a +fi diff -r 11e6966b7a35 -r f4bb5be6b337 core/rootfs/etc/init.d/network.sh --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/core/rootfs/etc/init.d/network.sh Sun Mar 21 16:13:45 2010 +0100 @@ -0,0 +1,216 @@ +#!/bin/sh +# /etc/init.d/network.sh - Network initialization boot script. +# Config file is: /etc/network.conf +# +. /etc/init.d/rc.functions + +if [ -z "$2" ]; then + . /etc/network.conf +else + . $2 +fi + + +Boot() { + # Set hostname. + echo -n "Setting hostname..." + /bin/hostname -F /etc/hostname + status + + # Configure loopback interface. + echo -n "Configuring loopback..." + /sbin/ifconfig lo 127.0.0.1 up + /sbin/route add 127.0.0.1 lo + status +} + + +eth() { +# Use ethernet + ifconfig $INTERFACE up +} + +wifi() { + # For wifi. Users just have to enable it through yes and usually + # essid any will work and the interface is autodetected. + if [ "$WIFI" = "yes" ] || grep -q "wifi" /proc/cmdline; then + ifconfig $INTERFACE down + + # Confirm if $WIFI_INTERFACE is the wifi interface + if [ ! -d /sys/class/net/$WIFI_INTERFACE/wireless ]; then + echo "$WIFI_INTERFACE is not a wifi interface, changing it." + WIFI_INTERFACE=$(grep : /proc/net/dev | cut -d: -f1 | \ + while read dev; do iwconfig $dev 2>&1 | \ + grep -iq "essid" && { echo $dev ; break; }; \ + done) + [ -n "$WIFI_INTERFACE" ] && sed -i "s/^WIFI_INTERFACE=.*/WIFI_INTERFACE=\"$WIFI_INTERFACE\"/" /etc/network.conf + fi + + echo -n "Configuring $WIFI_INTERFACE..." + ifconfig $WIFI_INTERFACE up + if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then + iwconfig $WIFI_INTERFACE txpower on + fi + status + + [ -n "$WPA_DRIVER" ] || WPA_DRIVER="wext" + + + IWCONFIG_ARGS="" + [ -n "$WIFI_MODE" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS mode $WIFI_MODE" + [ -n "$WIFI_CHANNEL" ] && IWCONFIG_ARGS="$IWCONFIG_ARGS channel $WIFI_CHANNEL" + + if [ "$WIFI_KEY_TYPE" == "" ]; then + iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS + fi + + [ -n "$WIFI_KEY" ] && case "$WIFI_KEY_TYPE" in + wep|WEP) + IWCONFIG_ARGS="$IWCONFIG_ARGS key $WIFI_KEY" + iwconfig $WIFI_INTERFACE essid "$WIFI_ESSID" $IWCONFIG_ARGS +# wpa_supplicant can also deal with wep encryption but iwconfig is preferred +# Tip: Use unquoted strings for hexadecimal key in wep_key0 +# cat /etc/wpa_supplicant.conf > /tmp/wpa.conf +# cat >> /tmp/wpa.conf < /tmp/wpa.conf # load pre-configured multiple profiles + cat >> /tmp/wpa.conf < /tmp/wpa.conf + cat >> /tmp/wpa.conf <> /etc/resolv.conf + done + fi +} + +# Stopping everything +Stop() { + echo "Stopping all interfaces" + ifconfig $INTERFACE down + ifconfig $WIFI_INTERFACE down + + echo "Killing all daemons" + killall udhcpc + killall wpa_supplicant 2>/dev/null + + if iwconfig $WIFI_INTERFACE | grep -q "Tx-Power"; then + echo "Shutting down wifi card" + iwconfig $WIFI_INTERFACE txpower off + fi +} + +Start() { + eth + wifi + dhcp + static_ip +} + + +# looking for arguments: +if [ -z "$1" ]; then + Boot + Start +else + case $1 in + start) + Start ;; + stop) + Stop ;; + restart) + Stop + Start ;; + *) + echo "" + echo -e "\033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart]" + echo "" + echo -e " Default configuration file is \033[1m/etc/network.conf\033[0m" + echo -e " You can specify another configuration file in the second argument:" + echo -e " \033[1mUsage:\033[0m /etc/init.d/`basename $0` [start|stop|restart] file.conf" + echo "" + + esac +fi diff -r 11e6966b7a35 -r f4bb5be6b337 core/rootfs/etc/skel/.config/pcmanfm/main --- a/core/rootfs/etc/skel/.config/pcmanfm/main Mon Mar 08 18:44:20 2010 +0100 +++ b/core/rootfs/etc/skel/.config/pcmanfm/main Sun Mar 21 16:13:45 2010 +0100 @@ -12,4 +12,4 @@ show_desktop=1 show_wallpaper=1 wallpaper=/usr/share/images/slitaz-background.jpg -show_wm_menu=0 +show_wm_menu=1 diff -r 11e6966b7a35 -r f4bb5be6b337 core/rootfs/etc/skel/Desktop/slitaz-doc.desktop --- a/core/rootfs/etc/skel/Desktop/slitaz-doc.desktop Mon Mar 08 18:44:20 2010 +0100 +++ b/core/rootfs/etc/skel/Desktop/slitaz-doc.desktop Sun Mar 21 16:13:45 2010 +0100 @@ -1,5 +1,5 @@ [Desktop Entry] Name=Documentation -Exec=browser file:///usr/share/doc/slitaz/index.html +Exec=GtkLauncher file:///usr/share/doc/slitaz/index.html Icon=slitaz-doc.png Type=Application