merging trunk

config/path

@@ -255,10 +255,10 @@ add_user() {
 }
 
 add_group() {
-  # Usage: add_group "groupname" "groupid"
+  # Usage: add_group "groupname" "groupid" ("members")
   mkdir -p ${INSTALL}/etc
   touch ${INSTALL}/etc/group
   if [ -z "`grep "$1:" ${INSTALL}/etc/group`" ]; then
-    echo "$1:x:$2:" >> ${INSTALL}/etc/group
+    echo "$1:x:$2:$3" >> ${INSTALL}/etc/group
   fi
 }

packages/audio/alsa-utils/scripts/soundconfig

@@ -9,7 +9,7 @@ mixer() {
 }
 
 (
-. /etc/sysconfig
+. /etc/profile
 
 progress "Setting up sound card"
 

packages/image/install

@@ -39,6 +39,7 @@ case "$2" in
     mkdir -p $INSTALL/var
     mkdir -p $INSTALL/flash
     mkdir -p $INSTALL/storage
+    echo "chmod 1777 $INSTALL/storage" >> $FAKEROOT_SCRIPT
 
     ln -sf /var $INSTALL/usr/var
     ln -sf /var/tmp $INSTALL/tmp

packages/mediacenter/xbmc/conf.d/xbmc

@@ -1,29 +0,0 @@
-################################################################################
-# Mediacenter environment variables.
-#
-# This file contains non-OpenELEC evironment variables as well as OpenELEC
-# evironment variables that are not user defined.
-################################################################################
-
-XBMC_CACHING="no"
-
-#-------------------------------------------------------------------------------
-# do not change anything below
-#-------------------------------------------------------------------------------
-
-XBMC_HOME="/usr/share/xbmc"
-
-export XBMC_HOME
-
-cache_xbmc () {
-  progress "caching XBMC"
-    mkdir -p /var/cache/bin
-    $IONICE cp -PR /usr/share/xbmc/xbmc.bin /var/cache/bin
-    touch /var/cache/xbmc.cache
-}
-
-wait_for_xbmc_cache () {
-  while [ ! -f /var/cache/xbmc.cache ]; do
-    sleep 1
-  done
-}

packages/mediacenter/xbmc/init.d/09_cache_xbmc

@@ -1,7 +1,7 @@
 #
 # caching xbmc
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 if [ "$XBMC_CACHING" = "yes" ]; then
 

packages/mediacenter/xbmc/profile.d/xbmc.conf

@@ -0,0 +1,10 @@
+################################################################################
+# Mediacenter environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+XBMC_HOME="/usr/share/xbmc"
+
+export XBMC_HOME

packages/mediacenter/xbmc/scripts/xbmc-session

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /etc/sysconfig
+. /etc/profile
 
 XBMC_ARGS="--standalone -fs --lircdev $LIRC_OUTPUT"
 

packages/network/avahi/init.d/24_avahi

@@ -1,6 +1,6 @@
 # start Avahi Daemon
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   progress "Starting Avahi Daemon"

packages/network/connman/init.d/40_connman

@@ -1,6 +1,6 @@
 # start connman network manager
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 progress "Starting Connection Manager"
 

packages/network/dropbear/init.d/41_sshd

@@ -1,22 +1,22 @@
 # start ssh server
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   # Check for the Dropbear RSA key
-    if [ ! -f /etc/dropbear/dropbear_rsa_host_key ] ; then
+    if [ ! -f /storage/.cache/dropbear/dropbear_rsa_host_key ] ; then
       progress "SSH: generating rsa key"
 
-      $IONICE mkdir -p /etc/dropbear
-      dropbearkey -t rsa -f /etc/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
+      $IONICE mkdir -p /storage/.cache/dropbear
+      dropbearkey -t rsa -f /storage/.cache/dropbear/dropbear_rsa_host_key > /dev/null 2>&1
     fi
 
   # Check for the Dropbear DSS key
-    if [ ! -f /etc/dropbear/dropbear_dss_host_key ] ; then
+    if [ ! -f /storage/.cache/dropbear/dropbear_dss_host_key ] ; then
       progress "SSH: generating dsa key"
 
-      $IONICE mkdir -p /etc/dropbear
-      dropbearkey -t dss -f /etc/dropbear/dropbear_dss_host_key > /dev/null 2>&1
+      $IONICE mkdir -p /storage/.cache/dropbear
+      dropbearkey -t dss -f /storage/.cache/dropbear/dropbear_dss_host_key > /dev/null 2>&1
     fi
 
   progress "Starting SSH Server"

packages/network/dropbear/install

@@ -13,5 +13,5 @@ mkdir -p $INSTALL/usr/bin
   cp -PR $PKG_BUILD/dropbearkey $INSTALL/usr/bin
   cp -PR $PKG_BUILD/scp $INSTALL/usr/bin
 
-mkdir -p $INSTALL/usr/config/dropbear
-  ln -s /storage/.config/dropbear $INSTALL/etc/dropbear
+mkdir -p $INSTALL/etc
+  ln -s /storage/.cache/dropbear $INSTALL/etc/dropbear

packages/network/samba/build

@@ -4,6 +4,7 @@
 
 $SCRIPTS/build toolchain
 $SCRIPTS/build libiconv
+$SCRIPTS/build avahi
 
 export samba_cv_CC_NEGATIVE_ENUM_VALUES=no
 

packages/network/samba/init.d/42_samba

@@ -1,6 +1,6 @@
 # start Samba Server
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   progress  "Starting Samba server"

packages/network/samba/install

@@ -3,6 +3,7 @@
 . config/options
 
 $SCRIPTS/install libiconv
+$SCRIPTS/install avahi
 
 PKG_DIR=`find $PACKAGES -type d -name $1`
 

packages/plugins/SABnzbd/init.d/33_SABnzbd

@@ -1,9 +1,11 @@
 # Starting SABnzbd Newsgroup downloader daemon
 #
-# runlevels: openelec, text, debug
+# runlevels: openelec, textmode
 
 (
-    progress  "Starting SABnzbd Newsgroup downloader daemon"
+  progress "Starting SABnzbd Newsgroup downloader daemon"
 
-    python /usr/share/SABnzbd/SABnzbd.py -d $SABNZBD_ARGS > /dev/null 2>&1
+  . /etc/sabnzbd.conf
+
+  python /usr/share/SABnzbd/SABnzbd.py -d $SABNZBD_ARGS > /dev/null 2>&1
 )&

packages/plugins/SABnzbd/install

@@ -10,5 +10,10 @@ $SCRIPTS/install unrar
 $SCRIPTS/install unzip
 $SCRIPTS/install par2cmdline
 
+PKG_DIR=`find $PACKAGES -type d -name $1`
+
 mkdir -p $INSTALL/usr/share/$1
-  cp -PR $BUILD/$1*/* $INSTALL/usr/share/$1
+  cp -P $BUILD/$1*/* $INSTALL/usr/share/$1
+
+mkdir -p $INSTALL/etc
+  cp -P $PKG_DIR/config/*.conf $INSTALL/etc

packages/print/freetype/url

@@ -1 +1 @@
-http://prdownloads.sourceforge.net/freetype/freetype-2.3.11.tar.bz2
+http://prdownloads.sourceforge.net/freetype/freetype-2.3.12.tar.bz2

packages/sysutils/ConsoleKit/init.d/25_ConsoleKit

@@ -1,6 +1,6 @@
 # start D-BUS daemon
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   progress "Setup ConsoleKit"

packages/sysutils/busybox/config/profile

@@ -26,6 +26,6 @@
   }
 
 # read config files
-  for config in `ls /etc/conf.d/`; do
-    . /etc/conf.d/$config
+  for config in `ls /etc/profile.d/`; do
+    . /etc/profile.d/$config
   done

packages/sysutils/busybox/init.d/00_debugshell

@@ -1,6 +1,6 @@
 # start debug shell
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
   TTY="3"
 
@@ -12,7 +12,6 @@ if [ "$DEBUG" = "yes" ]; then
   echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
   echo "###########################################"
 
-#  exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1 &
   exec /sbin/getty -n -l /bin/sh 38400 tty$TTY &
 
 fi

packages/sysutils/busybox/init.d/05_mount_filesystem

@@ -1,7 +1,7 @@
 #
 # mounting needed filesystems
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 progress "mounting needed filesystems"
 

packages/sysutils/busybox/init.d/06_make_directorys

@@ -1,7 +1,7 @@
 #
 # make variable directory structure
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 progress "make variable directory structure"
   $IONICE mkdir -p /var/log \

packages/sysutils/busybox/init.d/07_userconfig

@@ -1,13 +0,0 @@
-#
-# copying config into storage
-#
-# runlevels: openelec, text
-
-progress "copying config into storage"
-
-  $IONICE mkdir -p $HOME/.config
-
-  for i in `ls /usr/config`; do
-    [ ! -f "$HOME/.config/$i" ] && cp -PR /usr/config/$i $HOME/.config
-  done
-

packages/sysutils/busybox/init.d/08_network

@@ -1,11 +1,7 @@
 #
 # start syslog daemon
 #
-# runlevels: openelec, text
-
-HOSTNAME=`cat /etc/hostname`
-
-export $HOSTNAME
+# runlevels: openelec, textmode
 
 # bring lo up, whether we have network card or not
   progress "starting Loopback Network interface"
@@ -14,6 +10,3 @@ export $HOSTNAME
 # setup hostname
   progress "Setup hostname"
     echo $HOSTNAME > /proc/sys/kernel/hostname
-
-# create /etc/hosts file, useful for gethostbyname(localhost)
-  echo -e "127.0.0.1\tlocalhost $HOSTNAME" > /var/run/hosts

packages/sysutils/busybox/init.d/10_syslogd

@@ -1,7 +1,7 @@
 #
 # start syslog daemon
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   progress "Starting Syslog daemon"

packages/sysutils/busybox/init.d/23_acpid

@@ -1,6 +1,6 @@
 # start the ACPI daemon subsystem
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   progress "Starting ACPI daemon"

packages/sysutils/busybox/init.d/99_shell

@@ -1,6 +1,6 @@
 # start text mode shell
 #
-# runlevels: text
+# runlevels: textmode
 
 TTY="1"
 
@@ -11,6 +11,5 @@ echo "## ...... switch with ctrl-alt-f$TTY ...... ##"
 echo "###########################################"
 
 while true; do
-#  exec /bin/sh </dev/tty$TTY >/dev/tty$TTY 2>&1
   exec /sbin/getty -n -l /bin/sh 38400 tty$TTY
 done

packages/sysutils/busybox/install

@@ -14,7 +14,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
   add_group root 0
 
   add_user $USER_NAME "$USER_PWD" 1000 1000 "User" "/storage" "/bin/sh"
-  add_group $USER_GROUP 1000
+  add_group $USER_GROUP 1000 "video"
 
   cp -PR $BUILD/busybox*/_install-system/* $INSTALL
     echo "chmod 4755 $INSTALL/bin/busybox" >> $FAKEROOT_SCRIPT
@@ -22,15 +22,21 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
   mkdir -p $INSTALL/bin
     ln -sf /bin/sh $INSTALL/bin/bash
 
+  mkdir -p $INSTALL/sbin
+    cp $PKG_DIR/scripts/init $INSTALL/sbin/
+
   mkdir -p $INSTALL/etc
-    cp $PKG_DIR/config/sysconfig $INSTALL/etc
-    cp $PKG_DIR/config/sysconfig $INSTALL/etc/profile
+    cp $PKG_DIR/config/profile $INSTALL/etc
     touch $INSTALL/etc/fstab
     ln -sf /var/run/resolv.conf $INSTALL/etc/resolv.conf
-    ln -sf /var/run/hosts $INSTALL/etc/hosts
 
+# create /etc/hostname
   echo $HOSTNAME > $INSTALL/etc/hostname
 
+# create /etc/hosts file, useful for gethostbyname(localhost)
+  echo -e "127.0.0.1\tlocalhost $HOSTNAME" > $INSTALL/etc/hosts
+
+# create /etc/issue
   echo $GREATING0 >  $INSTALL/etc/issue
   echo $GREATING1 >> $INSTALL/etc/issue
   echo $GREATING2 >> $INSTALL/etc/issue
@@ -40,10 +46,7 @@ USER_PWD="`$ROOT/$TOOLCHAIN/bin/cryptpw $USER_PASSWORD`"
   mkdir -p $INSTALL/usr/share/udhcpc
     cp $PKG_DIR/scripts/udhcp.script $INSTALL/usr/share/udhcpc/default.script
 
-  mkdir -p $INSTALL/sbin
-    cp $PKG_DIR/scripts/init $INSTALL/sbin/
-
-  # acpid specific
+# acpid specific
   mkdir -p $INSTALL/etc/acpi/PWRF
     cp $PKG_DIR/scripts/acpi_powerbtn $INSTALL/etc/acpi/PWRF/00000080
 

packages/sysutils/busybox/profile.d/configcache.conf

@@ -0,0 +1,10 @@
+################################################################################
+# Core (Shell) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+CONFIG_CACHE="/storage/.cache"
+
+export CONFIG_CACHE

packages/sysutils/busybox/profile.d/fastboot.conf

@@ -0,0 +1,16 @@
+################################################################################
+# Core (Shell) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+# setting some Variables
+  if test "$FASTBOOT" = "yes"; then
+    IONICE="ionice -c 1 -n 0"
+    NICE_20="nice -n -20"
+  else
+    FASTBOOT=no
+  fi
+
+export FASTBOOT

packages/sysutils/busybox/profile.d/hostname.conf

@@ -0,0 +1,10 @@
+################################################################################
+# Core (Shell) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+HOSTNAME=`cat /etc/hostname`
+
+export HOSTNAME

packages/sysutils/busybox/profile.d/path.conf

@@ -0,0 +1,10 @@
+################################################################################
+# Core (PATH) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+PATH="/bin:/sbin:/usr/bin:/usr/sbin"
+
+export PATH

packages/sysutils/busybox/profile.d/runlevel.conf

@@ -0,0 +1,14 @@
+################################################################################
+# Core (Shell) environment variables.
+#
+# This file contains non-OpenELEC evironment variables as well as OpenELEC
+# evironment variables that are not user defined.
+################################################################################
+
+# getting runlevel
+  RUNLEVEL="openelec"
+  if test "$TEXTMODE" = yes; then
+    RUNLEVEL="textmode"
+  fi
+
+export RUNLEVEL

packages/sysutils/busybox/profile.d/shell.conf

@@ -5,9 +5,6 @@
 # evironment variables that are not user defined.
 ################################################################################
 
-#-------------------------------------------------------------------------------
-# Prompt environment variables.
-#-------------------------------------------------------------------------------
 PS1='\u@\h:\w \$ '
 
 export PS1

packages/sysutils/busybox/scripts/init

@@ -1,13 +1,4 @@
-#!/bin/sh
-
-# read config
-  . /etc/sysconfig
-
-# getting runlevel
-  RUNLEVEL="openelec"
-  if test "$TEXTMODE" = yes; then
-    RUNLEVEL="text"
-  fi
+#!/bin/sh -l
 
 # starting init scripts for wanted runlevel
   progress "Starting Init Scripts"

packages/sysutils/dbus/init.d/12_dbus

@@ -1,7 +1,7 @@
 #
 # starting dbus
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 progress "Starting D-BUS"
 

packages/sysutils/hal/init.d/13_hal

@@ -1,7 +1,7 @@
 #
 # starting HAL
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 progress "Starting Hardware Abstraction Layer"
 

packages/sysutils/lirc/init.d/32_lirc

@@ -1,10 +1,12 @@
 # start the LIRC daemon
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   progress "Starting LIRC daemon"
 
+  . /etc/lirc.conf
+
   $IONICE mkdir -p /var/run/lirc
     lircd --driver=$LIRC_DRIVER --device=$LIRC_DEVICE --output=$LIRC_OUTPUT
 )&

packages/sysutils/lirc/install

@@ -16,9 +16,7 @@ mkdir -p $INSTALL/usr/bin
 
 mkdir -p $INSTALL/etc
   cp $PKG_DIR/config/lircd_$REMOTE.conf $INSTALL/etc/lircd.conf
-
-mkdir -p $INSTALL/etc/conf.d
-  cp $PKG_DIR/config/sysconfig_$RECEIVER $INSTALL/etc/conf.d/lirc
+  cp $PKG_DIR/config/config_$RECEIVER $INSTALL/etc/lirc.conf
 
 mkdir -p $INSTALL/lib/modules/$VER/lirc
   cp $PKG_BUILD/drivers/*/*.ko $INSTALL/lib/modules/$VER/lirc

packages/sysutils/plymouth-lite/init.d/00_plymouth

@@ -1,7 +1,7 @@
 #
 # starting splash
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 (
   [ "$DEBUG" != "yes" -a "$TEXTMODE" != "yes" \

packages/sysutils/udev/init.d/01_udevd

@@ -1,11 +1,13 @@
 #
 # starting Udev daemon
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 progress "starting udev daemon"
 
   echo -e '\000\000\000\000' > /proc/sys/kernel/hotplug
 
+  $IONICE mkdir -p /dev/rules.d
+
   $NICE_20 udevd --daemon
   $NICE_20 udevadm monitor 2>&1 >/dev/udev.log &

packages/sysutils/udev/init.d/02_udev-monitor

@@ -1,7 +1,7 @@
 #
 # monitoring udev events
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 UDEV_LOGFILE="/dev/.udev.log"
 

packages/sysutils/udev/init.d/03_udev-trigger

@@ -1,13 +1,11 @@
 #
 # request events from the kernel
 #
-# runlevels: openelec, text
+# runlevels: openelec, textmode
 
 progress "request udev events from the kernel"
 
   (
-#    $NICE_20 udevadm control --env STARTUP=1
     $NICE_20 udevadm trigger
     $NICE_20 udevadm settle --timeout=5
-#    $NICE_20 udevadm control --env STARTUP=
   )&

packages/sysutils/udev/install

@@ -67,6 +67,4 @@ mkdir -p $INSTALL/lib/udev/rules.d
 
 mkdir -p $INSTALL/etc/udev
   cp $PKG_BUILD/udev.conf $INSTALL/etc/udev
-
-mkdir -p $INSTALL/usr/config/rules.d
-  ln -sf /storage/.config/rules.d $INSTALL/etc/udev/rules.d
+  ln -sf /dev/rules.d $INSTALL/etc/udev/rules.d

packages/x11/driver/xf86-input-synaptics/url

@@ -1 +1 @@
-http://xorg.freedesktop.org/archive/individual/driver/xf86-input-synaptics-1.2.1.tar.bz2
+http://xorg.freedesktop.org/archive/individual/driver/xf86-input-synaptics-1.2.2.tar.bz2

packages/x11/other/mrxvt/scripts/mrxvt-session

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-. /etc/sysconfig
+. /etc/profile
 
 [ $START_WM="yes" ] && $WINDOWMANAGER &
 

packages/x11/other/ratpoison/profile.d/ratpoison.conf

@@ -6,3 +6,5 @@
 ################################################################################
 
 WINDOWMANAGER="ratpoison"
+
+export WINDOWMANAGER

packages/x11/other/uxlaunch/init.d/60_uxlaunch

@@ -28,11 +28,11 @@ progress "creating directories needed for Xorg"
   if lspci -n | grep 0300 | grep -q 10de; then
     $IONICE ln -sf /usr/lib/libGL_nvidia.so.1 /var/lib/libGL.so
     $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_nvidia.so /var/lib/libglx.so
-    UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF"
+#    UX_ARG="$UX_ARG -c $XORG_NVIDIA_CONF"
   else
     $IONICE ln -sf /usr/lib/libGL_mesa.so.1 /var/lib/libGL.so
     $IONICE ln -sf /usr/lib/xorg/modules/extensions/libglx_mesa.so /var/lib/libglx.so
-    UX_ARG="$UX_ARG -c $XORG_CONF"
+#    UX_ARG="$UX_ARG -c $XORG_CONF"
   fi
 
 progress "starting xsession"

packages/x11/other/uxlaunch/patches/010-uxlaunch-add_xconfig_option-0.1.diff

@@ -1,93 +0,0 @@
-diff -Naur uxlaunch-0.46/options.c uxlaunch-0.46.patch/options.c
---- uxlaunch-0.46/options.c	2010-03-04 19:51:44.000000000 +0100
-+++ uxlaunch-0.46.patch/options.c	2010-03-23 09:47:14.394856281 +0100
-@@ -27,6 +27,7 @@
- int tty = 2;
- char session[256] = "/usr/bin/mutter --sm-disable";
- char username[256] = "moblin";
-+char xconfig[256] = "/etc/X11/xorg.conf";
- 
- int verbose = 0;
- 
-@@ -34,6 +35,7 @@
- 	{ "user",    1, NULL, 'u' },
- 	{ "tty",     1, NULL, 't' },
- 	{ "session", 1, NULL, 's' },
-+	{ "xconfig", 1, NULL, 'c' },
- 	{ "help",    0, NULL, 'h' },
- 	{ "verbose", 0, NULL, 'v' },
- 	{ 0, 0, NULL, 0}
-@@ -46,6 +48,7 @@
- 	printf("  -u, --user      Start session as specific username\n");
- 	printf("  -t, --tty       Start session on alternative tty number\n");
- 	printf("  -s, --session   Start a non-default session\n");
-+	printf("  -c, --xconfig   Xorg config file\n");
- 	printf("  -v, --verbose   Display lots of output to the console\n");
- 	printf("  -h, --help      Display this help message\n");
- }
-@@ -126,13 +129,15 @@
- 				tty = atoi(val);
- 			if (!strcmp(key, "session"))
- 				strncpy(session, val, 256);
-+			if (!strcmp(key, "xconfig"))
-+				strncpy(xconfig, val, 256);
- 		}
- 		fclose(f);
- 	}
- 
- 	/* parse cmdline - overrides */
- 	while (1) {
--		c = getopt_long(argc, argv, "u:t:s:hv", opts, &i);
-+		c = getopt_long(argc, argv, "u:t:s:c:hv", opts, &i);
- 		if (c == -1)
- 			break;
- 
-@@ -146,6 +151,9 @@
- 		case 's':
- 			strncpy(session, optarg, 256);
- 			break;
-+		case 'c':
-+			strncpy(xconfig, optarg, 256);
-+			break;
- 		case 'h':
- 			usage(argv[0]);
- 			exit (EXIT_SUCCESS);
-@@ -171,7 +179,7 @@
- 	}
- 
- 	lprintf("uxlaunch v%s started.", VERSION);
--	lprintf("user \"%s\", tty #%d, session \"%s\"", username, tty, session);
-+	lprintf("user \"%s\", tty #%d, session \"%s\", xconfig \"%s\"", username, tty, session, xconfig);
- 
- 	pass = getpwnam(username);
- 	if (!pass)
-diff -Naur uxlaunch-0.46/uxlaunch.h uxlaunch-0.46.patch/uxlaunch.h
---- uxlaunch-0.46/uxlaunch.h	2010-03-04 19:51:44.000000000 +0100
-+++ uxlaunch-0.46.patch/uxlaunch.h	2010-03-23 09:47:14.395856611 +0100
-@@ -19,6 +19,7 @@
- extern int tty;
- extern char session[];
- extern char username[];
-+extern char xconfig[];
- 
- extern int session_pid;
- extern int xpid;
-diff -Naur uxlaunch-0.46/xserver.c uxlaunch-0.46.patch/xserver.c
---- uxlaunch-0.46/xserver.c	2010-03-04 19:51:44.000000000 +0100
-+++ uxlaunch-0.46.patch/xserver.c	2010-03-23 09:47:14.401856143 +0100
-@@ -231,13 +231,13 @@
- 		execl(xserver, xserver,  displayname,
- 		      "-nolisten", "tcp", "-dpi", "120", "-noreset",
- 		      "-auth", xauth_cookie_file,
--		      vt, NULL);
-+		      vt, "-config", xconfig, NULL);
- 	} else {
- 		execl(xserver, xserver,  displayname,
- 		      "-nolisten", "tcp", "-dpi", "120", "-noreset",
- 		      "-auth", user_xauth_path,
- 		      "-logfile", xorg_log,
--		      vt, NULL);
-+		      vt, "-config", xconfig, NULL);
- 	}
- 	exit(0);
- }

