Browse Source

Use cdrom-detect/cdrom_fs when remounting the CD

This ensures that we do so using the same filesystem.
Patch by Colin Watson, merged back from Ubuntu.

r60432
tags/0.43
Frans Pop 12 years ago
parent
commit
ff8141a4ee
3 changed files with 16 additions and 2 deletions
  1. +6
    -0
      debian/changelog
  2. +5
    -1
      generators/40cdrom
  3. +5
    -1
      load-install-cd

+ 6
- 0
debian/changelog View File

@@ -1,7 +1,13 @@
apt-setup (1:0.43) UNRELEASED; urgency=low

[ Colin Watson ]
* Upgrade to debhelper v7.

[ Chris Lamb ]
* 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.

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

apt-setup (1:0.42) unstable; urgency=low


+ 5
- 1
generators/40cdrom View File

@@ -11,8 +11,12 @@ 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 iso9660 -o ro,exec $RET /cdrom || true
$logoutput mount -t "$fs" -o ro,exec $RET /cdrom || true
fi
}



+ 5
- 1
load-install-cd View File

@@ -29,5 +29,9 @@ while ! check_id; do
db_go || exit 10
done

fs=iso9660
if db_get cdrom-detect/cdrom_fs && [ "$RET" ]; then
fs="$RET"
fi
db_get cdrom-detect/cdrom_device
$logoutput mount -t iso9660 -o ro,exec $RET /cdrom
$logoutput mount -t "$fs" -o ro,exec $RET /cdrom

Loading…
Cancel
Save