wok diff bootchart/receipt @ rev 14789
Fix ownership and permissions for some files in some packages: adeskbar, ajaxterm, amsn, anacron, arora, asciiquarium, assaultcube-data, asterisk-sound-fr, asterisk-sound, attr-dev, attr, audacious, avidemux, awstats, bind-dev, binutils, blogotext, bootchart, btanks, bzip2-dev, c-client, cairo-dock.
author | Aleksej Bobylev <al.bobylev@gmail.com> |
---|---|
date | Mon Jul 08 11:45:27 2013 +0300 (2013-07-08) |
parents | b792559721d1 |
children | a5f6371c3254 |
line diff
1.1 --- a/bootchart/receipt Fri Mar 05 09:08:38 2010 +0000 1.2 +++ b/bootchart/receipt Mon Jul 08 11:45:27 2013 +0300 1.3 @@ -5,51 +5,45 @@ 1.4 CATEGORY="misc" 1.5 SHORT_DESC="boot process performance analyzer (add init=/sbin/bootchartd to boot options)" 1.6 MAINTAINER="jozee@slitaz.org" 1.7 -SUGGESTED="pybootchartgui" 1.8 +WEB_SITE="http://www.bootchart.org/" 1.9 TARBALL="$PACKAGE-$VERSION.tar.bz2" 1.10 -WEB_SITE="http://www.bootchart.org/" 1.11 WGET_URL="$SF_MIRROR/$PACKAGE/$TARBALL" 1.12 TAGS="boot performance profile analyze" 1.13 1.14 - 1.15 +SUGGESTED="pybootchartgui" 1.16 1.17 # Rules to gen a SliTaz package suitable for Tazpkg. 1.18 genpkg_rules() 1.19 { 1.20 - mkdir -p $fs/sbin $fs/etc 1.21 + mkdir -p $fs/sbin $fs/etc 1.22 cp -a $src/script/bootchartd $fs/sbin/bootchartd 1.23 - cp -a $src/script/bootchartd.conf $fs/etc 1.24 + cp -a $src/script/bootchartd.conf $fs/etc 1.25 sed -i "s/SAMPLE_PERIOD=0.2/SAMPLE_PERIOD=1/" $fs/etc/bootchartd.conf 1.26 sed -i "s/kdm_greet/kdm_greet slim /" $fs/sbin/bootchartd 1.27 - sed -i "s|\/usr\/bin\/bootchart|\/usr\/bin\/pybootchartgui|g" $fs/sbin/bootchartd 1.28 - 1.29 + sed -i 's|/usr/bin/bootchart|/usr/bin/pybootchartgui|g' $fs/sbin/bootchartd 1.30 } 1.31 1.32 post_install() 1.33 { 1.34 - KERNEL_VERSION=`uname -a | cut -d ' ' -f3 | cut -d '-' -f1` 1.35 - if [ -f "$1/boot/grub/menu.lst" ]; then 1.36 - # add an entry only if slitaz is installed and bootchart is not configured 1.37 - if ! grep -q "vmlinuz-$KERNEL_VERSION-slitaz.*sbin/bootchartd.*" $1/boot/grub/menu.lst; then 1.38 - root_dev=`cat $1/boot/grub/menu.lst | grep root= | sed 's/.*root=\([^ ]*\).*/\1/' | head -n 1` 1.39 - grub_dev=`cat $1/boot/grub/menu.lst | grep "root.* (" | head -n 1` 1.40 - # Add new kernel entry for bootchart 1.41 - cat >> $1/boot/grub/menu.lst << EOT 1.42 + KERNEL_VERSION=$(uname -r | cut -d- -f1) 1.43 + MENU="$1/boot/grub/menu.lst" 1.44 + if [ -f "$MENU" ]; then 1.45 + # add an entry only if slitaz is installed and bootchart is not configured 1.46 + if ! grep -q "vmlinuz-$KERNEL_VERSION-slitaz.*sbin/bootchartd.*" "$MENU"; then 1.47 + # FIXME: really use the first comer value? 1.48 + # (our lines will be LAST) 1.49 + root_dev=`sed -n 's/.*root=\([^ ]*\).*/\1/p' "$MENU" | head -n1` 1.50 + grub_dev=`sed -n '/^[^#]*root.* (/p' "$MENU" | head -n1` 1.51 + # Add new kernel entry for bootchart and display information message 1.52 + echo "----" 1.53 + echo "GRUB is installed, these tree lines has been added to the menu.lst:" 1.54 + tee -a "$MENU" << EOT 1.55 1.56 title SliTaz GNU/Linux (Kernel $KERNEL_VERSION-slitaz) with bootchart 1.57 $grub_dev 1.58 kernel /boot/vmlinuz-$KERNEL_VERSION-slitaz root=$root_dev init=/sbin/bootchartd 1.59 EOT 1.60 - # Display information message. 1.61 - cat <<EOT 1.62 ----- 1.63 -GRUB is installed, these tree lines has been added to the menu.lst: 1.64 - 1.65 -title SliTaz GNU/Linux (Kernel $KERNEL_VERSION-slitaz) 1.66 -$grub_dev 1.67 - kernel /boot/vmlinuz-$KERNEL_VERSION-slitaz root=$root_dev init=/sbin/bootchartd 1.68 ----- 1.69 -EOT 1.70 + echo "----" 1.71 else 1.72 echo "Grub menu.lst seems already configured to boot new Kernel..." 1.73 fi