summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Endres2006-08-31 02:00:14 +0200
committerFelix Endres2006-08-31 02:00:14 +0200
commit21d95e80ae61937b3db2053d36c52dcf02d1b832 (patch)
treef1686e27439cb73db2561f6f37f1256f35a326b1
parentMajor cleanup in several scripts, bugfix for installation (make (diff)
downloadcore-21d95e80ae61937b3db2053d36c52dcf02d1b832.tar.gz
core-21d95e80ae61937b3db2053d36c52dcf02d1b832.tar.xz
core-21d95e80ae61937b3db2053d36c52dcf02d1b832.zip
Further cleanup of Ubuntus configuration
Several fixes concerning Errormessages during Bootup git-svn-id: http://svn.openslx.org/svn/openslx/trunk@347 95ad53e4-c205-0410-b2fa-d234c58c8868
-rw-r--r--initrd/distro-specs/ubuntu/functions-5.10131
-rw-r--r--initrd/distro-specs/ubuntu/functions-6.0646
-rw-r--r--initrd/distro-specs/ubuntu/functions-default15
-rwxr-xr-xinitrd/initrd-stuff/bin/servconfig2
4 files changed, 12 insertions, 182 deletions
diff --git a/initrd/distro-specs/ubuntu/functions-5.10 b/initrd/distro-specs/ubuntu/functions-5.10
index 15692859..82ebbee6 100644
--- a/initrd/distro-specs/ubuntu/functions-5.10
+++ b/initrd/distro-specs/ubuntu/functions-5.10
@@ -10,103 +10,6 @@
# (c) 2006 - RZ Universitaet Freiburg
# (c) 2006 - OpenSLX.ORG Project
-# distro specific stuff to initialize
-preinit () {
- echo "Creating dhcp user"
- echo "dhcp:x:101:">>/etc/group
- echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
-
- # load unix module to provide sockets (is compiled into kernel on
- # the live CDs!?)
- modprobe ${MODPRV} unix || error "$df_errumod" nonfatal
-}
-
-# distro specific function called from servconfig script
-config_distro () {
-# add the halt link to the 0 and 6 runlevel directories
- ln -sf ../init.d/halt /mnt/etc/rc0.d/S90halt
- ln -sf ../init.d/reboot /mnt/etc/rc6.d/S90reboot
-
- # set default runlevel
- sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
-}
-
-# udev/hotplug - auto device discovery service
-udev_hotplug () {
- local result=0
- [ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
- echo "Enabling hotplug/udev"
- udevstart || result=1
- udevd -d || result=1
- return $result
-}
-
-# linking runlevel scripts
-rllinker () {
-local script="$1"
-local start="$2"
-local stop="$3"
-# 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 \
- rc2.d/S$start$script rc3.d/S$start$script ; do
- if ! [ -f /mnt/etc/init.d/$script ]; then
- echo "Target `pwd`../$script does not exist. Skipping links"
- break
- else
- ln -sf ../init.d/$script /mnt/etc/$i
- echo "Linked $script"
- fi
-done
-}
-
-# group of functions for the normal runlevels - first parameter is start
-# second stop
-# function for ntp configuration
-config_ntp () {
-local start=07
-local stop=14
-if [ -f /mnt/etc/init.d/ntp ] ; 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.ld
- echo "ntpdate -s -b $ntp_servers >${LOGFILE} 2>&1 &" \
- >>/mnt/etc/${D_INITDIR}/boot.ld
- else
- rllinker "ntp" "$start" "$stop"
- fi
-fi
-}
-
-# function for atd
-config_atd () {
-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"
-fi
-}
-
-# function for configuration of cron services
-config_cron () {
-if [ "x$start_cron" = "xyes" ] ; then
- if [ -f /mnt/etc/init.d/cron ] ; then
- rllinker "cron" "18" "02"
- # fixme! check for proper permissions!
- testmkd /mnt/var/spool/crontabs
- echo -e "# /etc/crontab - file generated by $0:\n\
-#\t$date\nSHELL=/bin/sh\nPATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/lib/news/bin\
-\nMAILTO=\n-*/15 * * * *\troot\ttest -x /usr/lib/cron/run-crons && \
-/usr/lib/cron/run-crons >/dev/null 2>&1\n" >/mnt/etc/crontab
- else
- error "$df_errcron" nonfatal
- fi
-fi
-}
# syslog service
config_syslog () {
@@ -168,29 +71,6 @@ if [ "x$start_dreshal" = "xyes" ]; then
fi
}
-# initialize boot.ld - 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 () {
-local switch="$1"
-local name="$2"
-local info="$3"
-case "$switch" in
- init)
- echo -e "#!/bin/sh\n# skeleton of /etc/${D_INITDIR}/$name written \
-from $0\n# after you applied changes to the creation scripts you have to \
-rerun\n# the mkdxsinitrd script to get them applied" \
- >/mnt/etc/${D_INITDIR}/$name
- echo -e "\n\ncase \"\$1\" in\n start)\techo -n \"$info\"" \
- >>/mnt/etc/${D_INITDIR}/$name
- chmod u+x /mnt/etc/${D_INITDIR}/$name
- ;;
- close)
- echo -e "\t;;\n stop)\n\t;;\nesac\nexit 0" \
- >>/mnt/etc/${D_INITDIR}/$name
- ;;
-esac
-}
# fixme!! taken from SuSE10.0 untested here ...
# prepare virtual machine environment (vmware, vmplayer)
@@ -215,14 +95,3 @@ PROGRAM=\"/var/X11R6/bin/vm-udev\", OPTIONS=\"ignore_device\"\n\
SUBSYSTEM==\"usb\", ACTION==\"remove\", PROGRAM=\"/var/X11R6/bin/vm-udev\"" \
>> /mnt/etc/udev/rules.d/01-udev-vm.rules
}
-
-# start portmapper (needed at least for nfs and nis services)
-config_portmap () {
- echo "5.10"
- rllinker "portmap" "02" "20"
-}
-
-# start NIS (fixmee - does the service is really named ypbind??)
-config_nis () {
- rllinker "ypbind" "06" "16"
-}
diff --git a/initrd/distro-specs/ubuntu/functions-6.06 b/initrd/distro-specs/ubuntu/functions-6.06
index a4bcc66c..e439df4f 100644
--- a/initrd/distro-specs/ubuntu/functions-6.06
+++ b/initrd/distro-specs/ubuntu/functions-6.06
@@ -13,7 +13,7 @@
# distro specific stuff to initialize
preinit () {
echo "Creating dhcp user"
- echo "dhcp:x:101:" >>/etc/group
+ echo "dhcp:x:101:">>/etc/group
echo "dhcp:x:101:101::/nonexistent:/bin/false" >>/etc/passwd
# mount/unionfs can not handle the nfsro parameter in Ubuntu 6.06
NFSRO=""
@@ -40,53 +40,9 @@ udev_hotplug () {
:
}
-# function for atd
-config_atd () {
-if [ "x$start_atd" = "xyes" ]; then
- # fixme!! needed? Fix permissions
- #testmkd /mnt/var/spool/cron/atjobs
- #testmkd /mnt/var/spool/cron/atspool
- #chown /mnt/var/spool/cron/atjobs /mnt/var/spool/cron/atspool
- rllinker "atd" "89" "01"
-fi
-}
-# function for configuration of cron services
-config_cron () {
-if [ "x$start_cron" = "xyes" ] ; then
- if [ -f /mnt/etc/init.d/cron ] ; then
- rllinker "cron" "89" "01"
- testmkd /mnt/var/spool/cron/crontabs
- echo -e "# /etc/crontab - file generated by $0:\n\
-#\t$date\nSHELL=/bin/sh\nPATH=/usr/bin:/usr/sbin:/sbin:/bin:/usr/lib/news/bin\
-\nMAILTO=\n-*/15 * * * *\troot\ttest -x /usr/lib/cron/run-crons && \
-/usr/lib/cron/run-crons >/dev/null 2>&1\n" >/mnt/etc/crontab
- else
- error "$df_errcron" nonfatal
- fi
-fi
-}
-# secure shell service
-config_sshd () {
-if [ "x$start_sshd" = "xyes" ] ; then
- if [ -f /mnt/etc/init.d/ssh ] ; then
- rllinker "ssh" "20" "02"
- fi
-fi
-}
-# snmp agent for remote monitoring
-config_snmp () {
-if [ "x$start_snmp" = "xyes" ] ; then
- if [ -f /mnt/etc/init.d/snmpd ] ; then
- rllinker "snmpd" "30" "03"
- testmkd /mnt/var/lib/net-snmp >/dev/null 2>&1
- fi
- # fixme!!
- # write service monitor depending on services started
- fi
-}
# x11 stuff
descsession () {
diff --git a/initrd/distro-specs/ubuntu/functions-default b/initrd/distro-specs/ubuntu/functions-default
index ccf67956..d9ae7e28 100644
--- a/initrd/distro-specs/ubuntu/functions-default
+++ b/initrd/distro-specs/ubuntu/functions-default
@@ -27,7 +27,7 @@ preinit () {
#overwrite settings set by hwautocfg
displayvars (){
Files=' \t FontPath\t\t "/usr/share/X11/fonts/misc"\n
-\t FontPath\t\t "/usr/share/X11/fonts/100dpi/:unscaled"\n
+\t FontPath\t\t "/usr/share/X11/fonts/100dpi/:unscaled"\n
\t FontPath\t\t "/usr/share/X11/fonts/75dpi/:unscaled"\n
\t FontPath\t\t "/usr/share/X11/fonts/Type1"\n
\t FontPath\t\t "/usr/share/X11/fonts/100dpi"\n
@@ -53,11 +53,16 @@ config_distro () {
# set default runlevel
sed -e "s/.*initdefault/id:${D_INITDEFAULT}:initdefault/" -i /mnt/etc/inittab
+ # neeed lateron:
+ echo HALLO
+ /mnt/bin/mknod /dev/zero c 1 5
+ /mnt/bin/mknod /dev/mem c 1 1
}
# AUS SuSE-9.3
# udev/hotplug - auto device discovery service
+# Result: 1 is bad, 0 is good
udev_hotplug () {
local result=0
[ -d /etc/hotplug -a -d /etc/hotplug.d ] || error "$df_errhotpl" nonfatal
@@ -194,8 +199,8 @@ config_acpi () {
rllinker "acpid" "10" "19"
rllinker "acpi-support" "99" "02"
- # nur hier wiel udev_hotplug zu früh aufgerufen wird.
- rllinker "udev" "18" "25"
+ # nur hier weil udev_hotplug zu früh aufgerufen wird.
+ rllinker "udev" "11" "25"
}
# configure gdm as display manager
@@ -356,7 +361,7 @@ rerun\n# the mkdxsinitrd script to get them applied" \
>/mnt/etc/${D_INITDIR}/$name
echo -e "\n\ncase \"\$1\" in\n start)\techo -n \"$info\"" \
>>/mnt/etc/${D_INITDIR}/$name
- chmod +x /mnt/etc/${D_INITDIR}/$name
+ chmod u+x /mnt/etc/${D_INITDIR}/$name
;;
close)
echo -e "\t;;\n stop)\n\t;;\nesac\nexit 0" \
@@ -424,7 +429,7 @@ fi
# start portmapper (needed at least for nfs and nis services)
config_portmap () {
- rllinker "portmap" "18" "20"
+ rllinker "portmap" "02" "20"
}
# start NIS (fixmee - does the service is really named ypbind??)
diff --git a/initrd/initrd-stuff/bin/servconfig b/initrd/initrd-stuff/bin/servconfig
index e9eb572c..c2264674 100755
--- a/initrd/initrd-stuff/bin/servconfig
+++ b/initrd/initrd-stuff/bin/servconfig
@@ -233,7 +233,7 @@ $date\n" >/mnt/etc/ntp.conf;
fi
# copy timezone file defined with language settings
[ -z "$TZ" ] && TZ="$timezone"
-cp /mnt/usr/share/zoneinfo/${TZ} /mnt/etc/localtime 2>/dev/null || \
+ln -snf /usr/share/zoneinfo/${TZ} /mnt/etc/localtime || \
error "$scfg_ntptz" nonfatal
config_ntp