[Confirmed] Was Install ISO structure rearranged?

satori · 2015-10-02 17:39:49

Hello,

I have a script that customizes Arch Install ISO by adding few scripts that I usually need during new system installation.

The script is based on instructions from Remastering the Install ISO

I also tried manual execution of described steps and I'm facing problems when performing unsquashfs operation, e.g.:

unsquashfs airootfs.sfs

After that, according to Wiki page I should expect

squashfs-root/airootfs.img

which I would mount and continue with cusomization.
But instead of airootfs.img file, I can see a set of directories typical for /, i.e.

bin boot dev etc home ...

Was there a change in ISO contents structure?

Here is the script if someone wants to dig into it

#!/bin/bash
#===============================================================================
# FILE:         customize_iso
#
# USAGE:        ./customize_iso
#
# DESCRIPTION:  Creates ISO based on provided Arch Linux ISO,
#               adding provided custom content
#
# TODO:         Add switch to chose i686 or/and x86_64 architecture
#===============================================================================

# Setup shell - detect unset variables
set -o nounset

#-------------------------------------------------------------------------------
# Settings adjustable using command line options
#-------------------------------------------------------------------------------

ORIGINAL_ISO="~/shared/archlinux-2014.08.01-dual.iso"
NEW_ISO="~/shared/custom-archlinux-2014.08.01-dual.iso"
WORKSPACE="~/forge/customize_iso"
CUSTOM_SRC="~/bin"
CUSTOM_DST="/root"

#-------------------------------------------------------------------------------
# Settings adjustable by editing this script
#-------------------------------------------------------------------------------

ISO_MNT_PNT="/mnt/iso"
FS_MNT_PNT="/mnt/iso_rootfs"

#-------------------------------------------------------------------------------
# Not editable (unless changed in Arch Linux)
#-------------------------------------------------------------------------------

PACKAGES="squashfs-tools cdrkit"
SFS_NAME="airootfs.sfs"
MD5_NAME="airootfs.md5"
IMG_NAME="airootfs.img"
USQ_NAME="squashfs-root"

#-------------------------------------------------------------------------------
# Functions
#-------------------------------------------------------------------------------

updatePackageList()
{
    echo "Update package list..."
    sudo pacman -Syy
    echo "Update package list...done"
}

checkPackages()
{
    echo "Check packages..."

    for pkg in $PACKAGES
    do
        pacman -Qsq $pkg &>/dev/null
        if [[ "$?" -ne 0 ]]; then
            eval "sudo pacman -S --noconfirm $pkg"
        fi
    done

    echo "Check packages...done"
}

createIsoMountPoint()
{
    echo "Create ISO mount point..."
    eval "sudo mkdir -p $ISO_MNT_PNT"
    echo "Create ISO mount point...done"
}

removeIsoMountPoint()
{
    echo "Remove ISO mount point..."
    eval "sudo rmdir $ISO_MNT_PNT"
    echo "Remove ISO mount point...done"
}

mountIso()
{
    echo "Mount ISO..."
    eval "sudo mount -t iso9660 -o loop $ORIGINAL_ISO $ISO_MNT_PNT"
    echo "Mount ISO...done"
}

unmountIso()
{
    echo "Unmount ISO..."
    eval "sudo umount $ISO_MNT_PNT"
    echo "Unmount ISO...done"
}

createWorkspaceDir()
{
    echo "Create workspace directory..."
    eval "mkdir -p $WORKSPACE"
    echo "Create workspace directory...done"
}

removeWorkspace()
{
    echo "Remove workspace..."
    eval "rm -rf $WORKSPACE"
    echo "Remove workspace...done"
}

copyIsoContents()
{
    echo "Copy ISO contents..."
    eval "cp -a $ISO_MNT_PNT $ISO_CONTENTS_DIR"
    echo "Copy ISO contents...done"
}

unsquashFs()
{
    echo "Unsquash file system..."

    local newFsPath="$1"
    local originalFsPath="$2"

    eval "mkdir -p $newFsPath"
    eval "cd $newFsPath"
    eval "unsquashfs $originalFsPath/$SFS_NAME"

    echo "Unsquash file system...done"
}

