diff options
| author | Dirk von Suchodoletz | 2009-03-15 23:59:12 +0100 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2009-03-15 23:59:12 +0100 |
| commit | e064153118773899132ee03f3ce08bd7148cceb2 (patch) | |
| tree | fcd0d564d30ecf092debd6c28c294c919790e4f4 | |
| parent | forgot to remove 5.0 in nvram.5.0 (diff) | |
| download | core-e064153118773899132ee03f3ce08bd7148cceb2.tar.gz core-e064153118773899132ee03f3ce08bd7148cceb2.tar.xz core-e064153118773899132ee03f3ce08bd7148cceb2.zip | |
Boot timer output added (debug level 8) ...
git-svn-id: http://svn.openslx.org/svn/openslx/openslx/trunk@2740 95ad53e4-c205-0410-b2fa-d234c58c8868
| -rwxr-xr-x | initramfs/stage3-stuff/init | 12 | ||||
| -rw-r--r-- | os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm | 2 |
2 files changed, 13 insertions, 1 deletions
diff --git a/initramfs/stage3-stuff/init b/initramfs/stage3-stuff/init index 34f0c403..af2ef2ca 100755 --- a/initramfs/stage3-stuff/init +++ b/initramfs/stage3-stuff/init @@ -691,6 +691,9 @@ else error "$init_loadaufs" nonfatal unset aufs unionfs fi +# runtimer +[ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ + echo "** Filesystem setup started at $(sysup)" # setup of client root filesystem dependent on the availability of UnionFS if [ -n "${union_type}" ] ; then @@ -764,6 +767,9 @@ runinithook '50-have-layered-fs' # script for stuff to execute during early bootup d_mkrlscript init boot.slx "Running configuration postponed from InitRamFS" echo "fs complete at $(sysup)" >/tmp/fscmpl +# runtimer +[ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ + echo "** Filesystem setup completed at $(sysup)" # write debug file information after filesystem setup completed echo -e "# /etc${D_SYSCONFDIR}/logfile - file created by $0 (initramfs \ @@ -846,6 +852,9 @@ if [ -n "$uniondirs" ]; then fi runinithook '70-before-plugins' +# runtimer +[ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ + echo "** Plugin configuration started at $(sysup)" # check for any plugin-specific runlevel scripts and run them, if found: if [ ${DEBUGLEVEL} = 25 ] ; then @@ -874,6 +883,9 @@ else fi runinithook '80-after-plugins' +# runtimer +[ $DEBUGLEVEL -eq 8 -o $DEBUGLEVEL -eq 20 ] && \ + echo "** Plugin configuration finished at $(sysup)" # create links for initial stage4 boot scripts initial_boot diff --git a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm index 4864aebe..160c1679 100644 --- a/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm +++ b/os-plugins/plugins/desktop/OpenSLX/Distro/Ubuntu.pm @@ -57,7 +57,7 @@ sub setupGDMScript echo "$USER files removed by $0" >/tmp/files.removed 2>/dev/null ) & . /etc/gdm/PostSession/Default.system' >/mnt/etc/gdm/PostSession/Default chmod a+x /mnt/etc/gdm/PostSession/Default* - # gdm should be started after dbus + # gdm should be started after dbus/hal rllinker gdm 4 10 echo '/usr/sbin/gdm' >/mnt/etc/X11/default-display-manager chroot /mnt update-alternatives --set x-window-manager /usr/bin/metacity |