← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/partman-target/oneiric

« back to all changes in this revision

Viewing changes to finish-install.d/02remove_broken_cdrom

  • Committer: Bazaar Package Importer
  • Author(s): Colin Watson
  • Date: 2009-05-12 17:37:37 UTC
  • Revision ID: james.westby@ubuntu.com-20090512173737-te6l21xe01dtvb7k
Tags: 59ubuntu2
* Use block-attr from di-utils 1.68.
* Recommend blkid rather than vol_id in /etc/fstab.

Show diffs side-by-side

added added

removed removed

Lines of Context:
finish-install.d/02remove_broken_cdrom
2
2
while read line; do
3
3
        set -- $line
4
4
        if echo "$2" | grep -qs "\(/cdrom\|/media/cdrom\)"; then
5
 
                fs="$(PATH="/lib/udev:$PATH" vol_id --type "$1" || true)"
 
5
                fs="$(block-attr --type "$1" || true)"
6
6
                if [ -n "$fs" ] && [ "$fs" != "iso9660" ] && [ "$fs" != "udf" ]; then
7
 
 
8
7
                        :
9
8
                else
10
9
                        echo "$line"