createFsImgMountPoint()
{
    echo "Create file systen image mount point..."
    eval "sudo mkdir -p $FS_MNT_PNT"
    echo "Create file systen image mount point...done"
}

removeFsImgMountPoint()
{
    echo "Remove file system image mount point..."
    eval "sudo rmdir $FS_MNT_PNT"
    echo "Remove file system image mount point...done"
}

mountFsImage()
{
    echo "Mount file system image..."
    local newFsPath="$1"
    eval "sudo mount $newFsPath/$USQ_NAME/$IMG_NAME $FS_MNT_PNT"
    echo "Mount file system image...done"
}

unmountFsImage()
{
    echo "Unmount file sytem image..."
    eval "sudo umount $FS_MNT_PNT"
    echo "Unmount file sytem image...done"
}

copyCustomContent()
{
    echo "Copy custom content..."
    eval "sudo cp -R $CUSTOM_SRC/* $FS_MNT_PNT$CUSTOM_DST"
    echo "Copy custom content...done"
}

squashNewFs()
{
    echo "Squash new file system..."
    local newFsPath="$1"
    eval "mksquashfs $newFsPath/$USQ_NAME $newFsPath/$SFS_NAME"
    echo "Squash new file system...done"
}

generateNewFsChecksum()
{
    echo "Generate new file system checksum..."
    local newFsPath="$1"
    eval "md5sum $newFsPath/$SFS_NAME > $newFsPath/$MD5_NAME"
    echo "Generate new file system checksum...done"
}

removeOriginalFsFiles()
{
    echo "Remove original file sytem files..."
    local originalFsPath="$1"
    eval "rm $originalFsPath/$SFS_NAME"
    eval "rm $originalFsPath/$MD5_NAME"
    echo "Remove original file sytem files...done"
}

copyNewFsFiles()
{
    echo "Copy new file system files..."
    local newFsPath="$1"
    local originalFsPath="$2"
    eval "cp $newFsPath/$SFS_NAME $originalFsPath/$SFS_NAME"
    eval "cp $newFsPath/$MD5_NAME $originalFsPath/$MD5_NAME"
    echo "Copy new file system files...done"
}

generateNewIso()
{
    echo "Generate new ISO..."
    eval "cd $ISO_CONTENTS_DIR"
    eval "genisoimage -l -r -J -V \"$ISO_VERSION\""\
         "-b isolinux/isolinux.bin -no-emul-boot -boot-load-size 4"\
         "-boot-info-table -c isolinux/boot.cat"\
         "-o $NEW_ISO $ISO_CONTENTS_DIR"
    echo "Generate new ISO...done"
}

prepareFileSystem()
{
    local newFsDir="$1"
    local originalFsDir="$2"

    unsquashFs $newFsDir $originalFsDir
    createFsImgMountPoint
    mountFsImage $newFsDir
    copyCustomContent
    unmountFsImage
    removeFsImgMountPoint
    squashNewFs $newFsDir
    generateNewFsChecksum $newFsDir
    removeOriginalFsFiles $originalFsDir
    copyNewFsFiles $newFsDir $originalFsDir
}

prepareFileSystemX86_64()
{
    echo "Prepare x86_64 file system..."
    prepareFileSystem $X86_64_FS_DIR $X86_64_FS_SRC
    echo "Prepare x86_64 file system...done"
}

prepareFileSystemI686()
{
    echo "Prepare i686 file system..."
    prepareFileSystem $I686_FS_DIR $I686_FS_SRC
    echo "Prepare i686 file system...done"
}

createCustomIso()
{
    echo "Create custom ISO..."
    updatePackageList
    checkPackages
    # Exit on error
    set -o errexit
    createIsoMountPoint
    mountIso
    createWorkspaceDir
    copyIsoContents
    unmountIso
    removeIsoMountPoint
    prepareFileSystemX86_64
    prepareFileSystemI686
    generateNewIso
    removeWorkspace
    echo "Create custom ISO...done"
}

