Browse Source

Don't try and run apt-cdrom for vfat "CD-ROMs"

r60433
tags/0.43
Frans Pop 12 years ago
parent
commit
1600065276
2 changed files with 10 additions and 4 deletions
  1. +1
    -0
      debian/changelog
  2. +9
    -4
      generators/40cdrom

+ 1
- 0
debian/changelog View File

@@ -7,6 +7,7 @@ apt-setup (1:0.43) UNRELEASED; urgency=low
* Use cdrom-detect/cdrom_fs when remounting the CD to ensure that we do so
using the same filesystem. Patch by Colin Watson, merged back from Ubuntu.
Requires cdrom-detect >= 1.32.
* Don't try and run apt-cdrom for non-ISO9660 "CD-ROMs".

-- Colin Watson <cjwatson@debian.org> Thu, 13 Aug 2009 14:00:28 +0100



+ 9
- 4
generators/40cdrom View File

@@ -9,12 +9,17 @@ if [ ! -e /cdrom/.disk/base_installable ]; then
exit 0
fi

fs=iso9660
if db_get cdrom-detect/cdrom_fs && [ "$RET" ]; then
fs="$RET"
fi

if [ "$fs" != iso9660 ]; then
exit 0
fi

remount_cd() {
if [ "$ROOT" ] && [ ! -d /hd-media ]; then
fs=iso9660
if db_get cdrom-detect/cdrom_fs && [ "$RET" ]; then
fs="$RET"
fi
db_get cdrom-detect/cdrom_device
$logoutput mount -t "$fs" -o ro,exec $RET /cdrom || true
fi


Loading…
Cancel
Save