diff options
| author | Holger Paradies <retabell@gmx.de> | 2013-09-04 12:32:15 +0200 |
|---|---|---|
| committer | Andreas Loibl <andreas@andreas-loibl.de> | 2013-09-06 20:15:00 +0200 |
| commit | 648ffc002c258e07b2720b8045ac6bb401d58470 (patch) | |
| tree | 18472f8084d87f608164a46248fdc30a0a27cc50 | |
| parent | 2c7aaed1b4fc1c23acfce2e40fd03faa5c4b9b7f (diff) | |
| download | kanotix-648ffc002c258e07b2720b8045ac6bb401d58470.zip kanotix-648ffc002c258e07b2720b8045ac6bb401d58470.tar.gz | |
keep vim pidgin aptitude, add libre-office on amd64 isos
| -rwxr-xr-x | config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot | 13 | ||||
| -rwxr-xr-x | config/chroot_local-hooks/03-lxde-fixes | 5 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-base | 7 | ||||
| -rw-r--r-- | config/lists/kanotix-lxde-master | 3 |
4 files changed, 21 insertions, 7 deletions
diff --git a/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot b/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot index 6aae943..1de9a67 100755 --- a/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot +++ b/config/chroot_local-hooks/01-remove-gnome-icon-cache.chroot @@ -1,11 +1,14 @@ #!/bin/sh if [ -x /usr/sbin/lightdm ]; then -set -e + # only on i386 + if ! [ -d /lib/x86_64-linux-gnu ]; then + set -e -# Remove GNOME icon cache. -# has to be generated later -# This saves space some space (11MB on K-LXDE) + # Remove GNOME icon cache. + # has to be generated later + # This saves space some space (11MB on K-LXDE) -rm -f /usr/share/icons/*/icon-theme.cache + rm -f /usr/share/icons/*/icon-theme.cache + fi fi diff --git a/config/chroot_local-hooks/03-lxde-fixes b/config/chroot_local-hooks/03-lxde-fixes index c73f876..ac47bc0 100755 --- a/config/chroot_local-hooks/03-lxde-fixes +++ b/config/chroot_local-hooks/03-lxde-fixes @@ -14,8 +14,9 @@ if [ -x /usr/sbin/lightdm ]; then # Industrial conflicts sed -i s/Industrial/Clearlooks-Phenix/ /etc/skel/.gtkrc-2.0 - # on lxde delete packages to reduce image-size + # on lxde i386 delete packages to reduce image-size + if ! [ -d /lib/x86_64-linux-gnu ]; then apt-get purge --yes aptitude aptitude-common apt-get purge --yes vim vim-common vim-runtime - + fi fi diff --git a/config/lists/kanotix-lxde-base b/config/lists/kanotix-lxde-base index 0a501b5..9eaf2f0 100644 --- a/config/lists/kanotix-lxde-base +++ b/config/lists/kanotix-lxde-base @@ -1,7 +1,14 @@ # Kanotix with LXDE (lxde-base) #include <base> + +#if ARCHITECTURE i386 #include <desktop-base> +#endif + +#if ARCHITECTURE amd64 +#include <desktop> +#endif # Kanotix etcskel-kanotix-lxde diff --git a/config/lists/kanotix-lxde-master b/config/lists/kanotix-lxde-master index 950123d..c118c9b 100644 --- a/config/lists/kanotix-lxde-master +++ b/config/lists/kanotix-lxde-master @@ -7,6 +7,9 @@ evince-gtk simple-scan geany +#if ARCHITECTURE amd64 +#include <office> +#endif # package tool synaptic |