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

[molecules] rename "XFCE" to "Xfce"

Browse Source
This commit is contained in:
Fabio Erculiani 2011-09-04 13:04:45 +02:00
parent 7a3ca61947
commit d4bb782002
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
molecules/sabayon-amd64-xfce.spec
View File

@ -5,10 +5,10 @@
release_version: 6 release_version: 6
# Release Version string description # Release Version string description
release_desc: amd64 XFCE release_desc: amd64 Xfce
# Path to source ISO file (MANDATORY) # Path to source ISO file (MANDATORY)
source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_amd64.iso
# Destination ISO image name, call whatever you want.iso, not mandatory # Destination ISO image name, call whatever you want.iso, not mandatory
destination_iso_image_name: Sabayon_Linux_6_amd64_XFCE.iso destination_iso_image_name: Sabayon_Linux_6_amd64_Xfce.iso

4
molecules/sabayon-x86-xfce.spec
View File

@ -5,7 +5,7 @@
release_version: 6 release_version: 6
# Release Version string description # Release Version string description
release_desc: x86 XFCE release_desc: x86 Xfce
# 32bit chroot # 32bit chroot
prechroot: linux32 prechroot: linux32
@ -14,4 +14,4 @@ prechroot: linux32
source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso source_iso: /sabayon/iso/Sabayon_Linux_SpinBase_DAILY_x86.iso
# Destination ISO image name, call whatever you want.iso, not mandatory # Destination ISO image name, call whatever you want.iso, not mandatory
destination_iso_image_name: Sabayon_Linux_6_x86_XFCE.iso destination_iso_image_name: Sabayon_Linux_6_x86_Xfce.iso

4
molecules/xfce.common
View File

@ -9,7 +9,7 @@ release_string: Sabayon Linux
release_file: /etc/sabayon-edition release_file: /etc/sabayon-edition
# ISO Image title # ISO Image title
iso_title: Sabayon XFCE iso_title: Sabayon Xfce
# Outer chroot script command, to be executed outside destination chroot before # Outer chroot script command, to be executed outside destination chroot before
# before entering it (and before inner_chroot_script) # before entering it (and before inner_chroot_script)
@ -33,7 +33,7 @@ error_script: /sabayon/scripts/remaster_error_script.sh
extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat extra_mkisofs_parameters: -b isolinux/isolinux.bin -c isolinux/boot.cat
# Pre-ISO building script. Hook to be able to copy kernel images in place, for example # Pre-ISO building script. Hook to be able to copy kernel images in place, for example
pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh XFCE pre_iso_script: /sabayon/scripts/generic_pre_iso_script.sh Xfce
# Post-ISO building script, called after ISO image generation. # Post-ISO building script, called after ISO image generation.
post_iso_script: /sabayon/scripts/generic_post_iso_script.sh post_iso_script: /sabayon/scripts/generic_post_iso_script.sh

4
scripts/daily_iso_build.sh
View File

@ -61,8 +61,8 @@ REMASTER_SPECS_ISO=(
"Sabayon_Linux_DAILY_x86_K.iso" "Sabayon_Linux_DAILY_x86_K.iso"
"Sabayon_Linux_DAILY_amd64_LXDE.iso" "Sabayon_Linux_DAILY_amd64_LXDE.iso"
"Sabayon_Linux_DAILY_x86_LXDE.iso" "Sabayon_Linux_DAILY_x86_LXDE.iso"
"Sabayon_Linux_DAILY_amd64_XFCE.iso" "Sabayon_Linux_DAILY_amd64_Xfce.iso"
"Sabayon_Linux_DAILY_x86_XFCE.iso" "Sabayon_Linux_DAILY_x86_Xfce.iso"
"Sabayon_Linux_DAILY_amd64_E17.iso" "Sabayon_Linux_DAILY_amd64_E17.iso"
"Sabayon_Linux_DAILY_x86_E17.iso" "Sabayon_Linux_DAILY_x86_E17.iso"
"Sabayon_Linux_CoreCDX_DAILY_amd64.iso" "Sabayon_Linux_CoreCDX_DAILY_amd64.iso"

2
scripts/inner_chroot_script.sh
View File

@ -29,7 +29,7 @@ echo "inet_interfaces = localhost" >> /etc/postfix/main.cf
# turn bashlogin shells to actual login shells # turn bashlogin shells to actual login shells
sed -i 's:exec -l /bin/bash:exec -l /bin/bash -l:' /bin/bashlogin sed -i 's:exec -l /bin/bash:exec -l /bin/bash -l:' /bin/bashlogin
# setup /etc/hosts, add sabayon as default hostname (required by XFCE) # setup /etc/hosts, add sabayon as default hostname (required by Xfce)
sed -i "/^127.0.0.1/ s/localhost/localhost sabayon/" /etc/hosts sed -i "/^127.0.0.1/ s/localhost/localhost sabayon/" /etc/hosts
sed -i "/^::1/ s/localhost/localhost sabayon/" /etc/hosts sed -i "/^::1/ s/localhost/localhost sabayon/" /etc/hosts

2
scripts/remaster_generic_inner_chroot_script_after.sh
View File

@ -193,7 +193,7 @@ elif [ "$1" = "e17" ]; then
has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers has_proprietary_drivers && setup_proprietary_gfx_drivers || setup_oss_gfx_drivers
elif [ "$1" = "xfce" ]; then elif [ "$1" = "xfce" ]; then
setup_networkmanager setup_networkmanager
# Fix ~/.dmrc to have it load XFCE # Fix ~/.dmrc to have it load Xfce
echo "[Desktop]" > /etc/skel/.dmrc echo "[Desktop]" > /etc/skel/.dmrc
echo "Session=xfce" >> /etc/skel/.dmrc echo "Session=xfce" >> /etc/skel/.dmrc
remove_desktop_files remove_desktop_files