query()
{
    echo "Original iso: $ORIGINAL_ISO"
    echo "New iso:      $NEW_ISO"
    echo "Workspace:    $WORKSPACE"
    echo "Custom src:   $CUSTOM_SRC"
    echo "Custom dst:   $CUSTOM_DST"
    echo "ISO ver:      $ISO_VERSION"

    read -p "Create new iso? [y/N]?" response
    case $response in
        [Yy]*)
            time { createCustomIso ; }
            ;;
        *)
            echo "Cancelled"
            exit 0
            ;;
    esac
}

usage()
{
cat << EOF
Creates ISO based on provided Arch Linux ISO, adding provided custom content

Usage: ${0##*/} [-h] [-o ORIG_ISO] [-n NEW_ISO] [-w WORKSPACE] [-s SRC] [-d DST]
    -h display this help and exit
    -o ORIG_ISO original ISO file ($ORIGINAL_ISO)
    -n NEW_ISO ISO file to be created ($NEW_ISO)
    -w WORKSPACE dir for temporary files ($WORKSPACE)
    -s SRC source dir with ISO customization content ($CUSTOM_SRC)
    -d DST dir where customization content will be available after booting ISO
       ($CUSTOM_DST)
EOF
}

#-------------------------------------------------------------------------------
# Execution
#-------------------------------------------------------------------------------

while getopts ":ho:n:w:s:d:" opt; do
    case $opt in
        h)
            usage
            exit 0
            ;;
        o)
            ORIGINAL_ISO="$OPTARG"
            ;;
        n)
            NEW_ISO="$OPTARG"
            ;;
        w)
            WORKSPACE="$OPTARG"
            ;;
        s)
            CUSTOM_SRC="$OPTARG"
            ;;
        d)
            CUSTOM_DST="$OPTARG"
            ;;
        \?)
            echo "Invalid option: -$OPTARG"
            exit 1
            ;;
        :)
            echo "Option -$OPTARG requires an argument"
            exit 2
            ;;
    esac
done

#-------------------------------------------------------------------------------
# Dependent on command line options
#-------------------------------------------------------------------------------

ORIGINAL_NAME="${ORIGINAL_ISO##*/}"
ISO_YEAR="${ORIGINAL_NAME:10:4}"
ISO_MONTH="${ORIGINAL_NAME:15:2}"
ISO_VERSION="ARCH_$ISO_YEAR$ISO_MONTH"

ISO_CONTENTS_DIR="$WORKSPACE/iso_contents"
X86_64_FS_DIR="$WORKSPACE/x86_64_fs"
I686_FS_DIR="$WORKSPACE/i686_fs"
X86_64_FS_SRC="$ISO_CONTENTS_DIR/arch/x86_64"
I686_FS_SRC="$ISO_CONTENTS_DIR/arch/i686"

query

Last edited by satori (2015-10-04 13:17:16)

ajbibb · 2015-10-02 18:54:53

I believe there was: https://bbs.archlinux.org/viewtopic.php?id=203153

I've not had a chance to play with it recently so I can't personally verify that. My own experience though is that whenever you see an Archiso update come in a pacman -Syu expect that you will have to modify your own scripts.

dif · 2015-10-02 20:51:42

Yes, there has been a hidden structure change in the latest official ISO.
You don't get airootfs.img any more afer

unsquashfs airootfs.sfs

Instead, you get an unpacked root file system tree.
What an unpleasant surprise! I mean you'll need to modify your script. And so will I mine. (If only I had the time.) But the scripts should become simpler, I think.

byte · 2015-10-02 23:57:59

If you're modifying the official ISOs you should probably also follow the arch-releng mailing list, just saying.

satori · 2015-10-04 13:16:42

Thank you all for confirmation of the change.

Of course I will need to modify the script and indeed there should be less steps required with the new layout.
It's good to know about the mailing list too, I will consider subscribing to avoid surprises like this in the future.

Arch Linux

#1 2015-10-02 17:39:49

[Confirmed] Was Install ISO structure rearranged?

#2 2015-10-02 18:54:53

Re: [Confirmed] Was Install ISO structure rearranged?

#3 2015-10-02 20:51:42

Re: [Confirmed] Was Install ISO structure rearranged?

#4 2015-10-02 23:57:59

Re: [Confirmed] Was Install ISO structure rearranged?

#5 2015-10-04 13:16:42

Re: [Confirmed] Was Install ISO structure rearranged?

Board footer