diff options
| -rw-r--r-- | Makefile | 6 | ||||
| -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 |
4 files changed, 13 insertions, 11 deletions
@@ -59,12 +59,12 @@ install: -p $(SLX_PRIVATE_PATH)/stage1 \ -p $(SLX_PUBLIC_PATH)/tftpboot \ -p $(SLX_SHARE_PATH)/themes - @cp initrd/{mkdxsinitrd,slxmkramfs} $(SLX_BIN_PATH) + @cp initramfs/{mkdxsinitrd,slxmkramfs} $(SLX_BIN_PATH) @chmod u+x $(SLX_BIN_PATH)/{mkdxsinitrd,slxmkramfs} @ln -sf $(SLX_BIN_PATH)/mkdxsinitrd $(USR_BIN)/ @ln -sf $(SLX_BIN_PATH)/slxmkramfs $(USR_BIN)/ - @cp -a initrd/initrd-stuff/* $(SLX_SHARE_PATH)/initramfs - @cp -a initrd/distro-specs/* $(SLX_SHARE_PATH)/distro-specs + @cp -a initramfs/initrd-stuff/* $(SLX_SHARE_PATH)/initramfs + @cp -a initramfs/distro-specs/* $(SLX_SHARE_PATH)/distro-specs @cp -a installer/default_files/machine-setup.default \ $(SLX_SHARE_PATH)/templates @cp -a installer/default_files/tftpboot $(SLX_SHARE_PATH) 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" |