Changeset 5108

Timestamp:

Jun 7, 2017, 10:26:25 AM (4 years ago)

Author:

hectorgh

Message:

read changelog

Location:

lmd/trunk/fuentes

Files:

• debian/changelog (modified) (1 diff)
• debian/lmd-server.postinst (modified) (1 diff)
• lmd-server.install/usr/sbin/ltsp-set-domain-search-ltsconf (modified) (1 diff)
• lmd-server.install/usr/share/lmd-server/templates/lts.conf (modified) (1 diff)

lmd/trunk/fuentes/debian/changelog

@@ +1 @@
+lmd (2.7.4) xenial; urgency=high
+
+  * Added timezone to lts.conf. 
+  * postinst makes sure installed lts.conf ends up with timezone var
+  * ltsp-set-domain-search-ltsconf also removed duplicated AUTOMATICALLY ADDED msg
+
+ -- Hector Garcia Huerta <hectorgh@gmail.com>  Wed, 07 Jun 2017 10:23:32 +0200
+
 lmd (2.7.3.1) xenial; urgency=high
 

lmd/trunk/fuentes/debian/lmd-server.postinst

@@ -45 +45 @@
                         sed --follow-symlinks -i -e "s/$DefaultKey/$DefaultKey\nLDM_LANGUAGE=\"es_ES.UTF-8\"/g" /var/lib/tftpboot/ltsp/lts.conf
                 fi
+                rc=$(grep "TIMEZONE" /var/lib/tftpboot/ltsp/lts.conf > /dev/null; echo $?)
+                if [ "$rc" = "1" ]; then
+                        if [ -e "/etc/timezone" ]; then
+                                TZ=$(cat /etc/timezone)
+                                echo -e "\n# Server timezone\nTIMEZONE = \"$TZ\"" >> /var/lib/tftpboot/ltsp/lts.conf
+                        fi
+                fi
         fi
         set -e

lmd/trunk/fuentes/lmd-server.install/usr/sbin/ltsp-set-domain-search-ltsconf

@@ -8 +8 @@
 f.close()
 needle="SEARCH_DOMAIN"
+msg="# AUTOMATICALLY ADDED BY LTSP-SET-DOMAIN-SEARCH"
+new_lines=[]
+
 for x in lines:
         if x.startswith(needle):
-                lines.remove(x)
+                continue
+        if x.find(msg)==0:
+                continue
+        new_lines.append(x)
+
+lines=new_lines
+
 if domain != None:
-        domainvalue = "# AUTOMATICALLY ADDED BY LTSP-SET-DOMAIN-SEARCH\n"
+        domainvalue = msg + "\n"
         domainvalue += needle + '="' + domain +'"\n'
         lines.append(domainvalue)

lmd/trunk/fuentes/lmd-server.install/usr/share/lmd-server/templates/lts.conf

@@ -45 +45 @@
 RCFILE_01="chvt 7"
 
+# Setting TIMEZONE
+TIMEZONE="Europe/Madrid"
+
 # Keep SSH
 KEEP_SYSTEM_SERVICES=ssh