diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rwxr-xr-x | initramfs/mkdxsinitrd | 6 |
2 files changed, 5 insertions, 6 deletions
@@ -132,6 +132,7 @@ supported."; \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/lib \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/bin \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/templates \ + -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/cdboot \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/initramfs \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/busybox \ -p $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/squashfs \ @@ -176,7 +177,9 @@ supported."; \ ln -sf $(SLX_BASE_PATH)/bin/mkdxsinitrd $(SLX_BUILD_PATH)$(USR_BIN_PATH)/; \ @ # copy shareable data: - @cd initramfs/initrd-stuff; tar --exclude=.svn -cp * | \ + @cd initramfs/cdboot; tar --exclude=.svn -cp * | \ + tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/cdboot; \ + cd ../initrd-stuff; tar --exclude=.svn -cp * | \ tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share/initramfs; cd ../..; \ tar --exclude=.svn -cp -C initramfs distro-specs | \ tar -xp -C $(SLX_BUILD_PATH)$(SLX_BASE_PATH)/share; \ diff --git a/initramfs/mkdxsinitrd b/initramfs/mkdxsinitrd index 171b8ba6..68e21f05 100755 --- a/initramfs/mkdxsinitrd +++ b/initramfs/mkdxsinitrd @@ -369,7 +369,7 @@ if [ -z "$ROOTDIR" ] ; then echo "No ROOTDIR given - please use the -r flag! Exiting..." exit 1 fi -if [ -z "$SYSTEM_NAME" ] ; then +if [ -z "$SYSTEM_NAME" -a -z "$cdboot" ] ; then echo "No system name given - please use the -S flag! Exiting..." exit 1 fi @@ -441,10 +441,6 @@ done echo -e "#!/bin/ash\n/bin/ash \$@" > ${INSTDIR}/bin/sh chmod a+x ${INSTDIR}/bin/sh -# fixme: add ext2 stuff until busybox offers these tools again or use mkfs.ext2 -# out of mounted root filesystem (more convenient)?? -#cobi mkfs.ext2 bin - # binaries useful for debugging purposes if [ $IRFSDEBUG -gt 2 ] ; then for bbins in \ |