packages/x11/other/uxlaunch/patches/011-uxlaunch-add_nohwaccess_and_nocursor_option-0.1.diff

@@ -1,21 +0,0 @@
-diff -Naur uxlaunch-0.46/xserver.c uxlaunch-0.46.patch/xserver.c
---- uxlaunch-0.46/xserver.c	2010-03-23 09:47:54.621981367 +0100
-+++ uxlaunch-0.46.patch/xserver.c	2010-03-23 09:53:39.703855113 +0100
-@@ -231,13 +231,15 @@
- 		execl(xserver, xserver,  displayname,
- 		      "-nolisten", "tcp", "-dpi", "120", "-noreset",
- 		      "-auth", xauth_cookie_file,
--		      vt, "-config", xconfig, NULL);
-+		      vt, "-config", xconfig, "-nocursor", "-nohwaccess",
-+		      NULL);
- 	} else {
- 		execl(xserver, xserver,  displayname,
- 		      "-nolisten", "tcp", "-dpi", "120", "-noreset",
- 		      "-auth", user_xauth_path,
- 		      "-logfile", xorg_log,
--		      vt, "-config", xconfig, NULL);
-+		      vt, "-config", xconfig, "-nocursor", "-nohwaccess",
-+		      NULL);
- 	}
- 	exit(0);
- }

scripts/install

@@ -22,9 +22,9 @@ if [ -d $PKG_DIR/init.d ]; then
   cp $PKG_DIR/init.d/* $INSTALL/etc/init.d/
 fi
 
-if [ -d $PKG_DIR/conf.d ]; then
-  mkdir -p $INSTALL/etc/conf.d
-  cp $PKG_DIR/conf.d/* $INSTALL/etc/conf.d/
+if [ -d $PKG_DIR/profile.d ]; then
+  mkdir -p $INSTALL/etc/profile.d
+  cp $PKG_DIR/profile.d/*.conf $INSTALL/etc/profile.d/
 fi
 
 $SCRIPTS/build $@