diff options
author | Michael Janczyk | 2007-01-10 19:49:14 +0100 |
---|---|---|
committer | Michael Janczyk | 2007-01-10 19:49:14 +0100 |
commit | 28180ec35880ff148174afa5d2aff0fbb507f315 (patch) | |
tree | 1501a2e5e131f035c3ad38f10556a1e618d4b611 /initramfs | |
parent | Busybox is now properly named for the two supported architectures: i386 (diff) | |
download | core-28180ec35880ff148174afa5d2aff0fbb507f315.tar.gz core-28180ec35880ff148174afa5d2aff0fbb507f315.tar.xz core-28180ec35880ff148174afa5d2aff0fbb507f315.zip |
runvamwre: path variable added and floppy image ranamed.
nvram: now with 'winterzeit'
dhcpmkconfig: DEBUGLEVEL unset, so that the DEBUGLEVEL doesn't change for no
reason during boot
servconfig: sed expression changed to work with busybox
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@610 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
-rwxr-xr-x | initramfs/initrd-stuff/bin/dhcpmkconfig | 5 | ||||
-rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 23 |
2 files changed, 19 insertions, 9 deletions
diff --git a/initramfs/initrd-stuff/bin/dhcpmkconfig b/initramfs/initrd-stuff/bin/dhcpmkconfig index 86fd42c7..0fd7583a 100755 --- a/initramfs/initrd-stuff/bin/dhcpmkconfig +++ b/initramfs/initrd-stuff/bin/dhcpmkconfig @@ -4,9 +4,10 @@ # clients used within OpenSLX initramfs. The result is written in unified # form to the /etc/machine-setup file # -# Dirk von Suchodoletz <dvs@OpenSLX.com>, 15-12-2006 +# Dirk von Suchodoletz <dvs@OpenSLX.com>, 09-01-2007 # Lars Mueller, 23-06-2006 # Oliver Tappe, 23-06-2006 +# Michael Janczyk, 09-01-2007 # # (c) 2006 - RZ Universitaet Freiburg @@ -57,12 +58,14 @@ enabled via kernel command\n# line)." >>$cfgfile dhcl="udhcpc"; echo -e "$cfgmsg\n$infomsg" >>$cfgfile # if $cfgfile is changed change target for set output accordingly unset infomsg HOME IFS mask lease interface cfgmsg cfgfile + unset DEBUGLEVEL set | sed \ -e "s,^P.*,,;s,ntpsrv,ntp_servers,;s,ip,clientip," \ -e "s,serverid,serverip,;s,subnet,subnet_mask," \ -e "s,router,gateway,;s,hostname,host_name," \ -e "s,domain,domain_name,;s,dns,domain_name_servers," \ -e "s,broadcast,broadcast_address,;s,dhc.*,,;/^$/d" \ + -e "/OPTIND.*/d" \ >>/tmp/confviadhcp ;; esac diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 207adc5b..9155a2de 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -5,7 +5,7 @@ # system is setup when servconfig starts # # Dirk von Suchodoletz <dvs@OpenSLX.com>, 14-12-2006 -# Michael Janczyk <mj0@uni-freiburg.de>, 10-11-2006 +# Michael Janczyk <mj0@uni-freiburg.de>, 10-01-2007 # Lars Mueller <lm@OpenSLX.com>, 23-06-2006 # Oliver Tappe <ot@OpenSLX.com>, 23-06-2006 # @@ -330,19 +330,26 @@ Type=Application" >/mnt/etc/X11/sessions/default.desktop sessions=$(ls /mnt/var/lib/vmware/vmsessions/*.desktop 2>/dev/null) # fixme: the following part is to be tested!! if [ -n "${sessions}" ]; then + vmsessionsnr=0 + xdmsessionsnr=0 for i in /mnt/var/lib/vmware/vmsessions/*.desktop; do # only link if in right slxgrp - slxgrpstr=$(cat ${i} | sed -e "s/.*/\L&/" | sed -n "/^slxgrp/p" \ - | sed -e "s/slxgrp=/ /;s/$/ /") + slxgrpstr=$(sed \ + 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;/slxgrp=/!d' ${i} \ + | sed '$!d;s/slxgrp=//') slxgrptest="false" - if strinstr " ${slxgrp} " "${slxgrpstr}"; then slxgrptest="true"; fi - xdmshow=$(cat ${i}|sed -e "s/.*/\L&/" | sed -n "/^xdm/p"\ - |sed -e "s,xdm=,,") + # FIXME: maybe logfile sometime ;) + #echo "=${slxgrpstr}=" + if strinstr " ${slxgrp} " " ${slxgrpstr} "; then slxgrptest="true"; fi + xdmshow=$(sed \ + 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;/xdm=/!d' ${i} \ + | sed -e '$!d;s/xdm=//') if [ -z "${slxgrp}" -o "${slxgrptest}" = "true" ]; then #session_name=$(cat ${i} | grep -iw "exec" \ # | awk -F "=" '{print $2}') - session_name=$(cat ${i} | sed -e "s/.*/\L&/" \ - | sed -n "/^exec/p"|sed -e "s,exec=,,") + session_name=$(sed \ + 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/;/^exec=/!d' ${i} \ + | sed '$!d;s/exec=//') # create session links so that they con be startet via xdm cd /mnt/var/X11R6/bin ln -s desktop-session ${session_name} |