← Back to branch summary

~persia/debian-cd/mid.seed-cleanup

« back to all changes in this revision

Viewing changes to tools/jaunty/installtools.sh

  • Committer: Colin Watson
  • Date: 2009-02-12 00:05:17 UTC
  • Revision ID: cjwatson@canonical.com-20090212000517-77oyxiumpi2c6h0i
remove tasksel/first preseeding for DVDs (reported by Jordan Mantha)

Show diffs side-by-side

added added

removed removed

Lines of Context:
tools/jaunty/installtools.sh
60
60
            cp -a "$file" $DIR/preseed/
61
61
        done
62
62
    done
 
63
    # we normally preseed tasksel to install the desktop task, but this is
 
64
    # inappropriate on DVDs where much more choice is available
 
65
    if [ -e "$DIR/preseed/$PROJECT.seed" ]; then
 
66
        perl -ne '
 
67
            if (/^#/) { $out .= $_ }
 
68
            elsif (m[^tasksel\s+tasksel/first\s]) { $out = "" }
 
69
            else { print $out; print; $out = "" }' \
 
70
                "$DIR/preseed/$PROJECT.seed"
 
71
        if [ ! -s "$DIR/preseed/$PROJECT.seed" ]; then
 
72
            rm -f "$DIR/preseed/$PROJECT.seed"
 
73
        fi
 
74
    fi
63
75
fi