diff options
| author | Simon Rettberg | 2013-04-02 18:52:39 +0200 |
|---|---|---|
| committer | sr | 2013-04-12 19:11:40 +0200 |
| commit | d1fb74e8b75261e7f269023cd4984521f62155ca (patch) | |
| tree | a1f1cc591a6ca3b7866c13275cfe2f5346ded7e1 | |
| parent | Fix kdm and xorg module for openSUSE (diff) | |
| download | tm-scripts-d1fb74e8b75261e7f269023cd4984521f62155ca.tar.gz tm-scripts-d1fb74e8b75261e7f269023cd4984521f62155ca.tar.xz tm-scripts-d1fb74e8b75261e7f269023cd4984521f62155ca.zip | |
required/optional packages. consolekit for rpm.
REQUIRED_PACKAGES are now actually required, but you can prefix optional packages with '@'.
See xorg.conf for an example.
a consolekit.conf.zypper was created to make consolekit work on opensuse 12.1
| -rw-r--r-- | helper/fileutil.inc | 8 | ||||
| -rw-r--r-- | remote/modules/consolekit/consolekit.conf.zypper | 11 | ||||
| -rw-r--r-- | remote/modules/xorg/xorg.conf | 24 |
3 files changed, 30 insertions, 13 deletions
diff --git a/helper/fileutil.inc b/helper/fileutil.inc index 07dab7af..6a4f5486 100644 --- a/helper/fileutil.inc +++ b/helper/fileutil.inc @@ -34,19 +34,25 @@ tarcopy () { # get all files of required packages by a module list_packet_files() { [ -z "$REQUIRED_PACKAGES" ] && pinfo "No required packages for $TOOL" && return 1 + local PACKAGE="" for PACKAGE in $REQUIRED_PACKAGES; do + local OPTIONAL="$(echo "$PACKAGE" | cut -c 1)" + [ "x$OPTIONAL" = "x@" ] && PACKAGE="$(echo "$PACKAGE" | cut -c 2-)" local FILES="" + pdebug "Listingh packiet $PACKAGE" if [ "$PACKET_MANAGER" = "apt" ]; then FILES="$(dpkg -L "$PACKAGE" | grep -v -E 'share/(man|doc)|/var/run|/var/log'; echo ":###:${PIPESTATUS[0]}")" elif [ "$PACKET_MANAGER" = "zypper" ]; then FILES="$(rpm -ql "$PACKAGE" | grep -v -E 'share/(doc|man)|/var/run|/var/log' | grep -v share/man; echo ":###:${PIPESTATUS[0]}")" fi + pdebug "Habe $(echo $FILES | wc -l) files!1" # ugly hack to get our return value #local LPRET=$(echo "$FILES" | tail -1 | sed 's/^.*:###:\([0-9]*\)$/\1/g') #FILES=$(echo "$FILES" | sed 's/^\(.*\):###:[0-9]*$/\1/g') local LPRET=$(echo "$FILES" | awk -F ':###:' '{printf $2}') FILES=$(echo "$FILES" | awk -F ':###:' '{print $1}') - [ "x$LPRET" != "x0" ] && pwarning "dpkg/rpm exited with code '$LPRET' for packet ${PACKAGE}." && continue + [ "x$LPRET" != "x0" -a "x$OPTIONAL" != "x@" ] && perror "dpkg/rpm existed with code '$LPRET' for required package ${PACKAGE}." + [ "x$LPRET" != "x0" ] && pwarning "dpkg/rpm exited with code '$LPRET' for optional package ${PACKAGE}." && continue [ -z "$FILES" ] && pwarning "list_packet_files empty for packet ${PACKAGE}." && continue for FILE in $FILES; do [ ! -d "$FILE" ] && echo "$FILE" diff --git a/remote/modules/consolekit/consolekit.conf.zypper b/remote/modules/consolekit/consolekit.conf.zypper new file mode 100644 index 00000000..c528ddc0 --- /dev/null +++ b/remote/modules/consolekit/consolekit.conf.zypper @@ -0,0 +1,11 @@ +REQUIRED_PACKAGES="ConsoleKit" +REQUIRED_BINARIES=" ck-history + ck-launch-session + ck-list-sessions + ck-log-system-start + ck-log-system-restart + ck-log-system-stop + console-kit-daemon" +REQUIRED_DIRECTORIES=" /usr/lib/ConsoleKit /etc /lib/systemd/system" +REQUIRED_FILES=" /usr/share/dbus-1/system-services/org.freedesktop.ConsoleKit.service + /usr/share/polkit-1/actions/org.freedesktop.consolekit.policy" diff --git a/remote/modules/xorg/xorg.conf b/remote/modules/xorg/xorg.conf index e41c25a5..81bc1531 100644 --- a/remote/modules/xorg/xorg.conf +++ b/remote/modules/xorg/xorg.conf @@ -7,27 +7,27 @@ REQUIRED_PACKAGES=" xserver-xorg xserver-xorg-input-mouse xserver-xorg-input-vmmouse xserver-xorg-video-intel - xserver-xorg-video-openchrome - xserver-xorg-video-savage - xserver-xorg-video-trident + @xserver-xorg-video-openchrome + @xserver-xorg-video-savage + @xserver-xorg-video-trident xserver-xorg-video-ati - xserver-xorg-video-mach64 - xserver-xorg-video-qxl - xserver-xorg-video-siliconmotion + @xserver-xorg-video-mach64 + @xserver-xorg-video-qxl + @xserver-xorg-video-siliconmotion xserver-xorg-video-vesa - xserver-xorg-video-cirrus + @xserver-xorg-video-cirrus xserver-xorg-video-mga - xserver-xorg-video-r128 + @xserver-xorg-video-r128 xserver-xorg-video-sis xserver-xorg-video-vmware xserver-xorg-video-fbdev - xserver-xorg-video-neomagic + @xserver-xorg-video-neomagic xserver-xorg-video-radeon xserver-xorg-video-sisusb - xserver-xorg-video-geode + @xserver-xorg-video-geode xserver-xorg-video-nouveau - xserver-xorg-video-s3 - xserver-xorg-video-tdfx" + @xserver-xorg-video-s3 + @xserver-xorg-video-tdfx" REQUIRED_BINARIES=" Xorg vmwarectrl gtf |