diff options
| author | Dirk von Suchodoletz | 2006-09-18 18:22:08 +0200 |
|---|---|---|
| committer | Dirk von Suchodoletz | 2006-09-18 18:22:08 +0200 |
| commit | 0808e02b95089505aaf69ed788adbbdddf217a41 (patch) | |
| tree | 321d6a30e489043cdd558c8dc6fe333e5e2418af /installer | |
| parent | Hopefully completed #78 task, moved directory name (initramfs to (diff) | |
| download | core-0808e02b95089505aaf69ed788adbbdddf217a41.tar.gz core-0808e02b95089505aaf69ed788adbbdddf217a41.tar.xz core-0808e02b95089505aaf69ed788adbbdddf217a41.zip | |
Still fixes needed for the directory change (see last checkins),
excluded annoying tools in GUI autostart in SuSE10.1 (see
exclude-suse-10.1) ...
git-svn-id: http://svn.openslx.org/svn/openslx/trunk@381 95ad53e4-c205-0410-b2fa-d234c58c8868
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/distro-specs/exclude-common | 3 | ||||
| -rw-r--r-- | installer/distro-specs/exclude-suse-10.1 | 1 | ||||
| -rwxr-xr-x | installer/ld4-inst | 14 |
3 files changed, 10 insertions, 8 deletions
diff --git a/installer/distro-specs/exclude-common b/installer/distro-specs/exclude-common index 7f1da477..e900ceb7 100644 --- a/installer/distro-specs/exclude-common +++ b/installer/distro-specs/exclude-common @@ -18,7 +18,8 @@ - /etc/shadow* - /etc/dxs - /etc/resolv.conf.* -- //etc/vmware/vmnet* +- /etc/vmware/vmnet* +- /etc/vmware/installer.sh - /dev/* - /proc/* - /sys/* diff --git a/installer/distro-specs/exclude-suse-10.1 b/installer/distro-specs/exclude-suse-10.1 index 1fbc52ad..c52f0595 100644 --- a/installer/distro-specs/exclude-suse-10.1 +++ b/installer/distro-specs/exclude-suse-10.1 @@ -5,6 +5,7 @@ - *.old - *.bak - *.o +- /etc/cron.* - /lib/klibc/events/* - /boot/initrd* - /boot/grub diff --git a/installer/ld4-inst b/installer/ld4-inst index cd0fa676..bb11d364 100755 --- a/installer/ld4-inst +++ b/installer/ld4-inst @@ -366,15 +366,15 @@ kernel_choice "${kernel_choice}" # FIXME: mkdxsinitrd currently wants to run from own directory # ugly workaround... - cd ../initrd + cd ../initramfs while [ $j -lt ${#choice[@]} ] ; do current_kernel=${kernel[${choice[$j]}]#${rootdir}/boot/vmlinuz-} - echo "Creating initial ramdisk for ${current_kernel}" - current_initrd=${tftpbootdir}/initrd-dxs-${current_kernel} - [ -f ${current_initrd} ] && rm ${current_initrd} - echo "mkdxsinitrd -f \"$fsmod\" -r ${rootdir} -k ${current_kernel} -i ${current_initrd} -d ${debuglevel}" + 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} \ - -i ${current_initrd} -d ${debuglevel} + -i ${current_initramfs} -d ${debuglevel} ln -sf ${kernel[${choice[$j]}]} ${tftpbootdir}/vmlinuz-${current_kernel} j=$j+1 @@ -433,7 +433,7 @@ ${rootdir} ${netname}/${netmask}(ro,no_root_squash,async)" \ declare -i j=0 while [ $j -lt ${#choice[@]} ] ; do current_kernel=${kernel[${choice[$j]}]#${rootdir}/boot/vmlinuz-} - current_initrd=${tftpbootdir}/initrd-dxs-${current_kernel} + current_initramfs=${tftpbootdir}/initrd-dxs-${current_kernel} if [ $j -eq 0 ] ; then default_string=" MENU DEFAULT\n" |