sablink/molecules
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of ssh://sabayon.org/~git/projects/molecules

Browse Source
This commit is contained in:
wolfden 2011-03-17 17:51:31 -05:00
commit f1603c1b86
11 changed files with 32 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
boot/core/isolinux/isolinux.cfg
View File

@ -16,7 +16,7 @@ LABEL text-install
LABEL genuine
menu label Start in Safe ^Mode
kernel /boot/sabayon
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm --
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm --
LABEL debug
menu label Deb^ug mode

2
molecules/3rdparty/mcs.common vendored
View File

@ -41,7 +41,7 @@ destination_iso_directory: /sabayon/iso
# List of packages that would be removed from chrooted system (comma separated)
packages_to_remove:
app-office/openoffice,
app-office/libreoffice,
app-emulation/wine,
sabayon-mce,
sabayon-music,

2
molecules/gaming.common
View File

@ -77,7 +77,7 @@ packages_to_remove:
app-dicts/myspell-nl,
app-editors/gedit,
app-emulation/wine,
app-office/openoffice,
app-office/libreoffice,
app-pda/gnome-pilot,
app-pda/pilot-link,
app-text/libwpd,

15
molecules/gnome.common
View File

@ -76,13 +76,13 @@ packages_to_add:
app-misc/sabayon-mce,
app-misc/sabayon-skel,
app-text/pastebunz,
app-office/openoffice,
app-office/openoffice-l10n-de,
app-office/openoffice-l10n-es,
app-office/openoffice-l10n-fr,
app-office/openoffice-l10n-it,
app-office/openoffice-l10n-nl,
app-office/openoffice-l10n-pt,
app-office/libreoffice,
app-office/libreoffice-l10n-de,
app-office/libreoffice-l10n-es,
app-office/libreoffice-l10n-fr,
app-office/libreoffice-l10n-it,
app-office/libreoffice-l10n-nl,
app-office/libreoffice-l10n-pt,
dev-java/sun-jre-bin,
gnome-base/gnome-shell,
gnome-base/gnome-applets,
@ -156,6 +156,7 @@ packages_to_add:
sys-fs/dmraid,
sys-fs/ntfs3g,
sys-power/acpid,
sys-power/cpufrequtils,
www-client/chromium,
www-plugins/adobe-flash,
www-plugins/nspluginwrapper,

15
molecules/kde.common
View File

@ -72,13 +72,13 @@ packages_to_add:
app-misc/sabayon-mce,
app-misc/sabayon-skel,
app-text/pastebunz,
app-office/openoffice,
app-office/openoffice-l10n-de,
app-office/openoffice-l10n-es,
app-office/openoffice-l10n-fr,
app-office/openoffice-l10n-it,
app-office/openoffice-l10n-nl,
app-office/openoffice-l10n-pt,
app-office/libreoffice,
app-office/libreoffice-l10n-de,
app-office/libreoffice-l10n-es,
app-office/libreoffice-l10n-fr,
app-office/libreoffice-l10n-it,
app-office/libreoffice-l10n-nl,
app-office/libreoffice-l10n-pt,
dev-java/sun-jre-bin,
games-puzzle/world-of-goo-demo,
kde-base/kde-l10n-bg,
@ -308,6 +308,7 @@ packages_to_add:
sys-fs/dmraid,
sys-fs/ntfs3g,
sys-power/acpid,
sys-power/cpufrequtils,
www-client/chromium,
www-plugins/adobe-flash,
www-plugins/nspluginwrapper,

2
molecules/sabayon-x86-gforensic.spec
View File

