Changeset 4004


Ignore:
Timestamp:
Mar 20, 2017, 6:02:00 PM (2 years ago)
Author:
hectorgh
Message:

adding ltsp-update-image.excludes file to fix the removal of ssh_host keys. ltsp-set-domain-search writes a comment when updating lts.conf file

Location:
lmd/trunk/fuentes
Files:
1 added
5 edited

Legend:

Unmodified
Added
Removed
  • lmd/trunk/fuentes/debian/changelog

    r3670 r4004  
     1lmd (2.7.2) xenial; urgency=high
     2
     3  * ltsp-set-domain-search-ltsconf now writes a comment in the conf file so that
     4    everybody knows where that search_domain extra line comes from.
     5  * Added ltsp-update-image.excludes file to fix the removal of ssh_host keys.
     6
     7 -- Hector Garcia Huerta <hectorgh@gmail.com>  Mon, 20 Mar 2017 17:57:54 +0100
     8
    19lmd (2.7.1) xenial; urgency=high
    210
  • lmd/trunk/fuentes/debian/lmd-server.postinst

    r392 r4004  
    5353        #echo "Restarting dnsmasq"
    5454        #invoke-rc.d dnsmasq restart || true
     55
     56        PKG="lmd-server"
     57
     58        ORIGINAL_FILE="/etc/ltsp/ltsp-update-image.excludes"
     59        NEW_DIVERTED_FILE="/etc/ltsp/ltsp-update-image.diverted"
     60        LLIUREX_FILE="/etc/ltsp/ltsp-update-image.excludes.lliurex"
     61
     62        if [ ! -L "$ORIGINAL_FILE" ]; then
     63
     64                dpkg-divert --add --package ${PKG} --rename --divert "$NEW_DIVERTED_FILE" "$ORIGINAL_FILE"
     65                ln -s "$LLIUREX_FILE" "$ORIGINAL_FILE"
     66
     67        fi
     68
     69
     70
    5571    ;;
    5672
  • lmd/trunk/fuentes/debian/lmd-server.prerm

    r392 r4004  
    2525        fi
    2626        invoke-rc.d apache2 reload || true
     27
     28        ORIGINAL_FILE="/etc/ltsp/ltsp-update-image.excludes"
     29        NEW_DIVERTED_FILE="/etc/ltsp/ltsp-update-image.diverted"
     30        LLIUREX_FILE="/etc/ltsp/ltsp-update-image.excludes.lliurex"
     31
     32
     33        if [ -L "$ORIGINAL_FILE" ]; then
     34                rm -rf "$ORIGINAL_FILE" || true
     35                dpkg-divert --remove --package ${PKG} --rename --divert "$NEW_DIVERTED_FILE" "$ORIGINAL_FILE"
     36
     37        fi
     38
     39
     40
    2741    ;;
    2842    upgrade|deconfigure)
  • lmd/trunk/fuentes/lmd-server.install/usr/sbin/ltsp-set-domain-search-ltsconf

    r3136 r4004  
    1212                lines.remove(x)
    1313if domain != None:
    14         domainvalue = needle + '="' + domain +'"\n'
     14        domainvalue = "# AUTOMATICALLY ADDED BY LTSP-SET-DOMAIN-SEARCH\n"
     15        domainvalue += needle + '="' + domain +'"\n'
    1516        lines.append(domainvalue)
    1617        f = open(ltsfile,'w')
  • lmd/trunk/fuentes/lmd-server.install/usr/share/lmd-server/templates/lts.conf

    r2954 r4004  
    4545RCFILE_01="chvt 7"
    4646
     47# Keep SSH
     48KEEP_SYSTEM_SERVICES=ssh
    4749
Note: See TracChangeset for help on using the changeset viewer.