[debian-edu-commits] debian-edu/ 01/01: kdm isn't available anymore; remove or adjust related files.
Wolfgang Schweer
schweer-guest at moszumanska.debian.org
Thu Aug 11 19:26:58 UTC 2016
This is an automated email from the git hooks/post-receive script.
schweer-guest pushed a commit to branch master
in repository debian-edu-config.
commit f7da813e5b87fb0e27c7a33bd1ac0dbf3bcb63bb
Author: Wolfgang Schweer <wschweer at arcor.de>
Date: Thu Aug 11 21:25:19 2016 +0200
kdm isn't available anymore; remove or adjust related files.
Removed files:
- cf/cf.kdm, etc/insserv/overrides/kdm, testsuite/kdm.
Adjusted files:
- cf/cfengine.conf,
- debian/debian-edu-config.postinst,
- sbin/debian-edu-restart-services,
- share/ltsp/init-ltsp.d/60-edu-client,
- share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs,
- README,
- Makefile.
---
Makefile | 2 -
README | 2 +-
cf/cf.kdm | 6 ---
cf/cfengine.conf | 1 -
debian/changelog | 11 +++++
debian/debian-edu-config.postinst | 5 +++
etc/insserv/overrides/kdm | 10 -----
sbin/debian-edu-restart-services | 6 ---
share/ltsp/init-ltsp.d/60-edu-client | 1 -
.../ltsp-build-client/Debian-custom/032-edu-pkgs | 2 +-
testsuite/kdm | 47 ----------------------
11 files changed, 18 insertions(+), 75 deletions(-)
diff --git a/Makefile b/Makefile
index 7a6600d..65df148 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,6 @@ CFFILES = \
cf.firefox-esr \
cf.grub \
cf.inetd \
- cf.kdm \
cf.krb5client \
cf.ldapserver \
cf.ldapclient \
@@ -112,7 +111,6 @@ SYSCONFFILES = \
firefox-esr/debian-edu.js \
gosa/gosa.conf \
php/apache2/php-debian-edu.ini \
- insserv/overrides/kdm \
insserv/overrides/ntp \
ldap/rootDSE-debian-edu.ldif \
ldap/slapd-squeeze_debian-edu.conf \
diff --git a/README b/README
index 62bb570..16a21fa 100644
--- a/README
+++ b/README
@@ -194,7 +194,7 @@ Local device access
The local user should have access to some of the local devices
(sound, cdrom, etc) after logging in on the console or via
- kdm/gdm/xdm/etc, but not when logging in from remote via ssh. There
+ gdm/xdm/etc, but not when logging in from remote via ssh. There
are as far as I know two ways to make this happen. One way is to
add the local user to the groups needed to access these devices, the
other is to change the permissions on these devices to give access
diff --git a/cf/cf.kdm b/cf/cf.kdm
deleted file mode 100644
index 888b442..0000000
--- a/cf/cf.kdm
+++ /dev/null
@@ -1,6 +0,0 @@
-shellcommands:
-
- debian.installation.!standalone::
- "/usr/bin/update-ini-file /etc/kde4/kdm/kdmrc 'X-\:*-Core' AllowRootLogin false"
- # Make sure to not show the last user that logged in
- "/usr/bin/update-ini-file /etc/kde4/kdm/kdmrc 'X-\:*-Greeter' PreselectUser None"
diff --git a/cf/cfengine.conf b/cf/cfengine.conf
index 7db1c47..3c1649e 100644
--- a/cf/cfengine.conf
+++ b/cf/cfengine.conf
@@ -105,7 +105,6 @@ import:
cf.grub
cf.imap
cf.inetd
- cf.kdm
cf.krb5client
cf.ldapclient
cf.ldapserver
diff --git a/debian/changelog b/debian/changelog
index 26a2ef6..02b796f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,17 @@ debian-edu-config (1.907) UNRELEASED; urgency=medium
has been removed from the binary package.
* Add package initscripts to Pre-Depends: share/d-e-c/d-i/pre-pkgsel is
failing now because /etc/init.d/hostname.sh is missing.
+ * kdm isn't available anymore; remove or adjust related files.
+ Removed files:
+ - cf/cf.kdm, etc/insserv/overrides/kdm, testsuite/kdm.
+ Adjusted files:
+ - cf/cfengine.conf,
+ - debian/debian-edu-config.postinst,
+ - sbin/debian-edu-restart-services,
+ - share/ltsp/init-ltsp.d/60-edu-client,
+ - share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs,
+ - README,
+ - Makefile.
-- Holger Levsen <holger at debian.org> Wed, 03 Aug 2016 18:29:32 +0200
diff --git a/debian/debian-edu-config.postinst b/debian/debian-edu-config.postinst
index 109adb1..029c048 100644
--- a/debian/debian-edu-config.postinst
+++ b/debian/debian-edu-config.postinst
@@ -201,6 +201,11 @@ configure)
fi
fi
+ if dpkg --compare-versions "$2" le "1.906"; then
+ rm_conffile debian-edu-config /etc/cfengine/debian-edu/cf.kdm
+ rm /etc/insserv/kdm
+ fi
+
# sssd refuses to read the file if it has any other mode
chmod 600 /etc/sssd/sssd-debian-edu.conf
chown root:root /etc/sssd/sssd-debian-edu.conf
diff --git a/etc/insserv/overrides/kdm b/etc/insserv/overrides/kdm
deleted file mode 100644
index a718545..0000000
--- a/etc/insserv/overrides/kdm
+++ /dev/null
@@ -1,10 +0,0 @@
-# BTS #584434, adding krb5-kdc to the should-start line
-### BEGIN INIT INFO
-# Provides: kdm
-# Required-Start: $local_fs $remote_fs
-# Required-Stop: $local_fs $remote_fs
-# Should-Start: console-screen kbd acpid dbus hal krb5-kdc
-# Should-Stop: console-screen kbd
-# Default-Start: 2 3 4 5
-# Default-Stop: 0 1 6
-### END INIT INFO
diff --git a/sbin/debian-edu-restart-services b/sbin/debian-edu-restart-services
index 1f673aa..81f13e3 100755
--- a/sbin/debian-edu-restart-services
+++ b/sbin/debian-edu-restart-services
@@ -60,12 +60,6 @@ for ALL in /etc/rc2.d/S* ; do
else
SERVICE=$(basename $ALL)
fi
- if [ "$SERVICE" = "kdm" ] ; then
- if [ -f /etc/inittab.real ] ; then
- echo "info: Skipping start of $SERVICE, inittab.real still exists"
- continue
- fi
- fi
echo "info: Starting $SERVICE"
$ALL start || /bin/true
done
diff --git a/share/ltsp/init-ltsp.d/60-edu-client b/share/ltsp/init-ltsp.d/60-edu-client
index 6724c66..74964f0 100644
--- a/share/ltsp/init-ltsp.d/60-edu-client
+++ b/share/ltsp/init-ltsp.d/60-edu-client
@@ -21,7 +21,6 @@ fi
if [ -z "$DEFAULT_DISPLAY_MANAGER" ]; then
for service in \
lightdm \
- kdm \
gdm3 \
; do
service_disable $service
diff --git a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
index 43f6c7f..955cf5a 100644
--- a/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
+++ b/share/ltsp/plugins/ltsp-build-client/Debian-custom/032-edu-pkgs
@@ -277,7 +277,7 @@ finalization_diskless_workstation() {
#enable_on_rclevel nfs-common 3
#enable_on_rclevel dbus 3
#enable_on_rclevel hal 3
- #only_run_on_rclevel 3 gdm kdm xdm nscd cupsys autofs pulseaudio \
+ #only_run_on_rclevel 3 gdm xdm nscd cupsys autofs pulseaudio \
# rpcbind nfs-common nslcd rwhod saned cups timidity jackd cron \
# speech-dispatcher binfmt-support avahi-daemon bluetooth
diff --git a/testsuite/kdm b/testsuite/kdm
deleted file mode 100755
index 29533da..0000000
--- a/testsuite/kdm
+++ /dev/null
@@ -1,47 +0,0 @@
-#!/bin/sh -e
-#
-# Test if the kdm server is working.
-
-. /usr/share/debian-edu-config/testsuite-lib.sh
-
-if test -r /etc/debian-edu/config ; then
- . /etc/debian-edu/config
-fi
-
-# Standalone Main-Server does not install kdm
-if [ "$PROFILE" = Main-Server ] ; then
- exit 0
-fi
-
-# Only test if kdm is installed
-if deb_installed kdm ; then
- :
-else
- echo "info: $0: kdm is not installed"
- exit 0
-fi
-
-
-# kdm shall not be started, disabling the following tests
-# (2006-01-25, werner)
-
-# kdm is not started yet when this is executed during installation.
-# Thus only information.
-#if pidof kdm > /dev/null ; then
-# echo "success: $0: kdm is running."
-#else
-# echo "info: $0: kdm is not running."
-# exit 1
-#fi
-#
-#port=xdmcp
-#proto=udp
-#
-#if netstat -a 2>&1 | grep ":$port " | grep -q "^$proto" ; then
-# echo "success: $0: kdm server is listening on $port/$proto."
-#else
-# echo "info: $0: kdm server is not listening on $port/$proto."
-# exit 1
-#fi
-#
-#exit 0
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-config.git
More information about the debian-edu-commits
mailing list