dsuchod: ld4-inst matched to rewritten mkdxsinitrd (to be tested) ...

git-svn-id: http://svn.openslx.org/svn/openslx/trunk@523 95ad53e4-c205-0410-b2fa-d234c58c8868

2 files changed, 3 insertions, 6 deletions

diff --git a/installer/distro-specs/exclude-ubuntu-6.10 b/installer/distro-specs/exclude-ubuntu-6.10
new file mode 120000
index 00000000..5479ce6b
--- /dev/null
+++ b/installer/distro-specs/exclude-ubuntu-6.10
@@ -0,0 +1 @@
+exclude-ubuntu-5.10
\ No newline at end of file
diff --git a/installer/ld4-inst b/installer/ld4-inst
index 404c7287..012ed86f 100755
--- a/installer/ld4-inst
+++ b/installer/ld4-inst
@@ -4,7 +4,7 @@
 #               cloning from rsync source for Diskless X Stations (v4.0)
 #
 # Author(s):    Nico Dietrich, 04-04-2006
-#		Dirk von Suchodoletz <dirk@goe.net>, 19-09-2006
+#		Dirk von Suchodoletz <dirk@goe.net>, 27-11-2006
 #               Michael Janczyk, <mj0>, 06-07-2006
 #
 # Copyright:    (c) 2003, 2006 - RZ Universitaet Freiburg
@@ -365,22 +365,18 @@ kernel_choice "${kernel_choice}"
   isyes "$nbdyes" && fsmod=$fsmod" nbd $nbdfs"
   # one big initrd or several smaller "specialized" ones!?
 
-  # FIXME: mkdxsinitrd currently wants to run from own directory
-  # ugly workaround...
-  cd ../initramfs
   while [ $j -lt ${#choice[@]} ] ; do
     current_kernel=${kernel[${choice[$j]}]#${rootdir}/boot/vmlinuz-}
     echo "Creating initialramfs for ${current_kernel}"
     current_initramfs=${tftpbootdir}/initrd-dxs-${current_kernel}
     [ -f ${current_initramfs} ] && rm ${current_initramfs}
     echo "mkdxsinitrd -f \"$fsmod\" -r ${rootdir} -k ${current_kernel} -i ${current_initramfs} -d ${debuglevel}"
-    ./mkdxsinitrd -f "$fsmod" -r ${rootdir} -k ${current_kernel} \
+    mkdxsinitrd -f "$fsmod" -r ${rootdir} -k ${current_kernel} \
       -i ${current_initramfs} -d ${debuglevel}
 
     ln -sf ${kernel[${choice[$j]}]} ${tftpbootdir}/vmlinuz-${current_kernel}
     j=$j+1
   done
-  cd -
 }
 
 # setting up server site configuration files etc.