diff options
| author | Oliver Tappe | 2006-08-21 13:37:53 +0200 |
|---|---|---|
| committer | Oliver Tappe | 2006-08-21 13:37:53 +0200 |
| commit | 2cc69c394e140fcac62015286f4ce088c3863bf6 (patch) | |
| tree | 02a6033efa92fb07da9c8cd05582faba958c92b7 /initrd/initrd-stuff/bin/servconfig | |
| parent | uri format for automount and scratch (/tmp via nfs, ...), little fixes, (diff) | |
| download | core-2cc69c394e140fcac62015286f4ce088c3863bf6.tar.gz core-2cc69c394e140fcac62015286f4ce088c3863bf6.tar.xz core-2cc69c394e140fcac62015286f4ce088c3863bf6.zip | |
* replaced all occurrences of 'opendiskless' with 'openslx'
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@320 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index d3bbf8a4..28ae881f 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -2,16 +2,16 @@ # # Description: universal (distro independent) configuration script # for linux diskless clients (executed within initial -# ramdisk) +# ramdisk) # # Author(s): Dirk von Suchodoletz <dirk@goe.net>, 20-08-2006 # Michael Janczyk <mj0>, 31-05-2006 -# Lars Mueller <lm@opendiskless.org>, 23-06-2006 -# Oliver Tappe <ot@opendiskless.org>, 23-06-2006 +# Lars Mueller <lm@openslx.org>, 23-06-2006 +# Oliver Tappe <ot@openslx.org>, 23-06-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg -# (c) 2006 - opendiskless.org project -# +# (c) 2006 - openslx.org project +# # Version: 0.1.2c # check for configuration files to source @@ -59,14 +59,14 @@ echo " ">/mnt/etc/issue ####################################################################### -# read and unify configuration options - default configuration file, +# read and unify configuration options - default configuration file, # from dhcp, ldap ... # wait for the appearance of configuration from several sources cfgcomplete . /etc/machine-setup # copy additional configuration and var files and directories -# admins can place there files in /var/lib/opendiskless/config/... +# admins can place there files in /var/lib/openslx/config/... # to be packed during stage2 into (/srv/dxs)/tftpboot/client-config...) # ... in the near future ... cp -a /rootfs/* /mnt 2>/dev/null @@ -97,7 +97,7 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then esac fi fi - + ####################################################################### # set localization if [ -z "$country" ] ; then @@ -145,13 +145,13 @@ test -n "$domain_name_servers" && { initial_boot ####################################################################### -# +# # run distro specific configuration function config_distro ####################################################################### -# +# # boot.local if [ -n "$bootlocal_script" ]; then echo -e "# entries added by $0:\n#\t$date\n\n\ @@ -164,7 +164,7 @@ fi # at daemon - calling distro specific function config_atd config_atd -# configuration of cron services - calling distro specific function +# configuration of cron services - calling distro specific function # config_cron (runlevel links, directories, ...) config_cron [ "x$crontab_entries" != "x" ] && \ @@ -384,7 +384,7 @@ if [ "x$start_x" != "xno" ] ; then echo -e "# /etc/X11/xdm/Xaccess - file generated by $0: \ $date\n*\n%hostlist\t$x_display_manager\n*\t\tCHOOSER %hostlist"\ >/mnt/etc/X11/xdm/Xaccess - + # define type of X session dsx="no" init="#7:5:respawn:/usr/X11R6/bin/X vt7 -quiet" @@ -430,7 +430,7 @@ $start_x -- vt7 -quiet' -l nobody &>/dev/null\nrm /var/run/kiosk\n\ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \ >/mnt/var/X11R6/bin/kiosk # early start of kiosk session if not late_dm is set - if [ "x$late_dm" != "xyes" ] ; then + if [ "x$late_dm" != "xyes" ] ; then echo -e "\t# kiosk start added by $0\n\t\ /var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.ld fi |