slitaz-tools rev 681

merge
author Claudinei Pereira <claudinei@slitaz.org>
date Wed Feb 22 16:28:02 2012 -0200 (2012-02-22)
parents 16e2801ef8ce be257190624e
children 647f59e0030e
files
line diff
     1.1 --- a/installer/tazinst	Wed Feb 22 16:24:52 2012 -0200
     1.2 +++ b/installer/tazinst	Wed Feb 22 16:28:02 2012 -0200
     1.3 @@ -604,6 +604,12 @@
     1.4  		cp -a $SOURCE_ROOT/boot/isolinux/*.lss $TARGET_ROOT/boot/isolinux
     1.5  		cp -a $SOURCE_ROOT/boot/isolinux/*.c32 $TARGET_ROOT/boot/isolinux
     1.6  	fi
     1.7 +	# GRUB splash image
     1.8 +	if [ -f "$SOURCE/ROOT/boot/grub/splash.xmp.gz" ]; then
     1.9 +		debug "Copy GRUB splash image"
    1.10 +		mkdir -p $TARGET_ROOT/boot/grub
    1.11 +		$SOURCE/ROOT/boot/grub/splash.xpm.gz $TARGET_ROOT/boot/grub
    1.12 +	fi
    1.13  }
    1.14  
    1.15  need_package()
    1.16 @@ -817,7 +823,6 @@
    1.17  	fi
    1.18  	# Create the target GRUB configuration.
    1.19  	mkdir -p $TARGET_ROOT/boot/grub
    1.20 -	. /etc/locale.conf
    1.21  	cat > $TARGET_ROOT/boot/grub/menu.lst << _EOF_
    1.22  # /boot/grub/menu.lst: GRUB boot loader configuration.
    1.23  #
    1.24 @@ -838,7 +843,7 @@
    1.25  #
    1.26  title SliTaz GNU/Linux (cooking) (Kernel $KERNEL)
    1.27  root $GRUB_ROOT
    1.28 -kernel /boot/$KERNEL root=$TGT_PARTITION lang=$LANG
    1.29 +kernel /boot/$KERNEL root=$TGT_PARTITION quiet
    1.30  
    1.31  _EOF_
    1.32  	if [ -n "$TGT_WINBOOT" ]; then
     2.1 --- a/rootfs/usr/share/applications/burnbox.desktop	Wed Feb 22 16:24:52 2012 -0200
     2.2 +++ b/rootfs/usr/share/applications/burnbox.desktop	Wed Feb 22 16:28:02 2012 -0200
     2.3 @@ -5,6 +5,6 @@
     2.4  Name[pt]=Gravador de CD/DVD
     2.5  Comment=Burn ISO images or audio tracks to CD or DVD
     2.6  Exec=burnbox
     2.7 -Icon=/usr/share/icons/SliTaz/16x16/devices/drive-optical.png
     2.8 +Icon=drive-optical
     2.9  Type=Application
    2.10  Categories=GTK;Utility;
     3.1 --- a/rootfs/usr/share/applications/desktopbox-autostart.desktop	Wed Feb 22 16:24:52 2012 -0200
     3.2 +++ b/rootfs/usr/share/applications/desktopbox-autostart.desktop	Wed Feb 22 16:28:02 2012 -0200
     3.3 @@ -2,7 +2,7 @@
     3.4  Encoding=UTF-8
     3.5  Name=Auto started applications
     3.6  Name[pt]=Aplicações Auto Iniciadas
     3.7 -Icon=preferences-system-session
     3.8 +Icon=gnome-session
     3.9  Exec=desktopbox autostart
    3.10  Type=Application
    3.11  Categories=Settings;DesktopSettings;GTK;
     4.1 --- a/rootfs/usr/share/applications/passwd.desktop	Wed Feb 22 16:24:52 2012 -0200
     4.2 +++ b/rootfs/usr/share/applications/passwd.desktop	Wed Feb 22 16:28:02 2012 -0200
     4.3 @@ -4,7 +4,7 @@
     4.4  Name[fr]=Mot de passe du compte
     4.5  Name[pt]=Mudar Senha de Usuário
     4.6  Exec=xterm -T "Passwd" -geometry 60x10 -e 'echo; passwd; sleep 4'
     4.7 -Icon=passwd.png
     4.8 +Icon=system-config-authentication
     4.9  Terminal=false
    4.10  Type=Application
    4.11  Categories=Settings;DesktopSettings;