SliTaz Repositories

     1.1 --- a/linux/receipt	Mon Aug 31 17:17:44 2009 +0200
     1.2 +++ b/linux/receipt	Wed Sep 09 23:20:53 2009 +0200
     1.3 @@ -1,7 +1,7 @@
     1.4  # SliTaz package receipt.
     1.5  
     1.6  PACKAGE="linux"
     1.7 -VERSION="2.6.30.4"
     1.8 +VERSION="2.6.30.6"
     1.9  CATEGORY="base-system"
    1.10  SHORT_DESC="The Linux kernel and modules."
    1.11  DEPENDS="depmod"
    1.12 @@ -36,7 +36,6 @@
    1.13  $PACKAGE-diff-$VERSION.u
    1.14  $PACKAGE-freeinitrd-$VERSION.u
    1.15  $PACKAGE-unlzma-$VERSION.u
    1.16 -$PACKAGE-hotfix-$VERSION.u
    1.17  EOT
    1.18  	make mrproper
    1.19  	cp ../stuff/$PACKAGE-$VERSION-slitaz.config .config
    1.20 @@ -93,23 +92,25 @@
    1.21      echo "Processing post-install commands..."
    1.22      chroot "$1/" depmod -a $VERSION-slitaz
    1.23      if [ -f "$1/boot/grub/menu.lst" ]; then
    1.24 -    	root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/'`
    1.25 -		grub_dev=`cat $1/boot/grub/menu.lst | grep "root ("`
    1.26 +    	root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1`
    1.27 +		grub_dev=`cat $1/boot/grub/menu.lst | grep "root (" | head -n 1`
    1.28  		# Add new kernel entry in case of upgrade for installed system.
    1.29 -    	cat >> $1/boot/grub/menu.lst << EOT
    1.30 +		if ! grep -q $PACKAGE-$VERSION-slitaz $1/boot/grub/menu.lst; then
    1.31 +    		cat >> $1/boot/grub/menu.lst << EOT
    1.32 +
    1.33 +title SliTaz GNU/Linux (Kernel $VERSION-slitaz)
    1.34 +$grub_dev
    1.35 +kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev
    1.36 +EOT
    1.37 +		fi
    1.38 +		# Display information message.
    1.39 +    	cat <<EOT
    1.40 +----
    1.41 +GRUB is installed, these tree lines must be in your /boot/grub/menu.lst:
    1.42  
    1.43  title  SliTaz GNU/Linux (Kernel $VERSION-slitaz)
    1.44  $grub_dev
    1.45 -       kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev
    1.46 -EOT
    1.47 -		# Display information message.
    1.48 -    	cat <<EOT
    1.49 -----
    1.50 -GRUB is installed, these tree lines has been added to the menu.lst:
    1.51 -
    1.52 -title  SliTaz GNU/Linux (Kernel $VERSION-slitaz)
    1.53 -$grub_dev
    1.54 -       kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev
    1.55 +kernel /boot/vmlinuz-$VERSION-slitaz root=$root_dev
    1.56  ----
    1.57  EOT
    1.58  	fi