[HardenedServer] pull in Xfce and Midori, fix other small glitches
This commit is contained in:
Fabio Erculiani
parent
7511099e4b
commit
0b5b0cd946
|
|
@ -20,7 +20,7 @@ release_file: /etc/sabayon-edition
|
|||
|
||||
# Inner chroot script command, to be executed inside destination chroot after
|
||||
# packages installation and removal
|
||||
%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_hardenedserver_inner_chroot_script_after.sh
|
||||
%env inner_chroot_script_after: ${SABAYON_MOLECULE_HOME:-/sabayon}/scripts/remaster_generic_inner_chroot_script_after.sh xfce
|
||||
|
||||
# Outer chroot script command, to be executed outside destination chroot before
|
||||
# before entering it (and AFTER inner_chroot_script)
|
||||
|
|
@ -42,8 +42,37 @@ extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat
|
|||
%env destination_iso_directory: ${SABAYON_MOLECULE_HOME:-/sabayon}/iso
|
||||
|
||||
packages_to_add:
|
||||
@X,
|
||||
@fluxbox,
|
||||
@xfce,
|
||||
app-admin/rigo,
|
||||
app-misc/sabayon-skel,
|
||||
app-misc/anaconda-runtime-gui,
|
||||
app-text/pastebunz,
|
||||
dev-python/libgnomecanvas-python,
|
||||
lxde-base/lxdm,
|
||||
media-fonts/ttf-bitstream-vera,
|
||||
media-fonts/dejavu,
|
||||
media-fonts/corefonts,
|
||||
media-gfx/feh,
|
||||
net-dialup/ppp,
|
||||
net-dialup/rp-pppoe,
|
||||
net-misc/tightvnc,
|
||||
sys-apps/gpu-detector,
|
||||
sys-block/parted,
|
||||
sys-power/cpufrequtils,
|
||||
x11-apps/xhost,
|
||||
x11-apps/setxkbmap,
|
||||
x11-themes/equinox-themes,
|
||||
x11-themes/gtk-engines:2,
|
||||
x11-libs/libXxf86misc,
|
||||
x11-themes/hicolor-icon-theme,
|
||||
x11-themes/equinox-themes,
|
||||
x11-terms/terminal,
|
||||
x11-terms/xterm,
|
||||
sys-kernel/linux-hardened,
|
||||
sys-apps/paxctl
|
||||
sys-apps/paxctl,
|
||||
www-client/midori
|
||||
|
||||
packages_to_remove:
|
||||
sys-kernel/linux-sabayon
|
||||
|
|
|
|||
|
|
@ -1,24 +1,34 @@
|
|||
default console
|
||||
|
||||
label console
|
||||
label sabayon
|
||||
menu label Start Sabayon __VERSION__ HardenedServer
|
||||
kernel /boot/sabayon
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 gfxpayload=1024x768x16 console=tty1 quiet --
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet --
|
||||
|
||||
label install
|
||||
menu label Graphical ^Installation
|
||||
kernel /boot/sabayon
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-gui --
|
||||
|
||||
label text-install
|
||||
menu label ^Installation
|
||||
kernel /boot/sabayon
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text --
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 console=tty1 quiet installer-text --
|
||||
|
||||
label genuine
|
||||
menu label Start in Safe ^Mode
|
||||
kernel /boot/sabayon
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm --
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=silent,theme:sabayon __KMS__ vga=788 gfxpayload=800x600x16 noproprietary res=1024x768 pci=routeirq irqpoll console=tty1 quiet nokvm --
|
||||
|
||||
label console
|
||||
menu label ^Console mode
|
||||
kernel /boot/sabayon
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs splash=verbose,theme:sabayon __KMS__ vga=791 gfxpayload=1024x768x16 gentoo=nox nox console=tty1 quiet --
|
||||
|
||||
label debug
|
||||
menu label Deb^ug mode
|
||||
kernel /boot/sabayon
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs console=tty1 debug --
|
||||
append root=/dev/ram0 initrd=/boot/sabayon.igz init=/linuxrc cdroot cdroot_type=udf looptype=squashfs loop=/livecd.squashfs __KMS__ console=tty1 debug --
|
||||
|
||||
label memtest
|
||||
menu label Memory ^test
|
||||
|
|
|
|||
|
|
@ -1,32 +0,0 @@
|
|||
#!/bin/sh
|
||||
|
||||
rc-update del installer-gui boot
|
||||
rc-update del x-setup boot
|
||||
rc-update del hald boot
|
||||
rc-update del avahi-daemon default
|
||||
|
||||
# A RUNNING NetworkManager is required by Anaconda !!
|
||||
# re-enable rc_hotplug
|
||||
# sed -i 's:^rc_hotplug=.*:rc_hotplug="*":g' /etc/rc.conf
|
||||
# rc-update del NetworkManager default
|
||||
|
||||
# install-data dir is really not needed
|
||||
rm -rf /install-data
|
||||
|
||||
mount -t proc proc /proc
|
||||
/lib/rc/bin/rc-depend -u
|
||||
|
||||
# Generate openrc cache
|
||||
touch /lib/rc/init.d/softlevel
|
||||
/etc/init.d/savecache start
|
||||
/etc/init.d/savecache zap
|
||||
|
||||
ldconfig
|
||||
ldconfig
|
||||
umount /proc
|
||||
|
||||
emaint --fix world
|
||||
|
||||
rm -rf /var/lib/entropy/*cache*
|
||||
|
||||
exit 0
|
||||
Loading…
Reference in New Issue