SliTaz Repositories

     1.1 --- a/etc/init.d/bootopts.sh	Fri Mar 23 10:53:35 2012 +0100
     1.2 +++ b/etc/init.d/bootopts.sh	Tue Apr 17 15:56:40 2012 +0200
     1.3 @@ -148,9 +148,6 @@
     1.4  			do
     1.5  				modprobe $mod
     1.6  			done
     1.7 -			grep -qs batt /etc/lxpanel/default/panels/panel ||
     1.8 -			sed -i 's/= cpu/= batt\n}\n\nPlugin {\n    type = cpu/' \
     1.9 -				/etc/lxpanel/default/panels/panel 2> /dev/null
    1.10  			# Enable Kernel Laptop mode.
    1.11  			echo "5" > /proc/sys/vm/laptop_mode ;;
    1.12  		mount)
    1.13 @@ -183,17 +180,18 @@
    1.14  			fi ;;
    1.15  		wm=*)
    1.16  			# Check for a Window Manager (for a flavor, default WM can be changed
    1.17 -			# with boot options or with an addfile in /etc/X11/wm.default.
    1.18 +			# with boot options or via /etc/slitaz/applications.conf).
    1.19  			WM=${opt#wm=}
    1.20 -			mkdir -p /etc/X11
    1.21  			case $WM in
    1.22 -				jwm)
    1.23 -					echo "jwm" > /etc/X11/wm.default ;;
    1.24  				ob|openbox|openbox-session)
    1.25 -					echo "openbox" > /etc/X11/wm.default ;;
    1.26 +					WM=openbox-session ;;
    1.27  				e17|enlightenment|enlightenment_start)
    1.28 -					echo "enlightenment" > /etc/X11/wm.default ;;
    1.29 -			esac ;;
    1.30 +					WM=enlightenment ;;
    1.31 +				razorqt|razor-session)
    1.32 +					WM=razor-session ;;
    1.33 +			esac
    1.34 +			sed -i s/"WINDOW_MANAGER=.*"/"WINDOW_MANAGER=\"$WM\""/ \
    1.35 +				/etc/slitaz/applications.conf ;;
    1.36  		*)
    1.37  			continue ;;
    1.38  	esac