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

4 files changed, 10 insertions, 10 deletions

diff --git a/initramfs/initrd-stuff/bin/hwautocfg b/initramfs/initrd-stuff/bin/hwautocfg
index 4dae8810..3f8fce81 100755
--- a/initramfs/initrd-stuff/bin/hwautocfg
+++ b/initramfs/initrd-stuff/bin/hwautocfg
@@ -466,9 +466,9 @@ else
   ( displaysetup /etc/xorg.conf; echo "ready" > /tmp/xready ) &
 fi
   
-# add entries to initialize keytable and consolefont to boot.ld
+# add entries to initialize keytable and consolefont to boot.slx
 # postpone some commands into normal bootup environment
-#echo -e "\t# entries added by $0: $date" >> /mnt/etc/${D_INITDIR}/boot.ld
+#echo -e "\t# entries added by $0: $date" >> /mnt/etc/${D_INITDIR}/boot.slx
 #[ -n "${KEYTABLE}" ] && keytable
 #[ -n "${CONSOLE_FONT}" ] && consolefont
 
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig
index ac515b1d..0aaec294 100755
--- a/initramfs/initrd-stuff/bin/servconfig
+++ b/initramfs/initrd-stuff/bin/servconfig
@@ -83,7 +83,7 @@ echo "
 
 #############################################################################
 # set localization and add entries to initialize keytable and consolefont to
-# boot.ld
+# boot.slx
 DEFKEYTABLE="de-latin1-nodeadkeys"
 if [ -z "$country" ] ; then
   error "$scfg_country" nonfatal
@@ -94,7 +94,7 @@ if [ -z "${KEYTABLE}" ] ; then
   error "$hcfg_keyb" nonfatal 
   KEYTABLE=${DEFKEYTABLE}
 fi
-echo -e "\t# entries added by $0: $date" >> /mnt/etc/${D_INITDIR}/boot.ld
+echo -e "\t# entries added by $0: $date" >> /mnt/etc/${D_INITDIR}/boot.slx
 [ -n "${KEYTABLE}" ] && keytable
 [ -n "${CONSOLE_FONT}" ] && consolefont
 
@@ -499,7 +499,7 @@ resmgr revoke nobody\nresmgr logout tty7\nkillall X" \
       # early start of kiosk session if not late_dm is set
       if [ "x$late_dm" != "xyes" ] ; then
         echo -e "\t# kiosk start added by $0\n\t\
-/var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.ld
+/var/X11R6/bin/kiosk &>/dev/null &" >>/mnt/etc/${D_INITDIR}/boot.slx
       fi
       cp /etc/startgui /mnt/var/X11R6/bin
       chmod a+x /mnt/var/X11R6/bin/kiosk /mnt/var/X11R6/bin/startgui
diff --git a/initramfs/initrd-stuff/etc/functions b/initramfs/initrd-stuff/etc/functions
index 3dd3a530..c9f8c8be 100644
--- a/initramfs/initrd-stuff/etc/functions
+++ b/initramfs/initrd-stuff/etc/functions
@@ -928,10 +928,10 @@ esac
 # be handled differently)
 initial_boot () {
 local count=10
-# boot.ld is a special runlevel script generated within initialramfs which
+# boot.slx is a special runlevel script generated within initialramfs which
 # should be executed before the normal runlevel scripts. Proper shutdown is
 # not needed!?
-for i in boot.ld ${D_INITSCRIPTS}; do
+for i in boot.slx ${D_INITSCRIPTS}; do
   count=`expr $count + 1`
   revcnt=`expr 41 - $count`
   ln -sf /etc${D_INITDIR}/$i /mnt/etc/${D_INITBOOTD}/S${count}$i
@@ -1170,7 +1170,7 @@ config_bt () {
 :
 }
 
-# create a compliant runlevel script, needed for boot.ld and vmware-prep
+# create a compliant runlevel script, needed for boot.slx and vmware-prep
 d_mkrlscript () {
 :
 }
diff --git a/initramfs/initrd-stuff/init b/initramfs/initrd-stuff/init
index 4fcae3bd..8e5c4580 100755
--- a/initramfs/initrd-stuff/init
+++ b/initramfs/initrd-stuff/init
@@ -537,7 +537,7 @@ elif [ -z "${cowloop}" ] ; then
   # run some specific stuff !?
 fi
 # script for stuff to execute during early bootup
-d_mkrlscript init boot.ld "Running configuration postponed from InitRamFS"
+d_mkrlscript init boot.slx "Running configuration postponed from InitRamFS"
 echo "fs complete at $(sysup)" >/tmp/fscmpl
 
 # write debug file information after filesystem setup completed
@@ -635,7 +635,7 @@ done
 # check for inittab file (might fail for new style init -> upstart)
 test -f /mnt/etc/inittab || test -d /mnt/etc/event.d || error "$init_erritab"
 # close runlevel script for stuff to execute during early bootup
-d_mkrlscript close boot.ld ""
+d_mkrlscript close boot.slx ""
 # put /tmp into stage4 mtab and add stuff to stage4 fstab
 sed -n "s,/mnt,,;/\/tmp /p" /proc/mounts >> /mnt/etc/mtab
 [ -f /tmp/fstab ] && cat /tmp/fstab >> /mnt/etc/fstab