diff options
| author | Dirk von Suchodoletz | 2006-05-18 11:22:34 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-05-18 11:22:34 +0200 |
| commit | 8543b3da7d464e82bfdaf967330a115cc36fafbc (patch) | |
| tree | e0370dce58e40cabe727a145d51a4f634e6d7f8d /initrd | |
| parent | new option -s --start, replaces -o -os and -s --spec (diff) | |
| download | core-8543b3da7d464e82bfdaf967330a115cc36fafbc.tar.gz core-8543b3da7d464e82bfdaf967330a115cc36fafbc.tar.xz core-8543b3da7d464e82bfdaf967330a115cc36fafbc.zip | |
Problems with automounter corrected (hopefully), to be checked ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@215 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
| -rw-r--r-- | initrd/distro-specs/suse/functions-9.3 | 6 | ||||
| -rwxr-xr-x | initrd/initrd-stuff/bin/servconfig | 4 | ||||
| -rw-r--r-- | initrd/initrd-stuff/etc/messages | 6 |
3 files changed, 10 insertions, 6 deletions
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3 index 43139284..9955634c 100644 --- a/initrd/distro-specs/suse/functions-9.3 +++ b/initrd/distro-specs/suse/functions-9.3 @@ -422,9 +422,11 @@ if [ -f /mnt/etc/${D_SYSCONFDIR}/autofs ] ; then if [ -n "${automnt_src}" ] ; then # local directory and home directory server from machine-setup [ -z "${automnt_dir}" ] && automnt_dir="/home" - strinstr "/" "${automnt_dir}" && error "$df_erratpld" nonfatal + # remove leading and trailing slash automnt_dir=${automnt_dir#/} - echo -e "/home\t/etc/auto.${automnt_dir}\n" >> /mnt/etc/auto.master + automnt_dir=${automnt_dir%/} + echo -e "/${automnt_dir}\t/etc/auto.${automnt_dir}\n" \ + >> /mnt/etc/auto.master echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \ > /mnt/etc/auto.${automnt_dir} echo -e "*\t-rsize=32768,wsize=32768,rw\t${automnt_src}/&" \ diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig index 59e4709f..da14ccdc 100755 --- a/initrd/initrd-stuff/bin/servconfig +++ b/initrd/initrd-stuff/bin/servconfig @@ -4,11 +4,11 @@ # for linux diskless clients (executed within initial # ramdisk) # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 19-04-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.1.0b +# Version: 0.1.0c # check for configuration files to source diff --git a/initrd/initrd-stuff/etc/messages b/initrd/initrd-stuff/etc/messages index 17d0c53a..98d8b1b2 100644 --- a/initrd/initrd-stuff/etc/messages +++ b/initrd/initrd-stuff/etc/messages @@ -3,11 +3,11 @@ # version 4 # this file could be used for localization of error messages # -# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 01-05-2006 +# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-05-2006 # # Copyright: (c) 2006 - RZ Universitaet Freiburg # -# Version: 0.0.3d +# Version: 0.0.3e # messages from init init_errmsg="functions file contains a lot of script \ @@ -126,6 +126,8 @@ df_errcron=" The cron start script $df_errserv" df_errsysl=" The syslog start script $df_errserv" df_errsshd=" The sshd start script $df_errserv" df_erramnt=" Automounter $df_errserv" +df_erradir=" Only one directory level is allowed and the directory should \ +exist (on\n the server) or should be creatable (UnionFS)." df_erratpld=" Only toplevel directories \ are allowed as mount points for user home\n directories. Please set the \ variable \${automnt_dir} appropriately in\n machine-setup file." |