summaryrefslogtreecommitdiffstats
path: root/initramfs/distro-specs
diff options
context:
space:
mode:
authorDirk von Suchodoletz2007-04-01 20:08:14 +0200
committerDirk von Suchodoletz2007-04-01 20:08:14 +0200
commit25460e0599eec760b90164d1ebe438cded167970 (patch)
treec3512777d080b87ea0bf38cc3b8b2182770171ee /initramfs/distro-specs
parent* moved default values for systems and client into DB-layer (diff)
downloadcore-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')
-rw-r--r--initramfs/distro-specs/debian/config-3.12
-rw-r--r--initramfs/distro-specs/debian/config-default2
-rw-r--r--initramfs/distro-specs/debian/functions-default8
-rw-r--r--initramfs/distro-specs/gentoo/functions-2005.12
-rw-r--r--initramfs/distro-specs/gentoo/functions-default12
-rw-r--r--initramfs/distro-specs/suse/functions-10.210
-rw-r--r--initramfs/distro-specs/suse/functions-9.34
-rw-r--r--initramfs/distro-specs/suse/functions-default14
-rw-r--r--initramfs/distro-specs/ubuntu/functions-5.102
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default12
10 files changed, 34 insertions, 34 deletions
diff --git a/initramfs/distro-specs/debian/config-3.1 b/initramfs/distro-specs/debian/config-3.1
index f6172d6f..d97d52ca 100644
--- a/initramfs/distro-specs/debian/config-3.1
+++ b/initramfs/distro-specs/debian/config-3.1
@@ -43,7 +43,7 @@ D_INITBOOTD="/rcS.d"
D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
D_INITDEFAULT="3"
# fixme: is keymap.sh really needed? Should be handled in a simpler fashion
-# via boot.ld (see hwautocfg)
+# via boot.slx (see hwautocfg)
D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1"
D_XF86CONFFILE="/etc/X11/xorg.conf"
D_XFONTPATH="/usr/X11R6/lib/X11/fonts/*"
diff --git a/initramfs/distro-specs/debian/config-default b/initramfs/distro-specs/debian/config-default
index 1bf3759b..64e58f80 100644
--- a/initramfs/distro-specs/debian/config-default
+++ b/initramfs/distro-specs/debian/config-default
@@ -49,7 +49,7 @@ D_INITBOOTD="/rcS.d"
D_RCDIRS="/rc0.d /rc1.d /rc2.d /rc3.d /rc4.d /rc5.d /rc6.d"
D_INITDEFAULT="3"
# fixme: is keymap.sh really needed? Should be handled in a simpler fashion
-# via boot.ld (see hwautocfg)
+# via boot.slx (see hwautocfg)
D_INITSCRIPTS="mountvirtfs udev procps.sh bootlogd keymap.sh hwclock.sh sudo dbus-1"
D_XF86CONFFILE="/etc/X11/xorg.conf"
D_XORGBIN=/usr/X11R6/bin/X
diff --git a/initramfs/distro-specs/debian/functions-default b/initramfs/distro-specs/debian/functions-default
index 2fd8de7f..88e7a2f1 100644
--- a/initramfs/distro-specs/debian/functions-default
+++ b/initramfs/distro-specs/debian/functions-default
@@ -93,9 +93,9 @@ if [ -f /mnt/etc/init.d/ntp ] ; then
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.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
else
rllinker "ntp" "20" "02"
fi
@@ -214,7 +214,7 @@ done
# consolefont and language
consolefont () {
echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
# fixme!! check for proper operation
sed -e "s,LANGUAGE=.*,LANGUAGE=\"${LANG}\" # set within initramfs," \
-e "s,LANG=.*,LANG=\"${LANG}\" # set within initramfs," \
@@ -226,7 +226,7 @@ config_gdm () {
ln -sf ../${D_INITDIR}/gdm /mnt/etc/rc3.d/K20gdm
echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
\t( sleep 120; ln -sf /etc/${D_INITDIR}/gdm /etc/rc3.d/S01gdm \
- >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+ >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx
# check for gdm user in passwd and group files
# fixme!!
# echo "gdm:x:113:">>/mnt/etc/group
diff --git a/initramfs/distro-specs/gentoo/functions-2005.1 b/initramfs/distro-specs/gentoo/functions-2005.1
index b57fe52e..536eab4a 100644
--- a/initramfs/distro-specs/gentoo/functions-2005.1
+++ b/initramfs/distro-specs/gentoo/functions-2005.1
@@ -41,7 +41,7 @@ fi
# set consolefont
consolefont () {
echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
config_rc_entry "CONSOLEFONT" "${CONSOLE_FONT}"
}
diff --git a/initramfs/distro-specs/gentoo/functions-default b/initramfs/distro-specs/gentoo/functions-default
index 488879fd..83f4c3c8 100644
--- a/initramfs/distro-specs/gentoo/functions-default
+++ b/initramfs/distro-specs/gentoo/functions-default
@@ -42,7 +42,7 @@ local script="$1"
local after="$2"
# empty runlevel links - decision on running certain services is
# passed via configuration
-if strinstr "$script" "boot boot.ld ${D_INITSCRIPTS}" ; then
+if strinstr "$script" "boot boot.slx ${D_INITSCRIPTS}" ; then
ln -s /etc/${D_INITDIR}/$script /mnt/etc/runlevels/boot/$script
echo $script >> /mnt/etc/runlevels/boot/.critical
else
@@ -132,7 +132,7 @@ cat >>/mnt/etc/${D_INITDIR}/boot <<EOF
eend \${ret} "\${errstr}"
EOF
d_mkrlscript close boot
-for script in boot boot.ld ${D_INITSCRIPTS} ; do
+for script in boot boot.slx ${D_INITSCRIPTS} ; do
# to get a certain order of scripts the after token of depends () might be
# used
rllinker "$script" "$after"
@@ -144,10 +144,10 @@ sed -e "s/# System init.*//;s/si::.*//" -i /mnt/etc/inittab
lastinit="$after"
}
-# initialize boot.ld - skript to be executed during early system startup
+# initialize boot.slx - skript to be executed during early system startup
# (before most of the normal boot init scripts)
# this script should operate like a normal runlevel script
-# initialize boot.ld - skript to be executed during early system startup
+# initialize boot.slx - skript to be executed during early system startup
# (before most of the normal boot init scripts)
# this script should operate like a normal runlevel script (fixme!!)
d_mkrlscript () {
@@ -183,7 +183,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"
fi
@@ -413,7 +413,7 @@ fi
# set consolefont
consolefont () {
echo -e "\tsetfont ${CONSOLE_FONT} >${LOGFILE} 2>&1\n" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
config_rc_entry "CONSOLEFONT" "${CONSOLE_FONT}" "conf.d/consolefont"
}
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"
diff --git a/initramfs/distro-specs/ubuntu/functions-5.10 b/initramfs/distro-specs/ubuntu/functions-5.10
index 5b7c7335..5edf207e 100644
--- a/initramfs/distro-specs/ubuntu/functions-5.10
+++ b/initramfs/distro-specs/ubuntu/functions-5.10
@@ -55,7 +55,7 @@ fi
# consolefont
consolefont () {
echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
}
# acpi and powersave
config_acpi () {
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index 52b2c6c7..a2e6de7c 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -103,9 +103,9 @@ if [ -f /mnt/etc/init.d/ntp ] ; then
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.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
else
rllinker "ntp" "$start" "$stop"
fi
@@ -193,7 +193,7 @@ keytable () {
# consolefont
consolefont () {
echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
+ >>/mnt/etc/${D_INITDIR}/boot.slx
}
@@ -218,7 +218,7 @@ if [ "x$late_dm" = "xyes" ] ; then
else
echo -e "\t/etc/${D_INITDIR}/gdm start >${LOGFILE} 2>&1\n\
\t( sleep 60; ln -sf /etc/${D_INITDIR}/gdm /etc/rc3.d/S01gdm \
- >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+ >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx
fi
# append gdm user
echo "gdm:x:113:">>/etc/group
@@ -350,7 +350,7 @@ testmkd /mnt/${kdmrcdir}
# ln -sf ../${D_INITDIR}/kdm /mnt/etc/rc3.d/K20kdm
# echo -e "\t/etc/${D_INITDIR}/kdm start >${LOGFILE} 2>&1\n\
# \t( sleep 120; ln -sf /etc/${D_INITDIR}/kdm /etc/rc3.d/S01kdm \
-# >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.ld
+# >${LOGFILE} 2>&1) &\n" >>/mnt/etc/${D_INITDIR}/boot.slx
#fi
# write configuration file
@@ -365,7 +365,7 @@ if [ "x$start_dreshal" = "xyes" ]; then
fi
}
-# initialize boot.ld - skript to be executed during early system startup
+# initialize boot.slx - skript to be executed during early system startup
# (before most of the normal boot init scripts)
# this script should operate like a normal runlevel script (fixme!!)
d_mkrlscript () {