diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2012-11-09 15:42:30 +0100 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2012-11-09 15:42:30 +0100 |
| commit | 02a7ccfc2eda3b350b6e7aade0a9c1e05789504a (patch) | |
| tree | 912f5c4f026e61f674abdef16785cc38762c4cb0 /config/chroot_local-hooks | |
| parent | 3c071f6ff60e6fd5afde17d113beb50f1e246422 (diff) | |
| download | kanotix-02a7ccfc2eda3b350b6e7aade0a9c1e05789504a.zip kanotix-02a7ccfc2eda3b350b6e7aade0a9c1e05789504a.tar.gz | |
added checks to hooks
Diffstat (limited to 'config/chroot_local-hooks')
| -rwxr-xr-x | config/chroot_local-hooks/05-ndis | 1 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/06-bluetooth | 3 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/07-dkms | 1 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/audio-hack-silentinit | 1 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/flash-live | 4 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/plymouth | 2 |
6 files changed, 8 insertions, 4 deletions
diff --git a/config/chroot_local-hooks/05-ndis b/config/chroot_local-hooks/05-ndis index 8b77f81..7b89a97 100755 --- a/config/chroot_local-hooks/05-ndis +++ b/config/chroot_local-hooks/05-ndis @@ -1,4 +1,5 @@ #!/bin/sh +[ -x /usr/sbin/ndiswrapper ] || exit 0 [ -f /root/build.conf ] && . /root/build.conf if [ "$LB_ARCHITECTURE" = "amd64" ]; then wget -qO- http://kanotix.com/files/fix/ndiswrapper/ndiswrapper64-fwlan64.tar.gz|tar zxC /etc diff --git a/config/chroot_local-hooks/06-bluetooth b/config/chroot_local-hooks/06-bluetooth index 98f422e..6f53821 100755 --- a/config/chroot_local-hooks/06-bluetooth +++ b/config/chroot_local-hooks/06-bluetooth @@ -1,3 +1,4 @@ #!/bin/sh -sed -i 's/^\(HIDD_ENABLED\)=.*/\1=1/' /etc/default/bluetooth +[ -e /etc/default/bluetooth ] && sed -i 's/^\(HIDD_ENABLED\)=.*/\1=1/' /etc/default/bluetooth #sed -i 's/\(^HIDD_OPTIONS\)=.*/\1="--master --server --search"/' /etc/default/bluetooth +exit 0 diff --git a/config/chroot_local-hooks/07-dkms b/config/chroot_local-hooks/07-dkms index 8f57d16..4de0351 100755 --- a/config/chroot_local-hooks/07-dkms +++ b/config/chroot_local-hooks/07-dkms @@ -1,2 +1,3 @@ #!/bin/bash +[ -x /usr/lib/dkms/dkms_autoinstaller ] || exit 0 for x in /boot/vmlinuz-*;do KVERS=$x /usr/lib/dkms/dkms_autoinstaller start ${x#/boot/vmlinuz-}; done diff --git a/config/chroot_local-hooks/audio-hack-silentinit b/config/chroot_local-hooks/audio-hack-silentinit index b8affdf..c7e7a58 100755 --- a/config/chroot_local-hooks/audio-hack-silentinit +++ b/config/chroot_local-hooks/audio-hack-silentinit @@ -1,4 +1,5 @@ #!/bin/sh +[ -x /usr/bin/startkde ] || exit 0 mkdir -p /etc/skel/.kde/Autostart cat >/etc/skel/.kde/Autostart/audio-hack-silentinit.sh <<"EOF" #!/bin/sh diff --git a/config/chroot_local-hooks/flash-live b/config/chroot_local-hooks/flash-live index d300252..fc9df88 100755 --- a/config/chroot_local-hooks/flash-live +++ b/config/chroot_local-hooks/flash-live @@ -1,5 +1,5 @@ #!/bin/sh mkdir -p /etc/adobe echo EnableLinuxHWVideoDecode=1 > /etc/adobe/mms.cfg -ln -s /usr/bin/install-flash-local /etc/skel/.kde/Autostart/ - +[ -x /usr/bin/startkde ] && ln -s /usr/bin/install-flash-local /etc/skel/.kde/Autostart/ +exit 0 diff --git a/config/chroot_local-hooks/plymouth b/config/chroot_local-hooks/plymouth index f2ef82d..c5432fa 100755 --- a/config/chroot_local-hooks/plymouth +++ b/config/chroot_local-hooks/plymouth @@ -1,3 +1,3 @@ #!/bin/sh -plymouth-set-default-theme -R kanotix-logo +plymouth-set-default-theme -R kanotix-logo || : |