Changeset 1214

Timestamp:

01/15/12 11:06:58 (4 months ago)

Author:

tschmitt

Message:

• debian/control: tftpd-hpa Paketname korrigiert.
• tftpd-hpa-Konfigurationsdatei in Ubuntuversion ergänzt.

Location:

main/linuxmuster-linbo/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• debian/control (modified) (1 diff)
• debian/postinst (modified) (3 diffs)
• share/templates/tftpd-hpa.default.ubuntu (added)

main/linuxmuster-linbo/branches/testing/debian/changelog

@@ +1 @@
+linuxmuster-linbo (2.0.3-0) unstable; urgency=low
+
+  * added tftpd-hpa config template for ubuntu.
+
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sun, 15 Jan 2011 10:55:34 +0100
+
 linuxmuster-linbo (2.0.2-0) unstable; urgency=low
 

main/linuxmuster-linbo/branches/testing/debian/control

@@ -17 +17 @@
 Package: linuxmuster-linbo
 Architecture: all
-Depends: rsync (>= 2.6.9), bittorrent, dropbear, ssh, sed, screen, mkisofs, dosfstools, linuxmuster-base (>= 1.4.36), tftpd-hpa, udpcast, zip, mbr, etherwake
+Depends: rsync (>= 2.6.9), bittorrent, dropbear, ssh, sed, screen, mkisofs, dosfstools, linuxmuster-base (>= 1.4.36), tftp-hpa, udpcast, zip, mbr, etherwake
 Suggests: dhcp-server | dhcp3-server
 Recommends: wodim

main/linuxmuster-linbo/branches/testing/debian/postinst

@@ -27 +27 @@
 LINBODIR=/var/linbo
 DISTCONF=/usr/share/linuxmuster/config/dist.conf
+[ -d /usr/share/doc/ubuntu-standard ] && UBUNTU=yes
 
 case "$1" in
@@ -229 +230 @@
  # create tftpd-hpa configs if necessary
  tpldir="/usr/share/linuxmuster-linbo/templates"
- tpl="$tpldir/tftpd-hpa.default"
+ if [ -n "$UBUNTU" ]; then
+  tpl="$tpldir/tftpd-hpa.default.ubuntu"
+ else
+  tpl="$tpldir/tftpd-hpa.default"
+ fi
  conf="/etc/default/tftpd-hpa"
  if ! grep -q "$LINBODIR" "$conf"; then
@@ -252 +257 @@
    /etc/init.d/openbsd-inetd restart
   fi
-  /etc/init.d/tftpd-hpa restart
+  if [ -n "$UBUNTU" ]; then
+   restart tftpd-hpa
+  else
+   /etc/init.d/tftpd-hpa restart
+  fi
  fi