diff options
| author | Dirk von Suchodoletz | 2009-09-10 17:07:20 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-09-10 17:07:20 +0200 |
| commit | 9ecd7e9591b83e09b75025dd663a07127a672ba3 (patch) | |
| tree | 1f6cea4a548925ec82a54d70fdd2f282011df084 /initramfs | |
| parent | Plugin to include pvs stuff more formally (do not use it yet!) ... (diff) | |
| download | core-9ecd7e9591b83e09b75025dd663a07127a672ba3.tar.gz core-9ecd7e9591b83e09b75025dd663a07127a672ba3.tar.xz core-9ecd7e9591b83e09b75025dd663a07127a672ba3.zip | |
Fix, should allow "/" in automnt_dir variable. Fixing call of ntpd for
Scientific Linux.
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@3149 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs')
| -rw-r--r-- | initramfs/distro-specs/scilin/functions-5.3 (renamed from initramfs/distro-specs/scilin/functions-5.1) | 0 | ||||
| -rw-r--r-- | initramfs/distro-specs/scilin/functions-default | 4 | ||||
| -rwxr-xr-x | initramfs/stage3-stuff/bin/servconfig | 7 |
3 files changed, 6 insertions, 5 deletions
diff --git a/initramfs/distro-specs/scilin/functions-5.1 b/initramfs/distro-specs/scilin/functions-5.3 index 6d4c9a40..6d4c9a40 100644 --- a/initramfs/distro-specs/scilin/functions-5.1 +++ b/initramfs/distro-specs/scilin/functions-5.3 diff --git a/initramfs/distro-specs/scilin/functions-default b/initramfs/distro-specs/scilin/functions-default index e650940b..17aca417 100644 --- a/initramfs/distro-specs/scilin/functions-default +++ b/initramfs/distro-specs/scilin/functions-default @@ -105,7 +105,7 @@ done # second stop # function for ntp configuration config_ntp () { -if [ -e /mnt/etc/init.d/ntp ] ; then +if [ -e /mnt/etc/init.d/ntpd ] ; then if ! strinfile "ntp:" /mnt/etc/passwd ; then echo -e "ntp:x:38:38:NTP daemon:/var/lib/ntp:/sbin/nologin" \ >>/mnt/etc/passwd @@ -113,7 +113,7 @@ if [ -e /mnt/etc/init.d/ntp ] ; then fi testmkd /mnt/var/lib/ntp ntp:ntp if [ "x$start_ntp" = "xyes" ] ; then - rllinker "ntp" 7 14 + rllinker "ntpd" 7 14 fi fi } diff --git a/initramfs/stage3-stuff/bin/servconfig b/initramfs/stage3-stuff/bin/servconfig index dcadc70a..c88c58ce 100755 --- a/initramfs/stage3-stuff/bin/servconfig +++ b/initramfs/stage3-stuff/bin/servconfig @@ -187,12 +187,13 @@ auto.master." >/mnt/etc/auto.misc strinstr "/" ${automnt_dir} && error "$scfg_erratpld" nonfatal amserv=$(uri_token $automnt_src server) ampath=$(uri_token $automnt_src path) - echo -e "/${automnt_dir}\t/etc/auto.${automnt_dir}\n" \ + amdirn=$(echo ${automnt_dir}|sed "s,/,_,g") + echo -e "/${automnt_dir}\t/etc/auto.${amdirn}\n" \ >> /mnt/etc/auto.master - echo -e "# /etc/auto.${automnt_dir} created by $0:\n" \ + echo -e "# /etc/auto.${amdirn} created by $0:\n" \ > /mnt/etc/auto.${automnt_dir} echo -e "*\t-rsize=32768,wsize=32768,rw\t${amserv}:${ampath}/&" \ - >> /mnt/etc/auto.${automnt_dir} + >> /mnt/etc/auto.${amdirn} # no tempfs needed if automounter operates on /home [ "${automnt_dir}" = "home" ] && umount -t tmpfs /mnt/home 2>/dev/null # portmapper is needed for remote NFS sources and local nfs directories |