diff options
| author | (no author) | 2006-09-08 20:16:15 +0200 |
|---|---|---|
| committer | (no author) | 2006-09-08 20:16:15 +0200 |
| commit | 4743e79c820aca1bc1180998e16ddb9e3f008353 (patch) | |
| tree | 9a94a3e9a000d9ec7c6cf1fdd3a5d4a98b7be101 /initrd | |
| parent | need to commit, for testing, maybe some bugs (diff) | |
| download | core-4743e79c820aca1bc1180998e16ddb9e3f008353.tar.gz core-4743e79c820aca1bc1180998e16ddb9e3f008353.tar.xz core-4743e79c820aca1bc1180998e16ddb9e3f008353.zip | |
few bugs killed
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@364 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'initrd')
| -rwxr-xr-x | initrd/mkdxsinitrd | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/initrd/mkdxsinitrd b/initrd/mkdxsinitrd index e5b7f310..acab08e8 100755 --- a/initrd/mkdxsinitrd +++ b/initrd/mkdxsinitrd @@ -235,10 +235,10 @@ splash_image= splash_bin=$(chroot $ROOTDIR which splash) if [ -n "$splashsizes" -a -n "$splash_bin" ]; then - themes_dir= + themes_dir="../theming/openslx/bootsplash" if [ -d "/usr/share/openslx/themes/${theme}/bootsplash" ]; then themes_dir="/usr/share/openslx/themes/${theme}/bootsplash" - if [ -d "$ROOTDIR/etc/bootsplash/themes/${theme}" ]; then + elif [ -d "$ROOTDIR/etc/bootsplash/themes/${theme}" ]; then themes_dir="/etc/bootsplash/themes/${theme}" elif [ -d "$ROOTDIR/usr/share/splash/themes/${theme}" ]; then themes_dir="/usr/share/splash/themes/${theme}" @@ -248,20 +248,19 @@ if [ -n "$splashsizes" -a -n "$splash_bin" ]; then mkdir -p $ROOTDIR/tmp/bootsplash cp -a $themes_dir/* $ROOTDIR/tmp/bootsplash/ themes_dir=$ROOTDIR/tmp/bootsplash - - echo -ne "Bootsplash:\t" - if [ -n "$ROOTDIR/$themes_dir" -a \ - -d "$ROOTDIR/$themes_dir" -o -L "$ROOTDIR/$themes_dir" ]; then + + if [ -n "$themes_dir" -a \ + -d "$themes_dir" -o -L "$themes_dir" ]; then for size in $splashsizes; do bootsplash_picture="$themes_dir/images/bootsplash-$size.jpg" cfgname="$themes_dir/config/bootsplash-$size.cfg" - if [ ! -r $ROOTDIR/$cfgname ] ; then + if [ ! -r $cfgname ] ; then echo " disabled for resolution $size " - elif [ ! -r $ROOTDIR/$bootsplash_picture ] ; then + elif [ ! -r $bootsplash_picture ] ; then echo " no image for resolution $size " else echo -n "${splash_image:+, }$THEME ($size)" - splash_image=" $splash_image $cfgname " + splash_image=" $splash_image ${cfgname#$ROOTDIR} " fi done echo @@ -716,7 +715,7 @@ strip ${INSTDIR}/bin/* ${INSTDIR}/lib/* &>/dev/null ######################################################################### # End of file copy procedures -[ -n "${theme}" ] && add_splash +[ -n "${theme}" ] && add_theme # finally create the compressed initial ramdisk cpio archive pushd . > /dev/null 2>&1 |