From 7866b3267f5d2f989c7c6229551b563b28557f43 Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Sun, 3 Oct 2010 11:29:43 +0200 Subject: [PATCH] [molecules] add missing bits from wolfden's spec regarding skel setup --- molecules/sabayon-x86-gforensic.spec | 2 +- ...aster_generic_inner_chroot_script_after.sh | 30 +++++++++++++++++++ 2 files changed, 31 insertions(+), 1 deletion(-) diff --git a/molecules/sabayon-x86-gforensic.spec b/molecules/sabayon-x86-gforensic.spec index c06986a..2a5a4d4 100644 --- a/molecules/sabayon-x86-gforensic.spec +++ b/molecules/sabayon-x86-gforensic.spec @@ -40,7 +40,7 @@ inner_chroot_script: /sabayon/scripts/remaster_generic_inner_chroot_script.sh # Inner chroot script command, to be executed inside destination chroot after # packages installation and removal -inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh gnome +inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh gforensic # Outer chroot script command, to be executed outside destination chroot before # before entering it (and AFTER inner_chroot_script) diff --git a/scripts/remaster_generic_inner_chroot_script_after.sh b/scripts/remaster_generic_inner_chroot_script_after.sh index f9bdbfe..de5a9fc 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -83,6 +83,26 @@ setup_displaymanager() { fi } +gforensic_remove_skel_stuff() { + # remove desktop icons + rm /etc/skel/Desktop/* + # remove no longer needed folders/files + rm -r /etc/skel/.fluxbox + rm -r /etc/skel/.e + rm -r /etc/skel/.kde4 + rm -r /etc/skel/.mozilla + rm -r /etc/skel/.emerald + rm -r /etc/skel/.xchat2 + rm -r /etc/skel/.config/compiz + rm -r /etc/skel/.config/lxpanel + rm -r /etc/skel/.config/pcmanfm + rm -r /etc/skel/.config/Thunar + rm -r /etc/skel/.config/xfce4 + rm -r /etc/skel/.gconf/apps/compiz + rm -r /etc/skel/.gconf/apps/gset-compiz + rm /etc/skel/.config/menus/applications-kmenuedit.menu + rm /etc/skel/.kderc +} if [ "$1" = "lxde" ]; then # Fix ~/.dmrc to have it load LXDE @@ -128,6 +148,16 @@ elif [ "$1" = "gnome" ]; then rc-update add system-tools-backends default setup_displaymanager setup_sabayon_mce +elif [ "$1" = "gforensic" ]; then + # Fix ~/.dmrc to have it load GNOME + echo "[Desktop]" > /etc/skel/.dmrc + echo "Session=gnome" >> /etc/skel/.dmrc + SHIP_NVIDIA_LEGACY="1" + rc-update del system-tools-backends boot + rc-update add system-tools-backends default + setup_displaymanager + setup_sabayon_mce + gforensic_remove_skel_stuff elif [ "$1" = "kde" ]; then # Fix ~/.dmrc to have it load KDE echo "[Desktop]" > /etc/skel/.dmrc