--- trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom 2017/09/01 09:36:13 3071 +++ trunk/mlivecdbuild/profiles/alx-0_7_branch/prepare_custom 2017/09/01 09:39:12 3072 @@ -181,7 +181,7 @@ { install -d ${CDISOROOT}/netboot install -d ${LIVECDROOT}/netboot-chroot - install -d ${LIVECDROOT}/network-squashfs-temp + install -d ${LIVECDROOT}/netboot-squashfs # use all settings from the global config, but use netbootsysten as basesystem mage-bootstrap \ @@ -196,7 +196,7 @@ prepare_custom_baseconfig "${LIVECDROOT}/netboot-chroot" "alx-${CDOSARCH}" "magellan-linux.de" # creating netboot image from here on - install -d ${LIVECDROOT}/network-squashfs-temp/{LiveOS,mnt} || die + install -d ${LIVECDROOT}/netboot-squashfs/{LiveOS,mnt} || die # fix fstab, use the livecd fstab without rootfs and swap install -m 0644 $(get_profile fstab) ${LIVECDROOT}/netboot-chroot/etc/fstab || die @@ -205,39 +205,39 @@ size=$(du -s ${LIVECDROOT}/netboot-chroot | sed 's:^\(.*\)[[:space:]].*:\1:') # generate a ext3fs file for devicemapper - dd if=/dev/zero of=${LIVECDROOT}/network-squashfs-temp/LiveOS/ext3fs.img bs=1024 count=$(( ${size} + 20000 )) || die + dd if=/dev/zero of=${LIVECDROOT}/netboot-squashfs/LiveOS/ext3fs.img bs=1024 count=$(( ${size} + 20000 )) || die # create a filesystem - mkfs.ext3 -L "_${CDID}_EXT3" -m 1 -b 1024 -F ${LIVECDROOT}/network-squashfs-temp/LiveOS/ext3fs.img || die + mkfs.ext3 -L "_${CDID}_EXT3" -m 1 -b 1024 -F ${LIVECDROOT}/netboot-squashfs/LiveOS/ext3fs.img || die # set mount_counts and check_intervals to 0 # set dir_index top, to speed up things with hashed b-trees # allow acls too - tune2fs -c0 -i0 -Odir_index -ouser_xattr,acl ${LIVECDROOT}/network-squashfs-temp/LiveOS/ext3fs.img || die + tune2fs -c0 -i0 -Odir_index -ouser_xattr,acl ${LIVECDROOT}/netboot-squashfs/LiveOS/ext3fs.img || die # strip the journal -# tune2fs -O^has_journal ${LIVECDROOT}/network-squashfs-temp/LiveOS/ext3fs.img || die +# tune2fs -O^has_journal ${LIVECDROOT}/netboot-squashfs/LiveOS/ext3fs.img || die # fsck after journal removal -# fsck ${LIVECDROOT}/network-squashfs-temp/LiveOS/ext3fs.img || die +# fsck ${LIVECDROOT}/netboot-squashfs/LiveOS/ext3fs.img || die # losetup the device loopdev=$(losetup -f) [[ -z ${loopdev} ]] && die "No unused loopdev found. Maybe you want 'modprobe loop'?" # mount the image - losetup ${loopdev} ${LIVECDROOT}/network-squashfs-temp/LiveOS/ext3fs.img || die - mount ${loopdev} ${LIVECDROOT}/network-squashfs-temp/mnt || die + losetup ${loopdev} ${LIVECDROOT}/netboot-squashfs/LiveOS/ext3fs.img || die + mount ${loopdev} ${LIVECDROOT}/netboot-squashfs/mnt || die # copy everything to the image file and preserve permissions - ( cd ${LIVECDROOT}/netboot-chroot && tar cpf - . ) | ( cd ${LIVECDROOT}/network-squashfs-temp/mnt && tar xvpf - ) + ( cd ${LIVECDROOT}/netboot-chroot && tar cpf - . ) | ( cd ${LIVECDROOT}/netboot-squashfs/mnt && tar xvpf - ) sleep 3 # now umount everything and create the squashfs image - umount ${LIVECDROOT}/network-squashfs-temp/mnt || die + umount ${LIVECDROOT}/netboot-squashfs/mnt || die losetup -d ${loopdev} || die # remove mount to not ending up in the squashfs image - if [[ -d ${LIVECDROOT}/network-squashfs-temp/mnt ]] + if [[ -d ${LIVECDROOT}/netboot-squashfs/mnt ]] then - rm -r ${LIVECDROOT}/network-squashfs-temp/mnt || die + rm -r ${LIVECDROOT}/netboot-squashfs/mnt || die fi - mksquashfs ${LIVECDROOT}/network-squashfs-temp ${CDISOROOT}/netboot/squashfs.img || die + mksquashfs ${LIVECDROOT}/netboot-squashfs ${CDISOROOT}/netboot/squashfs.img || die # copy kernel, bootloader and create initramfs to isoroot/netboot install -d ${CDISOROOT}/netboot || die @@ -285,9 +285,9 @@ # final cleanup if [[ -z ${SKIP_REMOVE_INSTALLROOT} ]] then - if [[ -d ${LIVECDROOT}/network-squasfs-temp ]] + if [[ -d ${LIVECDROOT}/netboot-squashfs ]] then - rm -r ${LIVECDROOT}/network-squasfs-temp || die + rm -r ${LIVECDROOT}/netboot-squashfs || die fi if [[ -d ${LIVECDROOT}/netboot-chroot ]] then