From ae965533692bffaa2b699a980c905f171c10894e Mon Sep 17 00:00:00 2001 From: Fabio Erculiani Date: Thu, 3 Feb 2011 20:37:16 +0100 Subject: [PATCH] [remaster/kforensic] fix default DE for Kforensic --- molecules/sabayon-x86-kforensic.spec | 2 +- .../remaster_generic_inner_chroot_script_after.sh | 13 ++++++++++++- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/molecules/sabayon-x86-kforensic.spec b/molecules/sabayon-x86-kforensic.spec index 902658d..9e0e121 100644 --- a/molecules/sabayon-x86-kforensic.spec +++ b/molecules/sabayon-x86-kforensic.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 gforensic +inner_chroot_script_after: /sabayon/scripts/remaster_generic_inner_chroot_script_after.sh kforensic # 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 196cb14..7765fcd 100755 --- a/scripts/remaster_generic_inner_chroot_script_after.sh +++ b/scripts/remaster_generic_inner_chroot_script_after.sh @@ -98,7 +98,7 @@ gforensic_remove_skel_stuff() { 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 -r /etc/skel/.gconf/apps/gset-compiz } setup_oss_gfx_drivers() { @@ -199,6 +199,17 @@ elif [ "$1" = "gforensic" ]; then setup_sabayon_mce gforensic_remove_skel_stuff setup_proprietary_gfx_drivers +elif [ "$1" = "kforensic" ]; then + setup_networkmanager + # Fix ~/.dmrc to have it load KDE + echo "[Desktop]" > /etc/skel/.dmrc + echo "Session=KDE-4" >> /etc/skel/.dmrc + rc-update del system-tools-backends boot + rc-update add system-tools-backends default + setup_displaymanager + setup_sabayon_mce + gforensic_remove_skel_stuff + setup_proprietary_gfx_drivers elif [ "$1" = "kde" ]; then setup_networkmanager # Fix ~/.dmrc to have it load KDE