On Wed, Nov 28, 2007 at 09:26:16PM +0100, Petter Reinholdtsen wrote:
> Ref item 9 on <URL:http://wiki.debian.org/DebianEdu/Meeting/20070813>,
> here is a update proposal for the stable release.
>
> I propose to update the version of debian-edu-config in the stable
> repository from 0.416+svn39160 to version 0.416+svn39390.
I hereby propose to update it to the version 0.416+svn39425.
> The update fixes a bug in the sound setup on thin clients, breaking
> the sound support on all clients needing the alsa packages (bug
> #1288). It also improves the default samba setup (bug #1270)
Additionally it now creates the samba group maps on installation and
fixes Skolelinux bug 1281 (cleaning swap files for thinclients that are
no longer reachable).
Ronny saith on irc he may have time to test an echt-test image tomorrow,
so maybe we want to wait on that and see if it really works, ...
This is the diff of the additional changes.
diff -Nru /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/debian/changelog /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/debian/changelog
--- /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/debian/changelog 2007-11-28 21:21:27.000000000 +0100
+++ /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/debian/changelog 2007-11-29 21:51:55.000000000 +0100
@@ -1,15 +1,22 @@
-debian-edu-config (0.416+svn39390) terra; urgency=low
+debian-edu-config (0.416+svn39425) terra; urgency=low
[ Ronny Aasen ]
* Adding groupmap commands to samba-debian-edu-admin, for the default groups
jradmin, students,teachers. part of the fix for #1270
+ * Cleaning up swap files for thinclients that are powerdown/unreachable.
+ Solves Skolelinux bug #1281.
[ Petter Reinholdtsen ]
* Add ltsp-build-client script fragment to pull in alsa-utils when
building the thin client chroot. Solves Skolelinux bug #1288,
at least for new installs.
- -- Petter Reinholdtsen <pere@debian.org> Wed, 28 Nov 2007 21:21:19 +0100
+ [ Daniel Hess ]
+ * Adding groupmaps to the root.ldif so they get added during installation.
+ Let samba-debian-edu-admin set sambaNextRid to 1003 to don't collide with
+ the rids used in root.ldif.
+
+ -- Daniel Hess <daniel@rio-grande.ping.de> Thu, 29 Nov 2007 21:51:33 +0100
debian-edu-config (0.416+svn39160) terra; urgency=low
diff -Nru /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/ldap-bootstrap/root.ldif /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/ldap-bootstrap/root.ldif
--- /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/ldap-bootstrap/root.ldif 2007-07-18 00:09:18.000000000 +0200
+++ /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/ldap-bootstrap/root.ldif 2007-11-29 21:47:36.000000000 +0100
@@ -73,33 +73,45 @@
objectClass: posixGroup
objectClass: lisGroup
objectClass: lisAclGroup
+objectClass: sambaGroupMapping
cn: jradmins
member:
-description: Junior Admins
+description: All junior admins in the school
gidNumber: 10002
groupType: authority_group
+sambaSID: $SAMBASID-1001
+sambaGroupType: 2
+displayName: jradmins
dn: cn=teachers,ou=Group,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: posixGroup
objectClass: lisGroup
objectClass: lisAclGroup
+objectClass: sambaGroupMapping
cn: teachers
member:
-description: All teachers in the institution
+description: All teachers in the school
gidNumber: 10003
groupType: authority_group
+sambaSID: $SAMBASID-1002
+sambaGroupType: 2
+displayName: teachers
dn: cn=students,ou=Group,dc=skole,dc=skolelinux,dc=no
objectClass: top
objectClass: posixGroup
objectClass: lisGroup
objectClass: lisAclGroup
+objectClass: sambaGroupMapping
cn: students
member:
-description: All students/pupils in the institution
+description: All students in the school
gidNumber: 10004
groupType: authority_group
+sambaSID: $SAMBASID-1003
+sambaGroupType: 2
+displayName: students
dn: cn=none,ou=Group,dc=skole,dc=skolelinux,dc=no
objectClass: top
diff -Nru /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/ldap-tools/samba-debian-edu-admin /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/ldap-tools/samba-debian-edu-admin
--- /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/ldap-tools/samba-debian-edu-admin 2007-11-27 16:02:23.000000000 +0100
+++ /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/ldap-tools/samba-debian-edu-admin 2007-11-29 21:47:36.000000000 +0100
@@ -94,6 +94,7 @@
sambaSID: $SAMBASID
sambaAlgorithmicRidBase: 1000
objectClass: sambaDomain
+sambaNextRid: 1003
EOF
cat << EOF | /usr/sbin/slapadd
diff -Nru /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/share/debian-edu-config/tools/nbdswap-cleanup /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/share/debian-edu-config/tools/nbdswap-cleanup
--- /tmp/a6vk9vcU89/debian-edu-config-0.416+svn39390/share/debian-edu-config/tools/nbdswap-cleanup 2007-06-13 23:03:41.000000000 +0200
+++ /tmp/JZxQ899Ptp/debian-edu-config-0.416+svn39425/share/debian-edu-config/tools/nbdswap-cleanup 2007-11-29 21:47:36.000000000 +0100
@@ -36,9 +36,8 @@
fi
done
-# stop nbd-server processes with no client running
# Query the ltsp client on port 9211 to get a list of ports in use by nbd-clients.
-# and can safely be removed.
+# stop nbd-server processes with no clients running, they can safely be removed.
pids=$(ps ax -o pid,args | grep -v grep | grep ' /usr/sbin/nbdswapd' | awk '{print $1}' )
for pid in $pids ; do
@@ -50,17 +49,28 @@
host=$(lsof -P -p $pid | grep 9210 | grep TCP | head -n 1 | cut -d":" -f2 | cut -d">" -f2)
#query the ltsp host for the nbd-client ports in use
- r_port=$(nc $host $NBDQUERY_PORT )
-
- if [ ${r_port:-0} -ne "0" ]; then
- #keep if it matches
- if [ "$l_port" -ne "$r_port" ]; then
- #what nbd-server is child of this nbdswapd
- for nbds_pid in $(ps ax --no-heading -o pid,ppid,args| grep $pid | grep -v grep | grep nbd-server | awk '{print $1}'); do
+ r_port=$(nc $host $NBDQUERY_PORT || echo fail )
+ #if host was unreachable (power off/network failure)
+ if [ ${r_port} = "fail" ] ; then
+ #kill all nbd's for this host
+ for nbds_pid in $(ps ax --no-heading -o pid,ppid,args| grep $pid | grep -v grep | grep nbd-server | awk '{print $1}'); do
#kill this nbd-server
#it will take it's file and go.
- kill -1 $nbds_pid
- done
+ kill -1 $nbds_pid
+ done
+
+ else
+ #if we got a reply
+ if [ ${r_port:-0} -ne "0" ]; then
+ #keep if it matches
+ if [ "$l_port" -ne "$r_port" ]; then
+ #what nbd-server is child of this nbdswapd
+ for nbds_pid in $(ps ax --no-heading -o pid,ppid,args| grep $pid | grep -v grep | grep nbd-server | awk '{print $1}'); do
+ #kill this nbd-server
+ #it will take it's file and go.
+ kill -1 $nbds_pid
+ done
+ fi
fi
fi
done
Attachment:
signature.asc
Description: Digital signature