Changeset 591


Ignore:
Timestamp:
02/05/10 19:55:47 (2 years ago)
Author:
tschmitt
Message:
  • Paket:
    • LSB-Header zu linbo-multicast Initskript hinzugefügt.
    • postinst: o Bereitstellen der Bittorrent-Initskripte, werden vom Lenny-Bittorrent-Paket nicht

mehr automatisch installiert.

o Unterdrücken des Passwortprompts bei SSH-Schlüsselgenerierung.

  • Linbofs
    • Rsync: neue Version 3.0.7.
    • linbo_cmd.sh: o mk_cloop(): Rsync-Optionen bzgl. Dateisystemtyp differenziert (ntfs, vfat, other).
    • linbo_wrapper: Shutdown-Befehl von poweroff nach halt geändert.
    • ntfs-3g: Neue Version 2010.1.16 (stable).
  • Kernel: Neue Version 2.6.32.7.
  • Serverskripte
    • Syslinux: Auf Lenny neu kompiliert.
    • make-linbo-media.sh: o Neue Option -n: erlaubt Passwort basiertes einloggen, benötigt -p, optional. o Neue Option -p <passwort>: setzt das lokale linbo Adminpasswort, wird auch für

Root-SSH-Login benutzt, wenn mit -n das Passwort basierte Einloggen erlaubt wurde, optional.

o Neue Option -r: entfernt den öffentlichen SSH-Schlüssen des Serverbenutzers root.
o Ermittlung der LINBO-Parameter aus der gruppenspezifischen PXE-Konfigurationsdatei verbessert.

Location:
main/linuxmuster-linbo/branches/testing
Files:
9 edited

Legend:

Unmodified
Added
Removed

  • main/linuxmuster-linbo/branches/testing/conf/initramfs.conf

    r585 r591  
    112112# ntfs-3g 
    113113file /bin/ntfs-3g ../../src/ntfs-3g/src/.libs/ntfs-3g 755 0 0 
    114 file /lib/libntfs-3g.so.4917 ../../src/ntfs-3g/libntfs-3g/.libs/libntfs-3g.so.4917 755 0 0 
     114file /lib/libntfs-3g.so.73 ../../src/ntfs-3g/libntfs-3g/.libs/libntfs-3g.so.73.0.0 755 0 0 
    115115# ntfs-3g 1.2920 MUST have this. 
    116116slink /etc/mtab /proc/mounts 755 0 0 

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

    r585 r591  
     1linuxmuster-linbo (1.99.16-0) unstable; urgency=low 
     2 
     3  * package 
     4    - linbo-multicast init script, added lsb header. 
     5  * linbofs 
     6    - rsync: new upstream version 3.0.7. 
     7    - linbo_cmd.sh: 
     8      o mk_cloop(): uses specific rsync options due to fstype (ntfs, vfat, other). 
     9    - linbo_wrapper: changed shutdown command from poweroff to halt. 
     10    - ntfs-3g: new upstream version 2010.1.16. 
     11  * kernel: new version 2.6.32.7. 
     12  * server side scripting 
     13    - syslinux: recompiled on lenny. 
     14    - make-linbo-media.sh: 
     15      o new option -n: no strict checking for linbo ssh server, allows password based 
     16        logins, needs -p for root pw, optional. 
     17      o new option -p <password>: sets local linbo admin password, is also used for 
     18        root ssh login if password logins are allowed with -n, optional. 
     19      o new option -r: remove server root's public ssh key. 
     20      o improved LINBO parameter grepping from group's pxe configfile. 
     21 
     22 -- Thomas Schmitt <schmitt@lmz-bw.de>  Fri, 5 Feb 2010 13:16:23 +0100 
     23 
     24linuxmuster-linbo (1.99.15-2) unstable; urgency=low 
     25 
     26  * package, postinst: creating bittorrent init scripts if necessary. 
     27 
     28 -- Thomas Schmitt <schmitt@lmz-bw.de>  Wed, 3 Feb 2010 13:25:56 +0100 
     29 
     30linuxmuster-linbo (1.99.15-1) unstable; urgency=low 
     31 
     32  * package, postinst: added one more "\n" to ssh key gen commands to avoid password query. 
     33 
     34 -- Thomas Schmitt <schmitt@lmz-bw.de>  Mon, 1 Feb 2010 15:21:25 +0100 
     35 
    136linuxmuster-linbo (1.99.15-0) unstable; urgency=low 
    237 

  • main/linuxmuster-linbo/branches/testing/debian/linbo-multicast

    r329 r591  
    11#!/bin/bash 
     2 
     3### BEGIN INIT INFO 
     4# Provides:          linbo-multicast 
     5# Required-Start:    $network $local_fs 
     6# Required-Stop:     $network $local_fs 
     7# Should-Start:       
     8# Should-Stop:        
     9# Default-Start:     2 3 4 5 
     10# Default-Stop:      0 1 6 
     11# Short-Description: Start linbo multicast server 
     12# Description:       Start linbo multicast server 
     13### END INIT INFO 
     14 
    215# Author: Thomas Schmitt <schmitt@lmz-bw.de> 
    3 # License: GPL V2 
     16# License: GPL V3 
    417# 
    5 # /etc/init.d/starting linbo multicast server 
    618 
    719# defaults 

  • main/linuxmuster-linbo/branches/testing/debian/md5sums.src

    r585 r591  
    55e9a5936688e97075901f099b1749dc80  grub4dos-0.4.4-2009-10-16-src.zip 
    6667c1a396fdf67b984dad939a59a01571  kexec-tools-2.0.1.tar.bz2 
    7 471e0fe07e27796f041ecb990302ccc4  linux-2.6.32.4.tar.bz2 
     7d59aca06609cedabe4d6d161d9f11113  linux-2.6.32.7.tar.bz2 
    886fad0a69ac89440ad4f696dbbbf11497  ms-sys-2.1.3.tgz 
    9 d1f9bf1df93ac9eec0e6dab133f0fe99  ntfs-3g-2009.4.4AR.17.tgz 
     9e104c914e8d7d29ee83e63d46afbba25  ntfs-3g-2010.1.16.tgz 
    1010083903f34a0c345a05931b43fe4aa7f0  qt-embedded-linux-opensource-src-4.5.2.tar.gz 
    11 e9865d093a18e4668b9d31b635dc8e99  rsync-3.0.6.tar.gz 
     11b53525900817cf1ba7ad3a516ab5bfe9  rsync-3.0.7.tar.gz 
    1212257ac04e62ab7e3616e220333a1140cb  ssmtp_2.62.orig.tar.gz 
    13 55e3eb8fd1395d59b6da0b53839c865b  syslinux-3.82.tar.bz2 
     1378f2f111e052f1553e8530df8d72d027  syslinux-3.82.tar.bz2 

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

    r585 r591  
    102102        fi 
    103103 
    104   if [ -e /etc/default/bittorrent ]; then 
    105    # add bittorrent user if not present 
    106    if ! id bittorrent &> /dev/null; then 
    107     useradd -c "BitTorrent User" -d /var/lib/bittorrent -g nogroup -r bittorrent 
    108     dpkg-statoverride --add bittorrent nogroup 755 /var/lib/bittorrent 
    109     dpkg-statoverride --add bittorrent nogroup 755 /var/log/bittorrent 
    110    fi 
    111    chown bittorrent:nogroup /var/lib/bittorrent -R 
    112    chown bittorrent:nogroup /var/log/bittorrent -R 
    113    # setting needed options in /etc/default/bittorrent 
     104  # add bittorrent user if not present 
     105  if ! id bittorrent &> /dev/null; then 
     106   useradd -c "BitTorrent User" -d /var/lib/bittorrent -g nogroup -r bittorrent 
     107   dpkg-statoverride --add bittorrent nogroup 755 /var/lib/bittorrent 
     108   dpkg-statoverride --add bittorrent nogroup 755 /var/log/bittorrent 
     109  fi 
     110  chown bittorrent:nogroup /var/lib/bittorrent -R 
     111  chown bittorrent:nogroup /var/log/bittorrent -R 
     112 
     113  # provide a bittorrent default file if necessary 
     114  if [ ! -s /etc/default/bittorrent -a -s /usr/share/doc/bittorrent/examples/bittorrent.default ]; then 
     115   cp /usr/share/doc/bittorrent/examples/bittorrent.default /etc/default/bittorrent 
     116  fi 
     117 
     118  # provide a bittorrent init script if necessary 
     119  if [ ! -s /etc/init.d/bittorrent -a -s /usr/share/doc/bittorrent/examples/bittorrent.init ]; then 
     120   cp /usr/share/doc/bittorrent/examples/bittorrent.init /etc/init.d/bittorrent 
     121   chmod 755 /etc/init.d/bittorrent 
     122   update-rc.d bittorrent defaults 
     123  fi 
     124 
     125  # setting needed options in /etc/default/bittorrent 
     126  if [ -s /etc/default/bittorrent ]; then 
    114127   if ! grep -q ^REANNOUNCE_INTERVAL /etc/default/bittorrent; then 
    115128    echo "Adding REANNOUNCE_INTERVAL=15 to /etc/default/bittorrent." 
    … …  
    149162    sed -e 's|/var/log/linuxmuster/linbo/|/var/log/bittorrent/|' /etc/logrotate.d/linuxmuster-linbo > /etc/logrotate.d/bittorrent 
    150163   fi 
    151   fi 
     164  fi # /etc/default/bittorrent 
    152165 
    153166  # change owner of logdir to nobody 
    … …  
    157170  # create dropbear ssh keys 
    158171  if [ ! -s "$SYSCONFDIR/linbo/ssh_host_rsa_key" ]; then 
    159    echo -e "$SYSCONFDIR/linbo/ssh_host_rsa_key\n\n\n" | ssh-keygen -t rsa 
     172   echo -e "$SYSCONFDIR/linbo/ssh_host_rsa_key\n\n\n\n\n" | ssh-keygen -t rsa 
    160173   /usr/lib/dropbear/dropbearconvert openssh dropbear $SYSCONFDIR/linbo/ssh_host_rsa_key $SYSCONFDIR/linbo/dropbear_rsa_host_key 
    161174  fi 
    162175  if [ ! -s "$SYSCONFDIR/linbo/ssh_host_dsa_key" ]; then 
    163    echo -e "$SYSCONFDIR/linbo/ssh_host_dsa_key\n\n\n" | ssh-keygen -t dsa 
     176   echo -e "$SYSCONFDIR/linbo/ssh_host_dsa_key\n\n\n\n\n" | ssh-keygen -t dsa 
    164177   /usr/lib/dropbear/dropbearconvert openssh dropbear $SYSCONFDIR/linbo/ssh_host_dsa_key $SYSCONFDIR/linbo/dropbear_dss_host_key 
    165178  fi 

  • main/linuxmuster-linbo/branches/testing/debian/rules

    r585 r591  
    6161NTFS3G_ARCHIVE=$(shell grep ntfs-3g- debian/md5sums.src | awk '{ print $$2 }') 
    6262NTFS3G_DIR=src/$(shell echo $(NTFS3G_ARCHIVE) | sed -e 's/.tgz//') 
    63 #NTFS3G_URL=http://www.ntfs-3g.org 
    64 NTFS3G_URL=$(LML_URL) 
     63NTFS3G_URL=http://tuxera.com/opensource 
    6564 
    6665# ntfsprogs 
    … …  
    290289        -@if [ ! -e $(NTFS3G_DIR)/src/.libs/ntfs-3g ]; then \ 
    291290                echo "[1mBuilding ntfs-3g...[0m" ; \ 
    292                 ( cd $(NTFS3G_DIR) && ./configure --enable-static --enable-posix-acls && make && strip src/.libs/secaudit && strip src/.libs/ntfs-3g && strip libntfs-3g/.libs/libntfs-3g.so.4917.0.0 ); \ 
     291                ( cd $(NTFS3G_DIR) && ./configure --enable-static --enable-posix-acls && make && strip src/.libs/ntfs-3g.secaudit && strip src/.libs/ntfs-3g && strip libntfs-3g/.libs/libntfs-3g.so.73.0.0 ); \ 
    293292        fi 
    294293 
    … …  
    305304        fi 
    306305 
    307         # syslinux (already built on etch) 
     306        # syslinux (already built on lenny) 
    308307#       -@if [ ! -e $(SYSLINUX_DIR)/gpxe/src/bin/gpxe.lkrn ]; then \ 
    309308#               echo "[1mBuilding syslinux...[0m" ; \ 

  • main/linuxmuster-linbo/branches/testing/linbo/linbo_cmd.sh

    r585 r591  
    768768      echo "Starte Kompression von $2 -> $3 (differentiell)." | tee -a /tmp/image.log 
    769769      mkexclude 
    770       # rsync mit acl und xattr Optionen 
    771       local ROPTS="-HazAX" 
    772       #local ROPTS="-az" 
    773       [ "$(fstype "$2")" = "vfat" ] && ROPTS="-rtz" 
    774       # tschmitt: logging 
    775       #rm -f "$TMP" 
    776       #interruptible rsync "$ROPTS" --exclude="/.linbo" --exclude-from="/tmp/rsync.exclude" --delete --delete-excluded --partial --only-write-batch="$3" /mnt/ /cloop 
    777       #interruptible rsync "$ROPTS" --fake-super --exclude="/.linbo" --exclude-from="/tmp/rsync.exclude" --delete --delete-excluded --partial --log-file=/tmp/image.log --log-file-format="" --only-write-batch="$3" /mnt/ /cloop 2>&1 >>/tmp/image.log 
     770      # determine rsync opts due to fstype 
     771      local type="$(fstype "$2")" 
     772      case $type in 
     773       ntfs) ROPTS="-HazAX" ;; 
     774       vfat) ROPTS="-rtz" ;; 
     775       *) ROPTS="-az" ;; 
     776      esac 
    778777      interruptible rsync "$ROPTS" --exclude="/.linbo" --exclude-from="/tmp/rsync.exclude" --delete --delete-excluded --log-file=/tmp/image.log --log-file-format="" --only-write-batch="$3" /mnt/ /cloop 2>&1 >>/tmp/image.log 
    779778      RC="$?" 

  • main/linuxmuster-linbo/branches/testing/linbo/linbo_wrapper.sh

    r585 r591  
    438438  reboot) /sbin/reboot ;; 
    439439 
    440   halt|poweroff) /sbin/poweroff ;; 
     440  halt|poweroff) /sbin/halt ;; 
    441441 
    442442 esac 

  • main/linuxmuster-linbo/branches/testing/share/make-linbo-media.sh

    r585 r591  
    2424        echo " -b                      create debug menu entries" 
    2525        echo " -c                      create cdrom media, has to be used with -d or -i" 
    26         echo " -d <device>             writes directly to device (optional), cann be used with -c or -u" 
    27         echo " -g <group1,group2,...>  list of hostgroups to build for (optional, default: default)" 
     26        echo " -d <device>             writes directly to device (optional), can be used" 
     27        echo "                         with -c or -u" 
     28        echo " -g <group1,group2,...>  list of hostgroups to build for, optional," 
     29        echo "                         if -g is not given, default group is used." 
    2830        echo " -i <output dir>         creates cdrom iso in output dir" 
     31 echo " -n                      no strict checking for linbo ssh server, allows" 
     32 echo "                         password based logins, needs -p for root pw, optional" 
     33 echo " -p <password>           sets local linbo admin password, is also used for" 
     34 echo "                         root ssh login if password logins are allowed, optional" 
     35 echo " -r                      remove server root's public ssh key" 
    2936        echo " -u                      create usb media, has to be used with -d or -z" 
    30         echo " -z <output dir>         creates zip archive with usb boot media files in output dir" 
     37        echo " -z <output dir>         creates zip archive with usb boot media files in" 
     38        echo "                         output dir" 
    3139        echo 
    3240        echo " Examples:" 
    3341        echo 
    3442        echo " `basename $0` -c -i /home/administrators/administrator" 
    35         echo "               writes a cdrom iso image for default group to administrator's home" 
     43        echo "    writes a cdrom iso image for default group to administrator's home" 
    3644        echo 
    3745        echo " `basename $0` -c -i /var/linbo -g room123" 
    38         echo "               writes a cdrom iso image for computer group room123 to /var/linbo" 
     46        echo "    writes a cdrom iso image for computer group room123 to /var/linbo" 
    3947        echo 
    4048        echo " `basename $0` -c -d /dev/cdrom" 
    41         echo "               burns a cdrom directly to device /dev/cdrom" 
     49        echo "    burns a cdrom directly to device /dev/cdrom" 
    4250        echo 
    4351        echo " `basename $0` -u -g room123,default -d /dev/sdc" 
    44         echo "               writes a bootable usb media to /dev/sdc for groups room123 and default" 
     52        echo "    writes a bootable usb media to /dev/sdc for groups room123 and default" 
    4553        echo 
    4654        echo " `basename $0` -u -z /home/teachers/zell" 
    47         echo "               writes a zip archive with usb boot media files for default group to teacher zell's home" 
     55        echo "    writes a zip archive with usb boot media files for default group to" 
     56        echo "    teacher zell's home" 
    4857        exit 1 
    4958} 
    … …  
    5160 
    5261# process cmdline 
    53 while getopts ":bcd:g:hi:uz:" opt; do 
     62while getopts ":bcd:g:hi:np:ruz:" opt; do 
    5463 case $opt in 
    5564  b) DEBUG=yes ;; 
    … …  
    7180            OUTDIR=$OPTARG 
    7281     [ -z "$OPTARG" ] && OUTDIR=`pwd` ;; 
     82  n) NOSTRICT=yes ;; 
     83  p) PASSWORD=$OPTARG ;; 
     84  r) REMKEY=yes ;; 
    7385  u) USB=yes 
    7486     [ -n "$CDROM" ] && usage 
    … …  
    89101[ -z "$CDROM" -a -z "$USB" ] && usage 
    90102[ -z "$DEVICE" -a -z "$ISO" -a -z "$ZIP" ] && usage 
     103[ -n "$NOSTRICT" -a -z "$PASSWORD" ] && usage 
    91104if [ -n "$ZIP" -o -n "$ISO" ]; then 
    92105        if [ ! -d "$OUTDIR" ]; then 
    … …  
    146159LINBOFS=linbofs.gz 
    147160 
     161# determine linbo append params from group's pxe configfile 
     162get_append_line() { 
     163 append_linbo="" 
     164 append_debug="" 
     165 local params="" 
     166 local line="" 
     167 local opt="" 
     168 local val="" 
     169 local j="" 
     170 local found=false 
     171 local cfg=$LINBODIR/pxelinux.cfg/$i 
     172 if [ -e "$cfg" ]; then 
     173  while read line; do 
     174   opt="$(echo $line | tr A-Z a-z | awk '{ print $1 }')" 
     175   val="$(echo $line | tr A-Z a-z | awk '{ print $2 }')" 
     176   [ "$opt" = "kernel" -a "$val" = "linbo" ] && found=true 
     177   if [ "$found" = "true" -a "$opt" = "append" ]; then 
     178    for j in $line; do 
     179     case $j in 
     180      [Aa][Pp][Pp][Ee][Nn][Dd]|[Ii][Nn][Ii][Tt][Rr][Dd]*|[Qq][Uu][Ii][Ee][Tt]|[Dd][Ee][Bb][Uu][Gg]) ;; 
     181      *) if [ -z "$params" ]; then params="$j"; else params="$params $j"; fi ;; 
     182     esac 
     183    done 
     184    break 
     185   fi 
     186  done <$cfg 
     187 fi 
     188 [ "$found" = "false" ] && echo "Warning: KERNEL linbo not found in pxe config for group $i, using default values." 
     189 if [ -z "$params" ]; then 
     190  params="vga=788" 
     191  [ "$found" = "true" ] && echo "Warning: No LINBO parameters found in pxe config for group $i, using default values." 
     192 fi 
     193 append_linbo="APPEND initrd=/$i/linbofs.gz $params quiet" 
     194 append_debug="APPEND initrd=/$i/linbofs.gz $params debug" 
     195 echo "LINBO parameters for $i: $params" 
     196} 
     197 
    148198# write sys/isolinux config file 
    149199writecfg() { 
    … …  
    154204                local sysdir=/$2 
    155205        fi 
    156         local append1 
    157         local append2 
    158206        local RC=1 
    159   echo "DEFAULT $sysdir/vesamenu.c32 
     207 echo "DEFAULT $sysdir/vesamenu.c32 
    160208KBDMAP $sysdir/german.kbd 
    161209PROMPT 0 
    … …  
    172220        for i in $GRPS_CHECKED; do 
    173221 
    174                 append1=`grep ^APPEND $LINBODIR/pxelinux.cfg/$i | grep linbofs.gz | grep -vw debug | tail -1 | sed -e "s|linbofs.gz|/linbofs.$i.gz|"` 
    175         append2=`grep ^APPEND $LINBODIR/pxelinux.cfg/$i | grep linbofs.gz | grep -w debug | tail -1 | sed -e "s|linbofs.gz|/linbofs.$i.gz|"` 
     222  get_append_line 
    176223 
    177224                echo "LABEL menu$m 
    178225MENU LABEL ^$m. LINBO: $i 
    179226KERNEL /linbo 
    180 $append1 
     227$append_linbo 
    181228" >> $outfile 
    182229 
    … …  
    185232MENU LABEL ^$(($m +1)). LINBO: $i (debug) 
    186233KERNEL /linbo 
    187 $append2 
     234$append_debug 
    188235" >> $outfile 
    189236                        m=$(($m +1)) 
    … …  
    215262 cd $TMPDIR 
    216263 zcat $LINBODIR/$LINBOFS | cpio -i -d -H newc --no-absolute-filenames &> /dev/null || exit 1 
     264 # change passwords 
     265 if [ -n "$PASSWORD" ]; then 
     266  # root password 
     267  echo "/bin/echo root:$PASSWORD | /usr/sbin/chpasswd" > passwd.sh 
     268  chroot $TMPDIR /bin/sh /passwd.sh 
     269  rm passwd.sh 
     270        # md5sum of linbo password 
     271        local linbo_md5passwd=`echo -n $PASSWORD | md5sum | awk '{ print $1 }'` 
     272  echo -n "$linbo_md5passwd" > etc/linbo_passwd 
     273        echo "Local password for LINBO admin changed" 
     274 fi 
     275 # change dropbear options 
     276 if [ "$NOSTRICT" = "yes" ]; then 
     277  echo "Allowing password based ssh logins." 
     278  sed -e 's|^/sbin/dropbear .*|/sbin/dropbear -E -p 2222|' -i init.sh 
     279 fi 
     280 # remove server root's public ssh key 
     281 if [ "$REMKEY" = "yes" ]; then 
     282  echo "Removing authorized_keys." 
     283  rm -f .ssh/authorized_keys 
     284 fi 
    217285        for g in $GRPS_CHECKED; do 
    218286  echo -n "Creating linbofs.gz for group $g ... " 
    … …  
    223291  fi 
    224292  # pack linbofs.gz 
    225          find . | cpio --quiet -o -H newc | gzip -9c > $MNTPNT/linbofs.$g.gz ; RC="$?" || exit 1 
     293  mkdir -p $MNTPNT/$g 
     294         find . | cpio --quiet -o -H newc | gzip -9c > $MNTPNT/$g/linbofs.gz ; RC="$?" || exit 1 
    226295  echo "Ok!" 
    227296 done 
Note: See TracChangeset for help on using the changeset viewer.