Browse Source

Fix CD-changing for etch installs. The Etch version of apt-cdrom does not

always automatically unmount the CD, so we need to do that ourselves.

r54615
tags/0.38
Frans Pop 13 years ago
parent
commit
abfc5a0e8c
3 changed files with 14 additions and 1 deletions
  1. +6
    -1
      debian/changelog
  2. +6
    -0
      generators/41cdset
  3. +2
    -0
      load-install-cd

+ 6
- 1
debian/changelog View File

@@ -1,10 +1,15 @@
apt-setup (1:0.38) UNRELEASED; urgency=low

[ Colin Watson ]
* Initialise local variable 'file' so that apt-setup-verify doesn't get
excruciatingly confused when you pass file=/path on the kernel command
line.

-- Colin Watson <cjwatson@debian.org> Thu, 26 Jun 2008 18:42:51 +0100
[ Frans Pop ]
* Fix CD-changing for etch installs. The Etch version of apt-cdrom does not
always automatically unmount the CD, so we need to do that ourselves.

-- Frans Pop <fjp@debian.org> Sun, 27 Jul 2008 23:34:43 +0200

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



+ 6
- 0
generators/41cdset View File

@@ -37,6 +37,9 @@ fi

tmp=$($chroot $ROOT tempfile)

# Only needed with Etch version of apt-cdrom
$logoutput umount /target/cdrom/ || true

cd_label=$(tail -n1 /var/lib/install-cd.id)
db_subst apt-setup/cdrom/set-first LABEL "$cd_label"
db_input high apt-setup/cdrom/set-first || true
@@ -73,6 +76,9 @@ while [ "$RET" = true ]; do
rm -f $ROOT$tmp $ROOT$tmp~
fi

# Only needed with Etch version of apt-cdrom
$logoutput umount /target/cdrom/ || true

db_input critical $template || true
if ! db_go; then
if [ "$ROOT" ]; then


+ 2
- 0
load-install-cd View File

@@ -13,6 +13,8 @@ logoutput="log-output -t load-install-cd"
check_id() {
cd_id=$($logoutput --pass-stdout chroot $ROOT \
apt-cdrom ident | grep "^Identifying" | cut -d" " -f2)
# Only needed with Etch version of apt-cdrom
$logoutput umount /target/cdrom/ || true

if [ "$cd_id" = "$(head -n1 /var/lib/install-cd.id)" ]; then
return 0


Loading…
Cancel
Save