summaryrefslogtreecommitdiffstats
path: root/initrd
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-05-18 11:43:10 +0200
committerDirk von Suchodoletz2006-05-18 11:43:10 +0200
commitbbc227c6eee72cf59322e93630b002e1ca141dda (patch)
tree25431334383bf7c6c0ee7b5d73db72d3194bfae5 /initrd
parentProblems with automounter corrected (hopefully), to be checked ... (diff)
downloadcore-bbc227c6eee72cf59322e93630b002e1ca141dda.tar.gz
core-bbc227c6eee72cf59322e93630b002e1ca141dda.tar.xz
core-bbc227c6eee72cf59322e93630b002e1ca141dda.zip
Forgot to add automounter to other distros too (at least stub) ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@216 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
-rw-r--r--initrd/distro-specs/debian/functions-3.17
-rw-r--r--initrd/distro-specs/suse/functions-9.32
-rw-r--r--initrd/distro-specs/ubuntu/functions-5.107
3 files changed, 14 insertions, 2 deletions
diff --git a/initrd/distro-specs/debian/functions-3.1 b/initrd/distro-specs/debian/functions-3.1
index a0c1a9bb..9291bafb 100644
--- a/initrd/distro-specs/debian/functions-3.1
+++ b/initrd/distro-specs/debian/functions-3.1
@@ -2,7 +2,7 @@
# linux diskless clients (executed within initial
# ramdisk after genconfig)
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 30-04-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-05-2006
# Felix Endres, 30-04-2006
#
# Copyright: (c) 2006 - RZ Universitaet Freiburg
@@ -258,6 +258,11 @@ if [ "x$start_dreshal" = "xyes" ]; then
fi
}
+# configure automounter
+config_automount () {
+ :
+}
+
# start name service caching daemon
config_nscd () {
:
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 9955634c..67106f6e 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -425,6 +425,8 @@ if [ -f /mnt/etc/${D_SYSCONFDIR}/autofs ] ; then
# remove leading and trailing slash
automnt_dir=${automnt_dir#/}
automnt_dir=${automnt_dir%/}
+ test -d ${automnt_dir} || error "df_erradir"
+ strinstr "/" ${automnt_dir} || error "df_erratpld"
echo -e "/${automnt_dir}\t/etc/auto.${automnt_dir}\n" \
>> /mnt/etc/auto.master
echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index c4b95bcd..e3327da0 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -2,7 +2,7 @@
# linux diskless clients (executed within initial
# ramdisk after genconfig)
#
-# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 28-04-2006
+# Author(s): Dirk von Suchodoletz <dirk@goe.net>, 18-05-2006
# Nico Dietrich
# Felix Endres
#
@@ -197,6 +197,11 @@ if [ "x$start_dreshal" = "xyes" ]; then
fi
}
+# configure automounter
+config_automount () {
+:
+}
+
# configure bluetooth services
config_bt () {
: