diff options
| author | Maximilian Gerhard <maxbox@directbox.com> | 2012-04-08 16:42:49 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2012-04-25 10:59:51 +0200 |
| commit | 586f37afdf754d607dbba717749387f68d4b16d2 (patch) | |
| tree | 8d11583b0e7e84ad36aa3746aecf26d17f2a81c4 /config | |
| parent | e2a7d54297dd15e3ff568fd97d582f2efd79c4dd (diff) | |
| download | kanotix-586f37afdf754d607dbba717749387f68d4b16d2.zip kanotix-586f37afdf754d607dbba717749387f68d4b16d2.tar.gz | |
moved kdm patch to hook script to check kdm exists
For builds with other login managers than kdm the build always
fails because patching /etc/init.d/kdm abort with error. I wrapped
the patch inside a hook script that ensures /etc/init.d/kdm exists
before patching.
Diffstat (limited to 'config')
| -rwxr-xr-x[-rw-r--r--] | config/chroot_local-hooks/patch-kdm-to-kill-plymouth.sh (renamed from config/chroot_local-patches/kdm_plymouth_hack.patch) | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/config/chroot_local-patches/kdm_plymouth_hack.patch b/config/chroot_local-hooks/patch-kdm-to-kill-plymouth.sh index 6539f3c..ce56832 100644..100755 --- a/config/chroot_local-patches/kdm_plymouth_hack.patch +++ b/config/chroot_local-hooks/patch-kdm-to-kill-plymouth.sh @@ -1,4 +1,7 @@ ---- /build/kanotix/chroot/etc/init.d/kdm 2011-02-12 20:16:11.000000000 +0100 +#!/bin/sh +if [ -f /etc/init.d/kdm ]; then + patch --no-backup-if-mismatch -p0 <<'EOT' +--- /etc/init.d/kdm 2011-02-12 20:16:11.000000000 +0100 +++ /etc/init.d/kdm 2011-09-28 04:05:22.977140278 +0200 @@ -126,6 +126,10 @@ [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" != "$DAEMON" ]; then @@ -11,3 +14,7 @@ log_daemon_msg "Starting K Display Manager" "kdm" if start-stop-daemon --start --quiet $SSD_ARGS -- $ARG ; then log_end_msg 0 +EOT +else + exit 0 +fi |