diff options
| author | Simon Rettberg | 2013-12-05 17:24:48 +0100 |
|---|---|---|
| committer | Simon Rettberg | 2013-12-05 17:24:48 +0100 |
| commit | 997cac4dca6e4b89aec71ab857b2c41a2f2b73d3 (patch) | |
| tree | 09555109694735136e5469ca401fa7f6ec5b66f4 | |
| parent | [rfs-stage32] Fix zram swap creation for > 32 CPUs (diff) | |
| parent | [xorg] add xprintidle to REQUIRED_INSTALLED_PACKAGES, as it is not (diff) | |
| download | tm-scripts-997cac4dca6e4b89aec71ab857b2c41a2f2b73d3.tar.gz tm-scripts-997cac4dca6e4b89aec71ab857b2c41a2f2b73d3.tar.xz tm-scripts-997cac4dca6e4b89aec71ab857b2c41a2f2b73d3.zip | |
Merge branch 'master' of dnbd3:openslx-ng/tm-scripts
| -rw-r--r-- | remote/modules/xorg/xorg.conf | 2 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.debian | 7 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.opensuse | 4 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf.ubuntu | 7 | ||||
| -rw-r--r-- | remote/rootfs/rootfs-stage32/data/etc/profile | 4 |
5 files changed, 18 insertions, 6 deletions
diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf index a40d3041..c0885cbb 100644 --- a/remote/modules/xorg/xorg.conf +++ b/remote/modules/xorg/xorg.conf @@ -10,6 +10,8 @@ REQUIRED_BINARIES=" xkbbell xkbevd xrandr + xkbcomp + xprintidle vmmouse_detect " REQUIRED_DIRECTORIES=" diff --git a/remote/modules/xorg/xorg.conf.debian b/remote/modules/xorg/xorg.conf.debian index a3be908f..b1c26ae9 100644 --- a/remote/modules/xorg/xorg.conf.debian +++ b/remote/modules/xorg/xorg.conf.debian @@ -1,3 +1,6 @@ +REQUIRED_INSTALLED_PACKAGES=" + xprintidle +" REQUIRED_CONTENT_PACKAGES=" xserver-xorg$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX @@ -31,9 +34,7 @@ REQUIRED_CONTENT_PACKAGES=" @xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX -" -REQUIRED_BINARIES+=" - xkbcomp + xprintidle " REQUIRED_DIRECTORIES+=" /usr/lib diff --git a/remote/modules/xorg/xorg.conf.opensuse b/remote/modules/xorg/xorg.conf.opensuse index 38517d00..9051f24b 100644 --- a/remote/modules/xorg/xorg.conf.opensuse +++ b/remote/modules/xorg/xorg.conf.opensuse @@ -1,4 +1,7 @@ # xkbutils, xkbprint, setxkbmap, xkbevd for 64-bit openSuse +REQUIRED_INSTALLED_PACKAGES=" + xprintidle +" REQUIRED_CONTENT_PACKAGES=" xorg-x11 xorg-x11-server @@ -35,6 +38,7 @@ REQUIRED_CONTENT_PACKAGES=" libpixman-1-0 xrandr vaapi-intel-driver + xprintidle " REQUIRED_LIBRARIES=" libI810XvMC diff --git a/remote/modules/xorg/xorg.conf.ubuntu b/remote/modules/xorg/xorg.conf.ubuntu index a3be908f..b1c26ae9 100644 --- a/remote/modules/xorg/xorg.conf.ubuntu +++ b/remote/modules/xorg/xorg.conf.ubuntu @@ -1,3 +1,6 @@ +REQUIRED_INSTALLED_PACKAGES=" + xprintidle +" REQUIRED_CONTENT_PACKAGES=" xserver-xorg$UBUNTU_XORG_PKG_SUFFIX xserver-xorg-core$UBUNTU_XORG_PKG_SUFFIX @@ -31,9 +34,7 @@ REQUIRED_CONTENT_PACKAGES=" @xserver-xorg-video-geode$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-s3$UBUNTU_XORG_PKG_SUFFIX @xserver-xorg-video-tdfx$UBUNTU_XORG_PKG_SUFFIX -" -REQUIRED_BINARIES+=" - xkbcomp + xprintidle " REQUIRED_DIRECTORIES+=" /usr/lib diff --git a/remote/rootfs/rootfs-stage32/data/etc/profile b/remote/rootfs/rootfs-stage32/data/etc/profile index 23e7373c..36ebb4c4 100644 --- a/remote/rootfs/rootfs-stage32/data/etc/profile +++ b/remote/rootfs/rootfs-stage32/data/etc/profile @@ -47,6 +47,10 @@ for i in /etc/profile.d/*.sh ; do fi done +# Sourcing /etc/profile.local - please add custom stuff to profile.local +# as /etc/profile may be overwritten by system updates +test -s /etc/profile.local && . /etc/profile.local + if [ -s "$HOME/.bashrc" ]; then . "$HOME/.bashrc" fi |