diff options
| author | Oliver Tappe | 2008-01-13 19:19:14 +0100 |
|---|---|---|
| committer | Oliver Tappe | 2008-01-13 19:19:14 +0100 |
| commit | db3bdeb697a06b35cce61b52d83858757e82b8ec (patch) | |
| tree | 4edca1f2e15dc4fcb6a7f77e1a65727743fdf320 /initramfs/initrd-stuff/bin/servconfig | |
| parent | * avoid possible warnings about undefined values in regex-substitution (diff) | |
| download | core-db3bdeb697a06b35cce61b52d83858757e82b8ec.tar.gz core-db3bdeb697a06b35cce61b52d83858757e82b8ec.tar.xz core-db3bdeb697a06b35cce61b52d83858757e82b8ec.zip | |
reimplemented splashy stuff via Theme plugin:
* activated invocation of init-hooks
* removed explicit splashy calls from init (they are now done
in several init-hooks provided by the Theme plugin)
* the stage3 plugins are now invoked via '.' instead via a separate
shell, such that they can export changed environment variables
* changed invocation of initial_boot() - we now pass in the list
of initscripts as otherwise I have been unable to let this function
access a changed D_INITSCRIPTS variable (it would only see initial
content)
* moved invocation of initial_boot from servconfig to init (again
such that a changed D_INITSCRIPTS will be handled correctly)
* config-demuxer now passes the active plugins into mkdxsinitrd
* mkdxsinitrd accepts a list of active plugins (-p) and copies
the hooks directly into the initialramfs, such that they are
available immediately in stage3
The bootsplash stuff (splashy) seems to work properly, but the handling of displaymanager themes is currently broken. I will look into
that tomorrow.
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@1472 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initramfs/initrd-stuff/bin/servconfig')
| -rwxr-xr-x | initramfs/initrd-stuff/bin/servconfig | 25 |
1 files changed, 0 insertions, 25 deletions
diff --git a/initramfs/initrd-stuff/bin/servconfig b/initramfs/initrd-stuff/bin/servconfig index 2b8ff72c..2b7a4cf2 100755 --- a/initramfs/initrd-stuff/bin/servconfig +++ b/initramfs/initrd-stuff/bin/servconfig @@ -187,22 +187,6 @@ test -n "$domain_name_servers" && { done; } ############################################################################# -# initial boot scripts -# delete and create runlevel links for initial booting (SuSE, Debian, Ubuntu, -# Fedora, ...) -# splashy stuff -if [ ${nosplash} = 0 ]; then - D_INITSCRIPTS="${D_INITSCRIPTS} splashy.stop" - d_mkrlscript init splashy.stop "Stopping Splashy ..." - echo -e "\t/var/lib/openslx/bin/splashy_update exit 2>/dev/null - \tkillall -9 splashy\n\trm -f /var/lib/openslx/bin/splashy_update" \ - >>/mnt/etc/${D_INITDIR}/splashy.stop - d_mkrlscript close splashy.stop "" -fi - -initial_boot - -############################################################################# # run distro specific configuration function config_distro @@ -439,15 +423,6 @@ if [ "x$vmware" != "x" ] && [ "x$vmware" != "xno" ] ; then fi ############################################################################# -# theming -testmkd /mnt/var/lib/openslx/themes/displaymanager -testmkd /mnt/var/lib/openslx/bin -[ -d /usr/share/themes/displaymanager ] && \ - cp -a /usr/share/themes/displaymanager /mnt/var/lib/openslx/themes -[ -d /etc/splashy -a ${nosplash} = 0 ] && (cp -a /bin/splashy_update \ - /mnt/var/lib/openslx/bin) - -############################################################################# # preparation of /tmp directory (partition 44, nfs scratch, ramdisk). there # might be the chance that we have a disk partition available, so wait for # completion of detection, setup process |