From c4d3e762f95429a20b4f893abbfbcb4080843ed1 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 8 May 2014 14:50:46 +0200 Subject: [openstack] added REQUIRED_*_PACKAGES for ubuntu 14.04 --- remote/modules/openstack/module.conf | 3 --- remote/modules/openstack/module.conf.ubuntu.14.04 | 9 +++++++++ 2 files changed, 9 insertions(+), 3 deletions(-) create mode 100644 remote/modules/openstack/module.conf.ubuntu.14.04 diff --git a/remote/modules/openstack/module.conf b/remote/modules/openstack/module.conf index 8912f439..0cd03752 100644 --- a/remote/modules/openstack/module.conf +++ b/remote/modules/openstack/module.conf @@ -1,6 +1,3 @@ -REQUIRED_CONTENT_PACKAGES="" -REQUIRED_INSTALLED_PACKAGES="" - REQUIRED_BINARIES="" REQUIRED_LIBRARIES="" REQUIRED_DIRECTORIES="" diff --git a/remote/modules/openstack/module.conf.ubuntu.14.04 b/remote/modules/openstack/module.conf.ubuntu.14.04 new file mode 100644 index 00000000..7c24b4a9 --- /dev/null +++ b/remote/modules/openstack/module.conf.ubuntu.14.04 @@ -0,0 +1,9 @@ +REQUIRED_INSTALLED_PACKAGES=" + neutron-common + neutron-plugin-ml2 + neutron-plugin-openvswitch-agent + nova-compute-kvm + python-guestfs + python-mysqldb +" +REQUIRED_CONTENT_PACKAGES="$REQUIRED_INSTALLED_PACKAGES" -- cgit v1.2.3-55-g7522 From 7c2da2fb34ec68b36f4399a51866ffeeffc4c253 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 8 May 2014 14:52:02 +0200 Subject: [one-time-fix] first check if xfce4 is installed before installing greybird theme --- remote/onetime-fixes/install-xfce4-greybird-theme | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/remote/onetime-fixes/install-xfce4-greybird-theme b/remote/onetime-fixes/install-xfce4-greybird-theme index fd9a0819..6c1251a3 100755 --- a/remote/onetime-fixes/install-xfce4-greybird-theme +++ b/remote/onetime-fixes/install-xfce4-greybird-theme @@ -1,5 +1,11 @@ #!/bin/sh +if ! which startxfce4 ; then + # xfce4 not installed, TODO install? + echo "Could not find 'startxfce4'. Is it installed?" + exit 1 +fi + # first download the greybird theme if wget https://github.com/shimmerproject/Greybird/tarball/master -O /tmp/greybird.tgz ; then -- cgit v1.2.3-55-g7522 From f535f0e0b00c167dbaf9874dc1e442ca38053f7c Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 8 May 2014 14:54:06 +0200 Subject: added helper script to determine which kernel module is activated by which kernel CONFIG_* option --- scripts/kopt2mod | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100755 scripts/kopt2mod diff --git a/scripts/kopt2mod b/scripts/kopt2mod new file mode 100755 index 00000000..adb95787 --- /dev/null +++ b/scripts/kopt2mod @@ -0,0 +1,22 @@ +#!/bin/bash + +[ $# -ne 1 ] && echo "Usage: ./kopt2mod " && exit 1 + +FILES=$(find $1 -name Kconfig) + +for file in $FILES; do + CURRENT= + while read line; do + if [[ "$line" =~ ^(config|menuconfig) ]]; then + CURRENT=$(awk '{print $2}' <<<$line) + #echo "Jetz is $CURRENT dran" + continue + fi + [ -z "$CURRENT" ] && continue + MOD="$(echo "$line" | grep -o -E "called [a-z0-9_\-]+\." | awk '{print $2}')ko" + [[ "$MOD" == "ko" ]] && continue + echo "$CURRENT aktiviert $(dirname $file)/$MOD" + CURRENT= + done < "$file" +done + -- cgit v1.2.3-55-g7522 From 9865a2ac09f19483fb7dab291ed833349a4aa74f Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 8 May 2014 14:55:06 +0200 Subject: [stage4] blacklist xrandr helper libs for unity/gnome hacks the automatic dual-head setup which gnome/unity did starting with 14.04 --- server/blacklists/desktop-sessions/no-dual-head | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 server/blacklists/desktop-sessions/no-dual-head diff --git a/server/blacklists/desktop-sessions/no-dual-head b/server/blacklists/desktop-sessions/no-dual-head new file mode 100644 index 00000000..d82fcc62 --- /dev/null +++ b/server/blacklists/desktop-sessions/no-dual-head @@ -0,0 +1,2 @@ +- /usr/lib/unity-settings-daemon-1.0/libxrandr.so +- /usr/lib/unity-settings-daemon-1.0/xrandr.gnome-settings-plugin -- cgit v1.2.3-55-g7522 From 1fec506ef1fe7424f00de94e69bf9eac675220c8 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 8 May 2014 14:56:34 +0200 Subject: [server/config] activate unity panel fix for ubuntu 14.04 --- server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix | 1 + 1 file changed, 1 insertion(+) create mode 120000 server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix diff --git a/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix b/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix new file mode 120000 index 00000000..c7444165 --- /dev/null +++ b/server/configs/freiburg/ubuntu-14.04-unity-panel-service-fix @@ -0,0 +1 @@ +../../modules/ubuntu-14.04-unity-panel-service-fix \ No newline at end of file -- cgit v1.2.3-55-g7522 From 8ef0882ac9a8635c48ada44434a30b25575c9f03 Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 8 May 2014 14:58:28 +0200 Subject: remove old relic --- scripts/pam_scripts_ses_close.ugly_ses_close | 19 ------------------- 1 file changed, 19 deletions(-) delete mode 100755 scripts/pam_scripts_ses_close.ugly_ses_close diff --git a/scripts/pam_scripts_ses_close.ugly_ses_close b/scripts/pam_scripts_ses_close.ugly_ses_close deleted file mode 100755 index eedb40ed..00000000 --- a/scripts/pam_scripts_ses_close.ugly_ses_close +++ /dev/null @@ -1,19 +0,0 @@ -#!/bin/bash - -export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/openslx/bin:/opt/openslx/sbin:/opt/openslx/usr/bin:/opt/openslx/usr/sbin" - -[ ! -z "$SLX_DEBUG" ] && echo "[$PAM_TYPE] Closing session for $PAM_USER" - -# TODO check if its the last session of the user. - -OPENSESSIONS=$(loginctl|grep $PAM_USER|wc -l) - -echo "User $PAM_USER has $OPENSESSIONS open sessions." - -if [ "x$OPENSESSIONS" == "x1" ]; then - # assume its last session, start watchdog in background - echo "Last session beeing closed..." - ( while true; do sleep 1; if [ "x$(loginctl |grep $PAM_USER)" == "x" ]; then [ $(id -g $PAM_USER) -ge 1000 ] && umount /home/s8jobaue; fi; done) & -fi - -[ $(id -g $PAM_USER) -ge 1000 ] && umount /home/$PAM_USER -- cgit v1.2.3-55-g7522 From e38f60f0db283f3e299744d82ed3aa8e3b96b05b Mon Sep 17 00:00:00 2001 From: Jonathan Bauer Date: Thu, 8 May 2014 15:05:56 +0200 Subject: englishized kopt2mod :) --- scripts/kopt2mod | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/scripts/kopt2mod b/scripts/kopt2mod index adb95787..8eb540e4 100755 --- a/scripts/kopt2mod +++ b/scripts/kopt2mod @@ -9,13 +9,12 @@ for file in $FILES; do while read line; do if [[ "$line" =~ ^(config|menuconfig) ]]; then CURRENT=$(awk '{print $2}' <<<$line) - #echo "Jetz is $CURRENT dran" continue fi [ -z "$CURRENT" ] && continue MOD="$(echo "$line" | grep -o -E "called [a-z0-9_\-]+\." | awk '{print $2}')ko" [[ "$MOD" == "ko" ]] && continue - echo "$CURRENT aktiviert $(dirname $file)/$MOD" + echo "$CURRENT activates $(dirname $file)/$MOD" CURRENT= done < "$file" done -- cgit v1.2.3-55-g7522