diff options
| author | Dirk von Suchodoletz | 2009-09-10 19:41:47 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-09-10 19:41:47 +0200 |
| commit | 0a4a9e2fb7db1b0215abcd674cd863049ac7ca93 (patch) | |
| tree | fb73c272e4cb260894ec4e24b4df25df25de0c7f /initramfs | |
| parent | Updating to newer Scientific Linux version as no much was done in 5.1 (diff) | |
| download | core-0a4a9e2fb7db1b0215abcd674cd863049ac7ca93.tar.gz core-0a4a9e2fb7db1b0215abcd674cd863049ac7ca93.tar.xz core-0a4a9e2fb7db1b0215abcd674cd863049ac7ca93.zip | |
Allowing subdirectories as automount target.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3151 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rwxr-xr-x | initramfs/stage3-stuff/bin/servconfig | 3 | ||||
| -rw-r--r-- | initramfs/stage3-stuff/etc/messages | 3 | ||||
| -rw-r--r-- | initramfs/stage3-stuff/etc/messages.de | 3 |
3 files changed, 1 insertions, 8 deletions
diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig index c88c58ce..b0142001 100755 --- a/initramfs/stage3-stuff/bin/servconfig +++ b/initramfs/stage3-stuff/bin/servconfig @@ -184,14 +184,13 @@ auto.master." >/mnt/etc/auto.misc automnt_dir=${automnt_dir#/} automnt_dir=${automnt_dir%/} test -d /${automnt_dir} || error "$scfg_erradir" nonfatal - strinstr "/" ${automnt_dir} && error "$scfg_erratpld" nonfatal amserv=$(uri_token $automnt_src server) ampath=$(uri_token $automnt_src path) amdirn=$(echo ${automnt_dir}|sed "s,/,_,g") echo -e "/${automnt_dir}\t/etc/auto.${amdirn}\n" \ >> /mnt/etc/auto.master echo -e "# /etc/auto.${amdirn} created by $0:\n" \ - > /mnt/etc/auto.${automnt_dir} + > /mnt/etc/auto.${amdirn} echo -e "*\t-rsize=32768,wsize=32768,rw\t${amserv}:${ampath}/&" \ >> /mnt/etc/auto.${amdirn} # no tempfs needed if automounter operates on /home diff --git a/initramfs/stage3-stuff/etc/messages b/initramfs/stage3-stuff/etc/messages index 3535f5a5..c72008e9 100644 --- a/initramfs/stage3-stuff/etc/messages +++ b/initramfs/stage3-stuff/etc/messages @@ -182,9 +182,6 @@ scfg_vmchs=" The virtual machines lister/chooser is not available from \ scfg_erradir=" Only one directory level is allowed to hook up automounter \ to and the\n directory should exist (on the servers export) or should be \ creatable\n (e.g. because of UnionFS writeable root directory)." -scfg_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." scfg_country=" No configuration for localization found in config file. \ Using default\n country setting '${D_DEFAULTCOUNTRY}' defined in $0." diff --git a/initramfs/stage3-stuff/etc/messages.de b/initramfs/stage3-stuff/etc/messages.de index a8ee76bf..1fcf9743 100644 --- a/initramfs/stage3-stuff/etc/messages.de +++ b/initramfs/stage3-stuff/etc/messages.de @@ -192,9 +192,6 @@ scfg_erradir=" Es wird nur eine Verzeichnis-Ebene erlaubt, den Automounter \ zu installieren und das\n Verzeichnis sollte existieren (auf dem \ Server-Export) oder sollte anlegbar sein\n (z.B. durch UnionFS beschreibbares \ Wurzel-Verzeichnis)." -scfg_erratpld=" Nur Verzeichnisse hoechster Ebene \ -als Einhaenge-Punkte fuer home\n Verzeichnisse. Bitte setzen Sie die \ -Variable \${automnt_dir} entsprechend in\n der machine-setup Datei." scfg_country=" Keine Konfiguration fuer die Lokalisierung gefunden in der \ Konfigurations-Datei. Benutzer\n Standard Laender-Einstellung \ '${D_DEFAULTCOUNTRY}' definiert in $0." |