diff options
author | Dirk von Suchodoletz | 2007-04-01 20:08:14 +0200 |
---|---|---|
committer | Dirk von Suchodoletz | 2007-04-01 20:08:14 +0200 |
commit | 25460e0599eec760b90164d1ebe438cded167970 (patch) | |
tree | c3512777d080b87ea0bf38cc3b8b2182770171ee /initramfs/distro-specs/suse | |
parent | * moved default values for systems and client into DB-layer (diff) | |
download | core-25460e0599eec760b90164d1ebe438cded167970.tar.gz core-25460e0599eec760b90164d1ebe438cded167970.tar.xz core-25460e0599eec760b90164d1ebe438cded167970.zip |
Renaming of boot.ld to boot.slx to be more naming compliant (and
understandable)
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@848 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/distro-specs/suse')
-rw-r--r-- | initramfs/distro-specs/suse/functions-10.2 | 10 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/functions-9.3 | 4 | ||||
-rw-r--r-- | initramfs/distro-specs/suse/functions-default | 14 |
3 files changed, 14 insertions, 14 deletions
diff --git a/initramfs/distro-specs/suse/functions-10.2 b/initramfs/distro-specs/suse/functions-10.2 index bc8dbff2..4c2d32ff 100644 --- a/initramfs/distro-specs/suse/functions-10.2 +++ b/initramfs/distro-specs/suse/functions-10.2 @@ -81,7 +81,7 @@ if [ "x$start_dreshal" = "xyes" ]; then testmkd /mnt/var/run/dbus # set permissions with userid echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx rllinker "dbus" "$start" "$stop" fi if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then @@ -105,7 +105,7 @@ if [ "x$start_dreshal" = "xyes" ]; then testmkd /mnt/var/run/hal # set permissions with userid echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx start="0"`expr $start + 1` stop="0"`expr $start - 1` rllinker "haldaemon" "$start" "$stop" @@ -124,7 +124,7 @@ if [ "x$start_nfsv4" = "xyes" ]; then nfsd\t\t/proc/fs/nfsd\tnfsd\t\tdefaults\t 0 0" >>/tmp/fstab echo -e "\t# stuff needed for nfsv4\n\tmount -t rpc_pipefs rpc_pipefs \ /var/lib/nfs/rpc_pipefs\n\tmount -t nfsd nfsd /proc/fs/nfsd" \ ->>/mnt/etc/${D_INITDIR}/boot.ld +>>/mnt/etc/${D_INITDIR}/boot.slx # portmap is required for any NFS config_portmap rllinker "idmapd" "14" "08" @@ -172,7 +172,7 @@ sed -e "/wanted keytable/,/^fi$/d;/load usb drivers/,/^esac$/d" \ sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \ -i /mnt/etc/${D_SYSCONFDIR}/keyboard #echo -e "\tloadkeys ${KEYTABLE} >${LOGFILE} 2>&1\n" \ -# >>/mnt/etc/${D_INITDIR}/boot.ld +# >>/mnt/etc/${D_INITDIR}/boot.slx rllinker kbd "01" "20" } @@ -181,7 +181,7 @@ consolefont () { sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \ -i /mnt/etc/${D_SYSCONFDIR}/language #echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \ -# >>/mnt/etc/${D_INITDIR}/boot.ld +# >>/mnt/etc/${D_INITDIR}/boot.slx } # check the glx and tvout stuff and configure it diff --git a/initramfs/distro-specs/suse/functions-9.3 b/initramfs/distro-specs/suse/functions-9.3 index dcc92bab..9e4965db 100644 --- a/initramfs/distro-specs/suse/functions-9.3 +++ b/initramfs/distro-specs/suse/functions-9.3 @@ -44,7 +44,7 @@ if [ "x$start_dreshal" = "xyes" ]; then testmkd /mnt/var/run/dbus # set permissions with userid echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx rllinker "dbus" "$start" "$stop" fi if [ -e /mnt/etc/${D_INITDIR}/resmgr ] ; then @@ -62,7 +62,7 @@ if [ "x$start_dreshal" = "xyes" ]; then testmkd /mnt/var/run/hal # set permissions with userid echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx start="0"`expr $start + 1` stop="0"`expr $start - 1` rllinker "hal" "$start" "$stop" diff --git a/initramfs/distro-specs/suse/functions-default b/initramfs/distro-specs/suse/functions-default index bf6cfdc9..e549d56e 100644 --- a/initramfs/distro-specs/suse/functions-default +++ b/initramfs/distro-specs/suse/functions-default @@ -40,7 +40,7 @@ ln -sf ../halt /mnt/etc/${D_INITDIR}/rc6.d/S20reboot # running stuff in parallel seems to be rather useless and generates some # difficult to solve problems. If you want to try nevertheless enable the # following line and disable the latter one (switching off that feature) -#sed -e "s,TARGETS =,TARGETS = xdm boot.ld," \ +#sed -e "s,TARGETS =,TARGETS = xdm boot.slx," \ # -i /mnt/etc/${D_INITDIR}/.depend.boot sed -e "s,RUN_PARALLEL=.*,RUN_PARALLEL=\"no\"," \ -i /mnt/etc/${D_SYSCONFDIR}/boot @@ -77,7 +77,7 @@ if [ -e /mnt/etc/${D_INITDIR}/ntp ] ; 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.ld + >>/mnt/etc/${D_INITDIR}/boot.slx elif [ "x$start_ntp" = "xyes" ] ; then rllinker "ntp" "07" "14" fi @@ -166,7 +166,7 @@ if [ "x$late_dm" = "xyes" ] ; then else ln -sf /etc/${D_INITDIR}/xdm /mnt/etc/${D_INITBOOTD}/S02xdm echo -e "\t(sleep 60; ln -sf ../xdm /etc/${D_INITDIR}/rc5.d/S01xdm; \ - rm /etc/${D_INITBOOTD}/S02xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld + rm /etc/${D_INITBOOTD}/S02xdm) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx fi } @@ -333,13 +333,13 @@ keytable () { sed -e "s,KEYTABLE=.*,KEYTABLE=\"${KEYTABLE}\"," \ -i /mnt/etc/${D_SYSCONFDIR}/keyboard echo -e "\tloadkeys ${KEYTABLE} >${LOGFILE} 2>&1\n" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx } # consolefont and language (function run in hwautocfg) consolefont () { echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx sed -e "s,RC_LANG=.*,RC_LANG=\"${LANG}\" # added in initrd," \ -i /mnt/etc/${D_SYSCONFDIR}/language } @@ -361,7 +361,7 @@ if [ "x$start_dreshal" = "xyes" ]; then testmkd /mnt/var/run/dbus # set permissions with userid echo -e "\tchown messagebus:messagebus /var/run/dbus 2>/dev/null" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx rllinker "dbus" "$start" "$stop" fi if [ -f /mnt/etc/${D_INITDIR}/resmgr ] ; then @@ -379,7 +379,7 @@ if [ "x$start_dreshal" = "xyes" ]; then testmkd /mnt/var/run/hal # set permissions with userid echo -e "\tchown haldaemon:haldaemon /var/run/hal 2>/dev/null" \ - >>/mnt/etc/${D_INITDIR}/boot.ld + >>/mnt/etc/${D_INITDIR}/boot.slx start="0"`expr $start + 1` stop="0"`expr $start - 1` rllinker "haldaemon" "$start" "$stop" |