Add fullscreen & fix notes
This commit is contained in:
@@ -99,9 +99,11 @@ mkdir -p "${CHROOT_DIR}" "${ISO_DIR}"
|
||||
|
||||
# Bootstrap Debian base system
|
||||
echo "Bootstrapping Debian base system..."
|
||||
debootstrap --arch=amd64 --variant=minbase "${DEBIAN_VERSION}" "${CHROOT_DIR}" http://deb.debian.org/debian/
|
||||
debootstrap --arch=amd64 --variant=minbase "${DEBIAN_VERSION}" "${CHROOT_DIR}" http://deb.debian.org/debian/ 2>/dev/null
|
||||
|
||||
# Mount necessary filesystems
|
||||
echo "Mounting virtual filesystems..."
|
||||
mkdir -p "${CHROOT_DIR}"/{dev,dev/pts,proc,sys}
|
||||
mount --bind /dev "${CHROOT_DIR}/dev"
|
||||
mount --bind /dev/pts "${CHROOT_DIR}/dev/pts"
|
||||
mount --bind /proc "${CHROOT_DIR}/proc"
|
||||
@@ -114,8 +116,11 @@ cleanup() {
|
||||
umount -lf "${CHROOT_DIR}/dev" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/proc" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/sys" 2>/dev/null || true
|
||||
# Additional cleanup - remove any leftover mount points
|
||||
sync
|
||||
sleep 1
|
||||
}
|
||||
trap cleanup EXIT
|
||||
trap cleanup EXIT INT TERM
|
||||
|
||||
# Copy OpenWall files into chroot
|
||||
echo "Copying OpenWall files..."
|
||||
@@ -258,13 +263,35 @@ chmod +x "${CHROOT_DIR}/setup-system.sh"
|
||||
echo "Running system setup in chroot..."
|
||||
chroot "${CHROOT_DIR}" /setup-system.sh
|
||||
|
||||
# Clean up mounts before creating squashfs
|
||||
echo "Cleaning up mounts before filesystem creation..."
|
||||
# Disable trap temporarily
|
||||
trap - EXIT INT TERM
|
||||
umount -lf "${CHROOT_DIR}/dev/pts" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/dev" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/proc" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/sys" 2>/dev/null || true
|
||||
sync
|
||||
sleep 2
|
||||
|
||||
# Create live boot configuration
|
||||
echo "Setting up live boot configuration..."
|
||||
mkdir -p "${ISO_DIR}/live"
|
||||
|
||||
# Create filesystem image
|
||||
echo "Creating filesystem image..."
|
||||
mksquashfs "${CHROOT_DIR}" "${ISO_DIR}/live/filesystem.squashfs" -comp xz -e boot
|
||||
echo "Creating filesystem image (this may take a while)..."
|
||||
mksquashfs "${CHROOT_DIR}" "${ISO_DIR}/live/filesystem.squashfs" \
|
||||
-comp xz \
|
||||
-e boot \
|
||||
-e proc \
|
||||
-e sys \
|
||||
-e dev \
|
||||
-e tmp \
|
||||
-e var/tmp \
|
||||
-e var/cache \
|
||||
-e var/log \
|
||||
-no-progress \
|
||||
-quiet
|
||||
|
||||
# Copy kernel and initrd
|
||||
cp "${CHROOT_DIR}/boot/vmlinuz-"* "${ISO_DIR}/live/vmlinuz"
|
||||
@@ -338,9 +365,18 @@ xorriso -as mkisofs \
|
||||
-append_partition 2 0xef "${ISO_DIR}/EFI/boot/bootx64.efi" \
|
||||
-output "${OUTPUT_ISO}" \
|
||||
-graft-points \
|
||||
"${ISO_DIR}"
|
||||
"${ISO_DIR}" 2>/dev/null
|
||||
|
||||
echo "ISO created: ${OUTPUT_ISO}"
|
||||
|
||||
# Final cleanup
|
||||
final_cleanup() {
|
||||
umount -lf "${CHROOT_DIR}/dev/pts" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/dev" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/proc" 2>/dev/null || true
|
||||
umount -lf "${CHROOT_DIR}/sys" 2>/dev/null || true
|
||||
}
|
||||
final_cleanup
|
||||
EOF
|
||||
|
||||
chmod +x "$BUILD_DIR/build-iso.sh"
|
||||
|
Reference in New Issue
Block a user