diff options
| author | Dirk von Suchodoletz | 2007-06-01 16:46:39 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2007-06-01 16:46:39 +0200 |
| commit | da68865159eb1fcb68c1722d50d50e323227aff0 (patch) | |
| tree | d7f693342d750760ff6fa2354ad63bce35c5003e /initramfs/distro-specs | |
| parent | Extended blacklist (slamr modem driver is not needed in any case :-)) (diff) | |
| download | core-da68865159eb1fcb68c1722d50d50e323227aff0.tar.gz core-da68865159eb1fcb68c1722d50d50e323227aff0.tar.xz core-da68865159eb1fcb68c1722d50d50e323227aff0.zip | |
Cleanup for ntp settings (initial setup is distro independent), cleanup
for (W)LAN interface stuff in slx init.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1129 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs')
| -rw-r--r-- | initramfs/distro-specs/gentoo/functions-default | 7 | ||||
| -rw-r--r-- | initramfs/distro-specs/suse/functions-default | 7 | ||||
| -rw-r--r-- | initramfs/distro-specs/ubuntu/functions-default | 13 |
3 files changed, 5 insertions, 22 deletions
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default index 9a87fad9..0c1d9f1a 100644 --- a/initramfs/distro-specs/gentoo/functions-default +++ b/initramfs/distro-specs/gentoo/functions-default @@ -167,12 +167,7 @@ if [ -e /mnt/etc/${D_INITDIR}/ntp ] ; then echo -e "ntp:!:13099:0:99999:7:::" >>/mnt/etc/shadow fi testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null - if [ "x$start_ntp" = "xinitial" ] ; then - echo -e "\t# entries added by $0 (InitRamFS from $date)\n\ -\t( ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 && {\n\t which \ -hwclock &>/dev/null && hwclock -w;} ) &" \ - >>/mnt/etc/${D_INITDIR}/boot.slx - elif [ "x$start_ntp" = "xyes" ] ; then + if [ "x$start_ntp" = "xyes" ] ; then rllinker "ntp" fi fi diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index 7dd42440..b241a8c5 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -84,12 +84,7 @@ if [ -e /mnt/etc/${D_INITDIR}/ntp ] ; then echo -e "ntp:!:13099:0:99999:7:::" >>/mnt/etc/shadow fi testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null - if [ "x$start_ntp" = "xinitial" ] ; then - echo -e "\t# entries added by $0 (InitRamFS from $date)\n\ -\t( ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 && {\n\t which \ -hwclock &>/dev/null && hwclock -w;} ) &" \ - >>/mnt/etc/${D_INITDIR}/boot.slx - elif [ "x$start_ntp" = "xyes" ] ; then + if [ "x$start_ntp" = "xyes" ] ; then rllinker "ntp" "07" "14" fi fi diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default index 9364376f..8e4809ec 100644 --- a/initramfs/distro-specs/ubuntu/functions-default +++ b/initramfs/distro-specs/ubuntu/functions-default @@ -92,18 +92,11 @@ done config_ntp () { local start=07 local stop=14 -if [ -f /mnt/etc/init.d/ntp ] ; then +if [ -f /mnt/etc/init.d/ntp -a "x$start_ntp" != "xno" ] ; then echo -e "ntp:x:74:65534:NTP daemon:/var/lib/ntp:/bin/false" \ >>/mnt/etc/passwd - testmkd /mnt/var/lib/ntp/var/run/ntp &>/dev/null - if [ "x$start_ntp" = "xinitial" ] ; then - echo -e "# entry added by $0: $date" \ - >>/mnt/etc/${D_INITDIR}/boot.slx - echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \ - >>/mnt/etc/${D_INITDIR}/boot.slx - else - rllinker "ntp" "$start" "$stop" - fi + testmkd /mnt/var/lib/ntp/var/run/ntp + rllinker "ntp" "$start" "$stop" fi } |