[debian-edu-commits] debian-edu/ 01/01: Remove Debian-custom/099-mount-cdrom cause this script might can possibly conflict with ltsp-client-builder.udeb postinst. (Closes: #780740).

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch ltsp-related
in repository debian-edu-config.

commit 7b84d8df80d846b96c6847e1cd62bade7ae439be
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Mar 18 18:41:07 2015 +0100

    Remove Debian-custom/099-mount-cdrom cause this script might can
    possibly conflict with ltsp-client-builder.udeb postinst. (Closes: #780740).
---
 Makefile                                           |  1 -
 debian/changelog                                   |  3 +++
 .../Debian-custom/099-mount-cdrom                  | 28 ----------------------
 3 files changed, 3 insertions(+), 29 deletions(-)

diff --git a/Makefile b/Makefile
index d450756..7671178 100644
--- a/Makefile
+++ b/Makefile
@@ -439,7 +439,6 @@ install: install-testsuite
  share/ltsp/plugins/ltsp-build-client/Debian-custom/050-nbdquery \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/095-umount-error \
  share/ltsp/plugins/ltsp-build-client/Debian-custom/098-etckeeper \
- share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom \
 	; do \
 		$(INSTALL_DATA) $$f $(DESTDIR)/usr/$$f ; \
 	done
diff --git a/debian/changelog b/debian/changelog
index ee832ba..a6f2e8f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ debian-edu-config (1.818) UNRELEASED; urgency=medium
   * sbin/debian-edu-pxeinstall: Fix ltsp-client-builder/use_cdrom
     preseeding. Although rather strange, the type has to be 'string'.
     (Closes: #780739).
+  * Remove Debian-custom/099-mount-cdrom cause this script might
+    can possibly conflict with ltsp-client-builder.udeb postinst.
+    (Closes: #780740).
 
  -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 18 Mar 2015 18:26:30 +0100
 
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom b/share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom
deleted file mode 100644
index 46bd33d..0000000
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/099-mount-cdrom
+++ /dev/null
@@ -1,28 +0,0 @@
-# Replacement for the Debian/099-mount-cdrom script in the official ltsp
-# package.  Having the file here is a workaround for #606313,
-# triggered when using USB sticks with CD isos.
-case "$MODE" in
-    commandline)
-        add_option "mount-cdrom" "`eval_gettext "mounts CDROM before installation"`" "advanced" "false"
-        ;;
-    configure)
-        if [ -n "$option_mount_cdrom_value" ]; then
-            MOUNT_CDROM="true"
-        fi
-        ;;
-    before-install)
-        if [ "$MOUNT_CDROM" = "true" ]; then
-            if mount /media/cdrom ; then
-                :
-            else
-                echo "unble to mount cdrom, trying to continue"
-                MOUNT_CDROM=false
-            fi
-        fi
-        ;;
-    finalization)
-        if [ "$MOUNT_CDROM" = "true" ]; then
-            umount /media/cdrom
-        fi
-        ;;
-esac

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git