Changeset 404

Timestamp:

11/29/08 20:48:37 (3 years ago)

Author:

tschmitt

Message:

paedml40-upgrade: div. Anpassungen bzgl. paedML 4.0.2; postinst: schulkonsole db.conf update nochmal verbessert.

Location:

main/linuxmuster-base/trunk

Files:

• debian/changelog (modified) (1 diff)
• debian/postinst (modified) (1 diff)
• share/tasks/upgrade40 (modified) (2 diffs)
• share/upgrade/paedml40-upgrade.sh (modified) (3 diffs)

main/linuxmuster-base/trunk/debian/changelog

@@ +1 @@
+linuxmuster-base (1.4.44-1) testing; urgency=low
+
+  * paedml40-upgrade: minor fixes according to paedML Linux 4.0.2
+  * postinst: minor improvements for schulkonsole's db.conf update
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sat, 29 Nov 2008 19:44:50 +0100
+
 linuxmuster-base (1.4.43-1) testing; urgency=low
 

main/linuxmuster-base/trunk/debian/postinst

@@ -601 +601 @@
         fi
 
-        # ldap db user needs password (1.4.36-paedml1)
-        if ! grep -q "02.11.2008" /etc/linuxmuster/schulkonsole/db.conf; then
+        # ldap db user needs password (1.4.44-1)
+        dbconf=/etc/linuxmuster/schulkonsole/db.conf
+        dbuser=`grep ^Username $dbconf | awk -F\= '{ print $2 }'`
+        dbpwd=`grep ^Password $dbconf | awk -F\= '{ print $2 }'`
+        if [ "$dbuser" != "ldap" -o -z "$dbpwd" ]; then
                 echo "Providing a random password for postgresql user ldap."
                 echo "Warning: Backing up /etc/linuxmuster/schulkonsole/db.conf to db.conf.dpkg-old!"

main/linuxmuster-base/trunk/share/tasks/upgrade40

@@ -368 +368 @@
 libzephyr3
 libzzip-0-12
-linux-headers-2.6.22-1-server
-linux-image-2.6.22-1-server
+linux-headers-2.6.24-3-server
+linux-image-2.6.24-3-server
+linux-ubuntu-modules-2.6.24-3-server
 linux-image-server
 linux-kernel-headers
@@ -376 +377 @@
 linuxmuster-nagios-base
 linuxmuster-schulkonsole
+linuxmuster-schulkonsole-templates-base
 linuxmuster-schulkonsole-wrapper
 locales

main/linuxmuster-base/trunk/share/upgrade/paedml40-upgrade.sh

@@ -496 +496 @@
 echo "Überprüfe installierte Pakete:"
 for i in $checkpackages; do
+        if [ "$i" = "rembo" -o "$i" = "myshn" ]; then
+                [ "$imaging" = "rembo" ] || continue
+        fi
+        if [ "$i" = "linuxmuster-linbo" ]; then
+                [ "$imaging" = "linbo" ] || continue
+        fi
         unset status
         status=`dpkg -s $i | grep ^Status`
@@ -672 +678 @@
 # restore nagios2 configuration
 echo "Stelle Nagios2-Konfiguration wieder her ..."
-rm -rf /etc/nagios2
+# test
+#rm -rf /etc/nagios2
 tar xzf $nagiosbackup -C /
 [ -e /etc/nagios2/resource.cfg ] || echo "# dummy config file created by paedML's etch-upgrade script" > /etc/nagios2/resource.cfg
@@ -745 +752 @@
 fi
 
-# finally update release information
+# update release information
 echo "$(getdistname) $DISTFULLVERSION / Codename $CODENAME" > /etc/issue
 cp /etc/issue /etc/issue.net
 cat /etc/issue
+echo
+
+# update kdm greetstring
+if [ -e /etc/kde/kdm/kdmrc ]; then
+        greetstr="`cat /etc/issue` auf %n"
+        sed -e "s|^GreetString=.*|GreetString=$greetstr|g" -i /etc/kde/kdm/kdmrc 
+fi
+
+# finally do a reconfigure
+/etc/init.d/slapd start
+dpkg-reconfigure linuxmuster-base
 echo