summaryrefslogtreecommitdiffstats
path: root/initrd/distro-specs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2006-05-18 19:07:30 +0200
committerDirk von Suchodoletz2006-05-18 19:07:30 +0200
commit6d40cb3981a1243ff64242ecc0573cff21931d29 (patch)
tree9e6bc30332298961126a6e73689d079d8d821616 /initrd/distro-specs
parentMoved autofs configuration to servconfig, try to load modules for usb (diff)
downloadcore-6d40cb3981a1243ff64242ecc0573cff21931d29.tar.gz
core-6d40cb3981a1243ff64242ecc0573cff21931d29.tar.xz
core-6d40cb3981a1243ff64242ecc0573cff21931d29.zip
fixed autofs bug ...
git-svn-id: http://svn.openslx.org/svn/openslx/ld4@218 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd/distro-specs')
-rw-r--r--initrd/distro-specs/suse/functions-9.345
1 files changed, 27 insertions, 18 deletions
diff --git a/initrd/distro-specs/suse/functions-9.3 b/initrd/distro-specs/suse/functions-9.3
index 5a81848c..bd893ae4 100644
--- a/initrd/distro-specs/suse/functions-9.3
+++ b/initrd/distro-specs/suse/functions-9.3
@@ -415,9 +415,14 @@ fi
config_automount () {
if [ -f /mnt/etc/${D_SYSCONFDIR}/autofs ] ; then
testmkd /var/lock/subsys
+ echo -e "# /etc/${D_SYSCONFDIR}/autofs - file modified by\n#\t$0:\n#" \
+ > /etc/autofs
+ sed -e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
+ /mnt/etc/${D_SYSCONFDIR}/autofs >> /etc/autofs
+ cp /etc/autofs /mnt/etc/${D_SYSCONFDIR}/autofs
rllinker "autofs" "18" "04"
else
- error "$df_erramt"
+ error "$df_erramt" nonfatal
fi
}
# start name service caching daemon
@@ -426,7 +431,7 @@ if [ -f /mnt/etc/${D_INITDIR}/nscd ] ; then
testmkd /mnt/var/run/nscd
rllinker "nscd" "02" "16"
else
- error "$df_errnsc"
+ error "$df_errnsc" nonfatal
fi
}
@@ -440,29 +445,33 @@ config_nis () {
if [ -f /mnt/etc/${D_INITDIR}/ypbind ] ; then
rllinker "ypbind" "06" "16"
else
- error "$df_erryp"
+ error "$df_erryp" nonfatal
fi
}
# start vmware
config_vmware () {
-rllinker "vmware-prep" "18" "02"
-rllinker "vmware" "20" "02"
-# if running start scripts in parallel vmware-prep is not recognized
-# first solution: just avoid running in parallel
-#sed 's/PARALLEL=.*/PARALLEL=no/' /mnt/etc/${D_SYSCONFDIR}/boot \
-# > /tmp/boot
-#cp /tmp/boot /mnt/etc/${D_SYSCONFDIR}/boot
-# second solution: vmware-prep script should be added to .depends.start
-sed -e "s,TARGETS =,TARGETS = vmware-prep," \
- /mnt/etc/${D_INITDIR}/.depend.start >> /etc/.depend.start
+if [ -f /mnt/etc/${D_SYSCONFDIR}/vmware ] ; then
+ rllinker "vmware-prep" "18" "02"
+ rllinker "vmware" "20" "02"
+ # if running start scripts in parallel vmware-prep is not recognized
+ # first solution: just avoid running in parallel
+ #sed 's/PARALLEL=.*/PARALLEL=no/' /mnt/etc/${D_SYSCONFDIR}/boot \
+ # > /tmp/boot
+ #cp /tmp/boot /mnt/etc/${D_SYSCONFDIR}/boot
+ # second solution: vmware-prep script should be added to .depends.start
+ sed -e "s,TARGETS =,TARGETS = vmware-prep," \
+ /mnt/etc/${D_INITDIR}/.depend.start >> /etc/.depend.start
echo "vmware-prep: " >> /etc/.depend.start
cp /etc/.depend.start /mnt/etc/${D_INITDIR}/.depend.start
-# this line should be added to /etc/hotplug.d/usb/50-usb.hotplug
-# to block linux from handling usb events during vmware sessions
-sed -e '/USB-specific/{;i\' \
- -e 'ps aux |grep -i vmware| grep -v "grep" &>/dev/null && exit 0' \
- -e ' }' -i /mnt/etc/hotplug.d/usb/50-usb.hotplug
+ # this line should be added to /etc/hotplug.d/usb/50-usb.hotplug
+ # to block linux from handling usb events during vmware sessions
+ sed -e '/USB-specific/{;i\' \
+ -e 'ps aux |grep -i vmware| grep -v "grep" &>/dev/null && exit 0' \
+ -e ' }' -i /mnt/etc/hotplug.d/usb/50-usb.hotplug
+else
+ error "df_errvmw" nonfatal
+fi
}
# initialize runlevel skript to be executed during system startup