diff --git a/README.md b/README.md index 54752c1..fddf17d 100644 --- a/README.md +++ b/README.md @@ -14,6 +14,7 @@ The script accepts certain command-line parameters to enable or disable specific ```shell ENABLE_UBOOT=true ./rpi2-gen-image.sh ENABLE_CONSOLE=false ENABLE_IPV6=false ./rpi2-gen-image.sh +ENABLE_WM=xfce4 ENABLE_FBTURBO=true ENABLE_MINBASE=true ./rpi2-gen-image.sh ENABLE_HARDNET=true ENABLE_IPTABLES=true /rpi2-gen-image.sh APT_SERVER=ftp.de.debian.org APT_PROXY="http://127.0.0.1:3142/" ./rpi2-gen-image.sh ENABLE_MINBASE=true ./rpi2-gen-image.sh @@ -64,8 +65,8 @@ Install and enable D-Bus message bus. Please note that systemd should work witho ##### `ENABLE_XORG`=false Install Xorg open-source X Window System. -##### `ENABLE_FLUXBOX`=false -Install Fluxbox window manager for the X Window System. To make sure all X related package dependencies are getting installed `ENABLE_XORG` will automatically get enabled if `ENABLE_FLUXBOX` is used. +##### `ENABLE_WM`="" +Install a user defined window manager for the X Window System. To make sure all X related package dependencies are getting installed `ENABLE_XORG` will automatically get enabled if `ENABLE_WM` is used. The `rpi2-gen-image.sh` script has been tested with the following list of window managers: `blackbox`, `openbox`, `fluxbox`, `jwm`, `dwm`, `xfce4`, `awesome`. #### Advanced sytem features: ##### `ENABLE_MINBASE`=false diff --git a/rpi2-gen-image.sh b/rpi2-gen-image.sh index cb09f17..c6bef8a 100755 --- a/rpi2-gen-image.sh +++ b/rpi2-gen-image.sh @@ -59,7 +59,7 @@ ENABLE_DBUS=${ENABLE_DBUS:=true} ENABLE_HWRANDOM=${ENABLE_HWRANDOM:=true} ENABLE_MINGPU=${ENABLE_MINGPU:=false} ENABLE_XORG=${ENABLE_XORG:=false} -ENABLE_FLUXBOX=${ENABLE_FLUXBOX:=false} +ENABLE_WM=${ENABLE_WM:=""} # Advanced settings ENABLE_MINBASE=${ENABLE_MINBASE:=false} @@ -162,9 +162,9 @@ if [ "$ENABLE_FBTURBO" = true ] ; then ENABLE_XORG=true fi -# Add fluxbox package with eterm -if [ "$ENABLE_FLUXBOX" = true ] ; then - APT_INCLUDES="${APT_INCLUDES},fluxbox,eterm" +# Add user defined window manager package +if [ -n "$ENABLE_WM" ] ; then + APT_INCLUDES="${APT_INCLUDES},${ENABLE_WM}" # Enable xorg package dependencies ENABLE_XORG=true