Changeset 1218

Timestamp:

01/15/12 12:19:59 (4 months ago)

Author:

tschmitt

Message:

• LINBO-Konfiguration angepasst.

Location:

main/linuxmuster-base/branches/testing

Files:

• debian/changelog (modified) (1 diff)
• var/config-dynamic/40_linbo/prepatch (modified) (5 diffs)

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

@@ -5 +5 @@
   * deactivated various ipcop stuff.
 
- -- Thomas Schmitt <schmitt@lmz-bw.de>  Sun, 15 Jan 2012 11:40:32 +0100
+ -- Thomas Schmitt <schmitt@lmz-bw.de>  Sun, 15 Jan 2012 12:04:07 +0100
 
 linuxmuster-base (5.1.0-3lenny0) lenny; urgency=low

main/linuxmuster-base/branches/testing/var/config-dynamic/40_linbo/prepatch

@@ -2 +2 @@
 #
 
-# create tftpd-hpa configs if necessary
-tpldir="/usr/share/linuxmuster-linbo/templates"
-tpl="$tpldir/tftpd-hpa.default"
-conf="/etc/default/tftpd-hpa"
-if ! grep -q "$LINBODIR" "$conf"; then
- echo "Patching $conf."
- backup_file "$conf"
- sed -e "s|@@linbodir@@|$LINBODIR|" "$tpl" > "$conf"
-fi
-conf="/etc/tftp_remap.conf"
-tpl="$tpldir/$(basename $conf)"
-if [ ! -e "$conf" ]; then
- echo "Providing $conf."
- cp "$tpl" "$conf"
-fi
-
-# check for tftp in inetd.conf
-conf=/etc/inetd.conf
-if grep -q ^tftp "$conf"; then
- echo "Deactivating tftp in $conf."
- backup_file "$conf"
- sed -e 's|^tftp|#tftp|' -i "$conf"
-fi
+dpkg-reconfigure linuxmuster-linbo
 
 # stuff to do on first time install
@@ -39 +17 @@
  rm -rf $SYSCONFDIR/workstations
 
-else # modify
-
- # restore workstations file from link if coming from rembo
- if [ "$imaging_old" = "rembo" ]; then
-  if [ -L "$SYSCONFDIR/workstations" ]; then
-   rm $SYSCONFDIR/workstations
-  else
-   backup_file $SYSCONFDIR/workstations
-  fi
-  cp $REMBOFILES/files/global/wimport_data $SYSCONFDIR/workstations
- fi
-
 fi
 
 touch $SYSCONFDIR/workstations
-
-# patch path to wimport_data in dist.conf
-backup_file /usr/share/linuxmuster/config/dist.conf
-sed -e "s/^WIMPORTDATA=.*/WIMPORTDATA=\"\$SYSCONFDIR\/workstations\"/" -i /usr/share/linuxmuster/config/dist.conf
 
 # if no linbo password then grep rsync password from rembo.conf or if that fails take simply muster as password
@@ -91 +53 @@
 fi
 
-# patch start.confs with serverip
-for i in $LINBODEFAULTCONF `find $LINBODIR/ -type f -name 'start.conf*'`; do
- backup_file $i
- sed -e "s/^Server = \([0-9]\{1,3\}[.]\)\{3\}[0-9]\{1,3\}/Server = $serverip/" -i $i
-done
-
 # patch regs with workgroup
 for i in `find $LINBODIR/ -type f -name '*.reg'`; do
@@ -104 +60 @@
 done
 
-# patch start variables of tftpd-hpa and rsync
-sed -e "s/^RUN_DAEMON=.*/RUN_DAEMON=yes/" -i /etc/default/tftpd-hpa
+# patch rsync start variable
 sed -e "s/^RSYNC_ENABLE=.*/RSYNC_ENABLE=true/" -i /etc/default/rsync
 
 # check for images and start multicast
 update-rc.d linbo-multicast defaults
-res=`find $LINBODIR -name '*.cloop'`
+res="$(find $LINBODIR -name \*.cloop)"
 if [ -n "$res" ]; then
  sed -e "s/^START_MULTICAST=.*/START_MULTICAST=yes/" -i /etc/default/linuxmuster-linbo
@@ -147 +102 @@
 
 # start necessary services
-/etc/init.d/tftpd-hpa start
+start tftpd-hpa
 /etc/init.d/rsync start