summaryrefslogtreecommitdiffstats
path: root/initramfs/distro-specs/ubuntu/functions-default
diff options
context:
space:
mode:
Diffstat (limited to 'initramfs/distro-specs/ubuntu/functions-default')
-rw-r--r--initramfs/distro-specs/ubuntu/functions-default52
1 files changed, 24 insertions, 28 deletions
diff --git a/initramfs/distro-specs/ubuntu/functions-default b/initramfs/distro-specs/ubuntu/functions-default
index d0b86a0a..e3740bac 100644
--- a/initramfs/distro-specs/ubuntu/functions-default
+++ b/initramfs/distro-specs/ubuntu/functions-default
@@ -57,21 +57,15 @@ config_distro () {
sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
}
-# udev/hotplug - auto device discovery service (deprecated)
-# Result: 1 is bad, 0 is good
-udev_hotplug () {
- local result=0
- [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
- udevstart || result=1
- udevd -d || result=1
- return $result
-}
-
# linking runlevel scripts
rllinker () {
local script="$1"
-local start="$2"
-local stop="$3"
+if [ $2 -lt 10 ] ; then
+ local start="0$2"; else local start="$2"
+fi
+if [ $3 -lt 10 ] ; then
+ local stop="0$3"; else local stop="$3"
+fi
# empty runlevel links - decision on running certain services is
# passed via configuration
for i in rc2.d/K$stop$script rc3.d/K$stop$script \
@@ -94,7 +88,7 @@ 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
- rllinker "ntp" "07" "14"
+ rllinker "ntp" 7 14
fi
}
@@ -104,7 +98,7 @@ if [ "x$start_atd" = "xyes" ]; then
# testmkd /mnt/var/spool/atjobs
# testmkd /mnt/var/spool/atspool
# chown 1:1 /mnt/var/spool/atjobs /mnt/var/spool/atspool
- rllinker "atd" "14" "04"
+ rllinker "atd" 14 4
fi
}
@@ -112,7 +106,7 @@ fi
config_cron () {
if [ "x$start_cron" = "xyes" ] ; then
if [ -f /mnt/etc/init.d/cron ] ; then
- rllinker "cron" "18" "02"
+ rllinker "cron" 18 2
# fixme! check for proper permissions!
testmkd /mnt/var/spool/crontabs
echo -e "# /etc/crontab - file generated by $0:\n\
@@ -140,7 +134,7 @@ if [ "x$start_syslog" != "xno" ] ; then
# if [ -f /mnt/etc/${D_INITDIR}/syslog ] ; then
# # logoutput depending on $start_syslog definitions
# sysngwriter /mnt/etc/syslog-ng/syslog-ng.conf
- rllinker "sysklogd" "02" "18"
+ rllinker "sysklogd" 2 18
#else keiner installiert
# error "$df_errsysl" nonfatal
fi
@@ -151,7 +145,7 @@ config_sshd () {
if [ "x$start_sshd" = "xyes" ] ; then
if [ -f /mnt/etc/init.d/ssh ] ; then
#testmkd /mnt/var/run/sshd
- rllinker "ssh" "12" "10"
+ rllinker "ssh" 12 10
else
error "$df_errsshd" nonfatal
fi
@@ -162,7 +156,7 @@ fi
config_snmp () {
if [ "x$start_snmp" = "xyes" ] ; then
if [ -f /mnt/etc/init.d/snmpd ] ; then
- rllinker "snmpd" "24" "02"
+ rllinker "snmpd" 24 2
testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
fi
# fixme!!
@@ -185,12 +179,14 @@ echo -e "setfont ${CONSOLE_FONT} >${LOGFILE} 2>&1" \
# acpi and powersave
config_acpi () {
- rllinker "acpid" "10" "19"
+ rllinker "acpid" 10 19
#Commented out since battery checking is only useful for Notebooks
- #rllinker "acpi-support" "99" "02"
+ #rllinker "acpi-support" 99 2
- # nur hier weil udev_hotplug zu früh aufgerufen wird.
- rllinker "udev" "11" "25"
+ # nur hier weil udev_hotplug zu früh aufgerufen wird. -> Hm, warum zu
+ # früh an der anderen Stelle - was fehlt?? udev_hotplug gibts im Stage3
+ # nicht mehr!!
+ rllinker "udev" 11 25
}
# configure gdm as display manager
@@ -328,7 +324,7 @@ xdmdir=/etc/kde3/kdm
testmkd /mnt/${kdmrcdir}
#if [ "x$late_dm" = "xyes" ] ; then
- rllinker "kdm" "25" "01"
+ rllinker "kdm" 25 1
if [ "x$start_xdmcp" = "xkdm" ]; then
echo /usr/bin/kdm > /mnt/etc/X11/default-display-manager
fi
@@ -347,7 +343,7 @@ config_kdm_template
# configure hal, dbus, resmgr and services like that
config_dreshal () {
if [ "x$start_dreshal" = "xyes" ]; then
- rllinker "dbus" "17" "20"
+ rllinker "dbus" 17 20
fi
}
@@ -378,7 +374,7 @@ esac
# prepare virtual machine environment (vmware, vmplayer)
config_vmware () {
if [ -f /mnt/etc/init.d/vmware ] ; then
-rllinker "vmware" "20" "02"
+rllinker "vmware" 20 2
# during vmware sessions linux should not handle usb events/devices
testmkd /mnt/var/X11R6/bin
# add special path /var/X11R6/bin to the PATH variable
@@ -412,16 +408,16 @@ if [ -f /mnt/etc/init.d/autofs ] ; then
-e "s,AUTOFS_OPTIONS.*,AUTOFS_OPTIONS=\"--timeout 3\"," \
-i /mnt/etc/${D_SYSCONFDIR}/autofs
config_portmap
- rllinker "autofs" "18" "04"
+ rllinker "autofs" 18 4
fi
}
# start portmapper (needed at least for nfs and nis services)
config_portmap () {
- rllinker "portmap" "02" "20"
+ rllinker "portmap" 2 20
}
# start NIS (fixmee - does the service is really named ypbind??)
config_nis () {
- rllinker "ypbind" "06" "16"
+ rllinker "ypbind" 6 16
}