LUNAR # Pull unpatched live-build catred@canonical:~/code/live-build$ git status On branch applied/ubuntu/lunar Your branch is up to date with 'origin/applied/ubuntu/lunar'. Untracked files: (use "git add ..." to include in what will be committed) lb_chroot_archives-preferences_test.patch nothing added to commit but untracked files present (use "git add" to track) catred@canonical:~/code/live-build$ quilt import lb_chroot_archives-preferences_test.patch Importing patch lb_chroot_archives-preferences_test.patch (stored as patches/lb_chroot_archives-preferences_test.patch) catred@canonical:~/code/live-build$ quilt push Applying patch patches/lb_chroot_archives-preferences_test.patch patching file scripts/build/lb_chroot patching file scripts/build/lb_chroot_create_preferences Now at patch patches/lb_chroot_archives-preferences_test.patch # Create an image using unpatched live-build catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ export LIVECD_ROOTFS_DIR="/home/catred/code/livecd-rootfs" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ export LIVECD_ROOTFS_LOCAL_DIR="/home/catred/code/livecd-rootfs" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ export LIVE_BUILD_DIR="/home/catred/code/live-build" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ ubuntu-bartender --build-provider aws --livecd-rootfs-branch ubuntu/lunarmaster -- --series lunar --project ubuntu-cpc --image-target disk-image --subproject minimized Sourcing configuration file: /home/catred/.ubuntu-bartender.rc Creating fair-shiner-ubuntu-bartender on AWS... with profile default in region us-east-1 using catred-cpc-jenkins keypair Preparing ingredients... in /home/catred/ubuntu-bartender-multipass.ph1jlklwyQ LIVECD_ROOTFS_DIR is set, copying /home/catred/code/livecd-rootfs to /home/catred/ubuntu-bartender-multipass.ph1jlklwyQ/livecd-rootfs ... LIVE_BUILD_DIR is set, copying /home/catred/code/live-build to /home/catred/ubuntu-bartender-multipass.ph1jlklwyQ/live-build ... UBUNTU_OLD_FASHIONED_DIR is set, copying /home/catred/code/ubuntu-old-fashioned to /home/catred/ubuntu-bartender-multipass.ph1jlklwyQ/ubuntu-old-fashioned ... uploading ingredients.tar.gz to fair-shiner-ubuntu-bartender ... extracting ingredients.tar.gz in fair-shiner-ubuntu-bartender ... remove ingredients.tar.gz in fair-shiner-ubuntu-bartender as it is no longer required ... removed 'ingredients.tar.gz' Mixing drink... (See progress in fair-shiner-ubuntu-bartender.log) Pouring fair-shiner-ubuntu-on-the-rocks.tar.gz... Cleaning up... Destroying fair-shiner-ubuntu-bartender on AWS... catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ grep 'Creating dummy preferences' fair-shiner-ubuntu-bartender.log + Echo_message Creating dummy preferences.d files... + STRING=Creating dummy preferences.d files... P:+ printf Creating dummy preferences.d files...\n Creating dummy preferences.d files... # Download and extract the patched live-build # Add testing patch to live-build so behaviour is apparent catred@canonical:~/packaging/cpc3057backport/lunar/live-build$ quilt import ~/code/live-build/lb_chroot_archives-preferences_test.patch Importing patch /home/catred/code/live-build/lb_chroot_archives-preferences_test.patch (stored as patches/lb_chroot_archives-preferences_test.patch) catred@canonical:~/packaging/cpc3057backport/lunar/live-build$ quilt push Applying patch patches/lb_chroot_archives-preferences_test.patch patching file scripts/build/lb_chroot patching file scripts/build/lb_chroot_create_preferences Now at patch patches/lb_chroot_archives-preferences_test.patch # Create an image using unpatched live-build catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ export LIVECD_ROOTFS_DIR="/home/catred/code/livecd-rootfs" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ export LIVECD_ROOTFS_LOCAL_DIR="/home/catred/code/livecd-rootfs" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ export LIVE_BUILD_DIR="/home/catred/packaging/cpc3057backport/lunar/live-build" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ ubuntu-bartender --build-provider aws --livecd-rootfs-branch ubuntu/lunarmaster -- --series lunar --project ubuntu-cpc --image-target disk-image --subproject minimized Sourcing configuration file: /home/catred/.ubuntu-bartender.rc Creating handy-gnu-ubuntu-bartender on AWS... with profile default in region us-east-1 using catred-cpc-jenkins keypair Preparing ingredients... in /home/catred/ubuntu-bartender-multipass.YAhLUSIeVC LIVECD_ROOTFS_DIR is set, copying /home/catred/code/livecd-rootfs to /home/catred/ubuntu-bartender-multipass.YAhLUSIeVC/livecd-rootfs ... LIVE_BUILD_DIR is set, copying /home/catred/packaging/cpc3057backport/lunar/live-build to /home/catred/ubuntu-bartender-multipass.YAhLUSIeVC/live-build ... UBUNTU_OLD_FASHIONED_DIR is set, copying /home/catred/code/ubuntu-old-fashioned to /home/catred/ubuntu-bartender-multipass.YAhLUSIeVC/ubuntu-old-fashioned ... uploading ingredients.tar.gz to handy-gnu-ubuntu-bartender ... extracting ingredients.tar.gz in handy-gnu-ubuntu-bartender ... remove ingredients.tar.gz in handy-gnu-ubuntu-bartender as it is no longer required ... removed 'ingredients.tar.gz' Mixing drink... (See progress in handy-gnu-ubuntu-bartender.log) Pouring handy-gnu-ubuntu-on-the-rocks.tar.gz... Cleaning up... Destroying handy-gnu-ubuntu-bartender on AWS... catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ grep 'Creating dummy preferences' handy-gnu-ubuntu-bartender.log + Echo_message Creating dummy preferences.d files... + STRING=Creating dummy preferences.d files... P:+ printf Creating dummy preferences.d files...\n Creating dummy preferences.d files... # Mount the two images catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ tar xvzf fair-shiner-ubuntu-on-the-rocks.tar.gz catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ mv build.output build.output-unpatched catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ tar xvzf handy-gnu-ubuntu-on-the-rocks.tar.gz catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ mv build.output build.output-patched catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ mkdir --parents --verbose ./mount-unpatched && sudo mount ./build.output-unpatched/livecd.ubuntu-cpc.ext4 ./mount-unpatched catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ mkdir --parents --verbose ./mount-patched && sudo mount ./build.output-patched/livecd.ubuntu-cpc.ext4 ./mount-patched # Diff manifests (should be identical -- they were) catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ diff build.output-patched/livecd.ubuntu-cpc.manifest build.output-unpatched/livecd.ubuntu-cpc.manifest # Create and diff filelists (patched version will have /etc/apt/preferences.d/99dummy; unpatched will not) catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ (cd "./mount-unpatched" && sudo find -xdev) > "unpatched.filelist" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ sort unpatched.filelist > unpatched.filelist.sorted catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ (cd "./mount-patched" && sudo find -xdev) > "patched.filelist" catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ sort patched.filelist > patched.filelist.sorted catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ diff patched.filelist.sorted unpatched.filelist.sorted 249d248 < ./etc/apt/preferences.d/99dummy # Collect artifacts catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ sudo umount ./mount-unpatched catred@canonical:~/builds/live-build-3057/patch_validation/lunar$ sudo umount ./mount-patched catred@canonical:~/builds/live-build-3057/patch_validation$ tar czf lp2033308-lunar-validation.tar.gz lunar