@ -81,7 +81,7 @@ iso_title: Sabayon_Linux_Forensic_x86_G
# List of packages that would be removed from chrooted system (comma separated)
# List of packages that would be removed from chrooted system (comma separated)
packages_to_remove: gnome-base/gnome-mount, net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/openoffice-l10n-de, app-office/openoffice-l10n-es, app-office/openoffice-l10n-fr, app-office/openoffice-l10n-it, app-office/openoffice-l10n-nl, app-office/openoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-wm/emerald, x11-themes/emerald-themes, x11-apps/fusion-icon, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp, app-admin/packagekit-base, app-admin/packagekit-gtk, app-misc/sabayon-music, net-misc/mobile-broadband-provider-info
packages_to_remove: net-dialup/pptpclient, net-dialup/gnome-ppp, net-dialup/globespan-adsl, net-dialup/wvdial, app-office/libreoffice-l10n-de, app-office/libreoffice-l10n-es, app-office/libreoffice-l10n-fr, app-office/libreoffice-l10n-it, app-office/libreoffice-l10n-nl, app-office/libreoffice-l10n-pt, games-puzzle/world-of-goo-demo, media-tv/xbmc, net-irc/xchat, www-client/firefox, x11-wm/fluxbox, x11-libs/compiz-bcop, x11-plugins/compiz-plugins-extra, x11-plugins/compiz-plugins-main, x11-wm/compiz, x11-wm/emerald, x11-themes/emerald-themes, x11-apps/fusion-icon, app-emulation/virtualbox-guest-additions, x11-drivers/xf86-input-virtualbox, x11-drivers/xf86-video-virtualbox, x11-terms/guake, gnome-extra/gnome-games, media-tv/linuxtv-dvb-headers, media-tv/ivtv-firmware, media-tv/afatech9005-firmware, www-client/lynx, net-p2p/deluge, media-gfx/gimp, app-admin/packagekit-base, app-admin/packagekit-gtk, app-misc/sabayon-music, net-misc/mobile-broadband-provider-info
# Custom shell call to packages removal (default is: equo remove)
# custom_packages_remove_cmd:

13
molecules/sabayon-x86-kforensic.spec
View File

@ -93,17 +93,16 @@ packages_to_remove:
app-dicts/aspell-nl,
app-dicts/aspell-pl,
app-dicts/aspell-pt-br,
gnome-base/gnome-mount,
net-dialup/pptpclient,
net-dialup/gnome-ppp,
net-dialup/globespan-adsl,
net-dialup/wvdial,
app-office/openoffice-l10n-de,
app-office/openoffice-l10n-es,
app-office/openoffice-l10n-fr,
app-office/openoffice-l10n-it,
app-office/openoffice-l10n-nl,
app-office/openoffice-l10n-pt,
app-office/libreoffice-l10n-de,
app-office/libreoffice-l10n-es,
app-office/libreoffice-l10n-fr,
app-office/libreoffice-l10n-it,
app-office/libreoffice-l10n-nl,
app-office/libreoffice-l10n-pt,
games-puzzle/world-of-goo-demo,
media-tv/xbmc,
www-client/firefox,

2
remaster/minimal_isolinux.cfg
View File

@ -21,7 +21,7 @@ LABEL text-install
LABEL genuine
menu label Safe ^Mode
kernel /boot/sabayon
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm --
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm --
LABEL console
menu label ^Console mode

2
remaster/serverbase_isolinux.cfg
View File

@ -16,7 +16,7 @@ LABEL text-install
LABEL genuine
menu label Start in Safe ^Mode
kernel /boot/sabayon
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm --
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm --
LABEL debug
menu label Deb^ug mode

2
remaster/standard_isolinux.cfg
View File

@ -44,7 +44,7 @@ LABEL text-install
LABEL genuine
menu label Safe ^Mode
kernel /boot/sabayon
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary genuine res=1024x768 refresh=60 hsync=43-51 pci=routeirq irqpoll noddc console=tty1 quiet nokvm --
append root=/dev/ram0 initrd=/boot/sabayon.igz aufs init=/linuxrc cdroot cdroot_type=udf looptype=squashfs max_loop=64 loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm --
LABEL console
menu label ^Console mode
kernel /boot/sabayon

3
scripts/remaster_generic_inner_chroot_script_after.sh
View File

@ -202,6 +202,7 @@ elif [ "$1" = "gforensic" ]; then
setup_sabayon_mce
gforensic_remove_skel_stuff
setup_proprietary_gfx_drivers
setup_cpufrequtils
elif [ "$1" = "kforensic" ]; then
setup_networkmanager
# Fix ~/.dmrc to have it load KDE
@ -213,6 +214,7 @@ elif [ "$1" = "kforensic" ]; then
setup_sabayon_mce
gforensic_remove_skel_stuff
setup_proprietary_gfx_drivers
setup_cpufrequtils
elif [ "$1" = "kde" ]; then
setup_networkmanager
# Fix ~/.dmrc to have it load KDE
@ -221,6 +223,7 @@ elif [ "$1" = "kde" ]; then
setup_displaymanager
setup_sabayon_mce
setup_proprietary_gfx_drivers
setup_cpufrequtils
fi
# !!! THERE IS A BUG IN THE CLAMAV EBUILD !!!