diff options
| author | Andreas Loibl <andreas@andreas-loibl.de> | 2010-12-13 11:05:06 +0100 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2010-12-13 11:05:06 +0100 |
| commit | c2215b0188cef393bdb0909d1f43cb3ed783685f (patch) | |
| tree | 32763cf22ea05855321165e5860989ab76183dc1 /config/chroot_local-hooks | |
| parent | 14003f446f4190530fe7274fb20ad74f5139075f (diff) | |
| download | kanotix-c2215b0188cef393bdb0909d1f43cb3ed783685f.zip kanotix-c2215b0188cef393bdb0909d1f43cb3ed783685f.tar.gz | |
applied changes from Kano
Diffstat (limited to 'config/chroot_local-hooks')
| -rwxr-xr-x | config/chroot_local-hooks/02-skype | 1 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/03-distro | 10 |
2 files changed, 9 insertions, 2 deletions
diff --git a/config/chroot_local-hooks/02-skype b/config/chroot_local-hooks/02-skype index 6f46433..1ce5ee9 100755 --- a/config/chroot_local-hooks/02-skype +++ b/config/chroot_local-hooks/02-skype @@ -2,4 +2,5 @@ if [ -f /usr/share/applications/skype.desktop ]; then sed -i 's|\(Exec\)=.*|\1=LD_PRELOAD=/usr/lib/libv4l/v4l1compat.so skype|' /usr/share/applications/skype.desktop || true [ -r /usr/lib32/libv4l/v4l1compat.so ] && sed -i 's|\(Exec\)=.*|\1=LD_PRELOAD=/usr/lib32/libv4l/v4l1compat.so skype|' /usr/share/applications/skype.desktop || true +[ -r /usr/lib32/libpulse.so.0.8.0 ] && chmod a-r /usr/lib32/libpulse.so.0.8.0 fi diff --git a/config/chroot_local-hooks/03-distro b/config/chroot_local-hooks/03-distro index ef7ff98..7ccb5d9 100755 --- a/config/chroot_local-hooks/03-distro +++ b/config/chroot_local-hooks/03-distro @@ -1,12 +1,18 @@ #!/bin/sh sed -i 's/^\(FLL_DISTRO_MODE=\).*/\1"live"/' /etc/default/distro||true + rsync -Ha --ignore-existing /usr/share/kanotix/profile/ /etc/skel/ -sed -i 's|^\(exclude=media/cdrom_unmounted\).*|\1,media/hdd_unmounted|' /etc/skel/.kde/share/config/kdesktoprc||true -rm -f /etc/skel/.kde4/share/config/kxkbrc +#sed -i 's|^\(exclude=media/cdrom_unmounted\).*|\1,media/hdd_unmounted|' /etc/skel/.kde/share/config/kdesktoprc||true +#rm -f /etc/skel/.kde4/share/config/kxkbrc #rm -f /etc/skel/.kde/share/config/kdeglobals.tmp #mv /etc/skel/.kde/share/config/kdeglobals /etc/skel/.kde/share/config/kdeglobals.tmp #sed -ne '/\[Locale\]/ { n; :c; /^\[/! { n; b c; }; }; p;' /etc/skel/.kde/share/config/kdeglobals.tmp > /etc/skel/.kde/share/config/kdeglobals #rm -f /etc/skel/.kde/share/config/kdeglobals.tmp + +perl -pi -e 's/^(GRUB_DISTRIBUTOR)=.*/\1=`[ "\$\(uname -m\)" = "x86_64" ] && echo Kanotix64 || echo Kanotix`/' /etc/default/grub +perl -pi -e 's/.*(GRUB_DISABLE_LINUX_RECOVERY)=.*/\1="true"/' /etc/default/grub +perl -pi -e 's/^(GRUB_CMDLINE_LINUX_DEFAULT)=.*/\1="quiet"/' /etc/default/grub + rm -f /etc/skel/Desktop/kanotix-irc.desktop.tmp if [ -f /etc/skel/Desktop/kanotix-irc.desktop ]; then echo '#!/usr/bin/env xdg-open' > /etc/skel/Desktop/kanotix-irc.desktop.tmp |