Updated images, added xubuntu offlinerepe

assemble_image.sh

@@ -4,8 +4,8 @@ set -e
 set -x
 
 image_size="7G"
-kubuntu="kubuntu-18.04.1-desktop-amd64.iso"
-xubuntu="xubuntu-18.04.1-desktop-amd64.iso"
+kubuntu="kubuntu-18.04.2-desktop-amd64.iso"
+xubuntu="xubuntu-18.04.2-desktop-amd64.iso"
 workspace="/workspace/"
 
 # mtools, ddrescure, fdisk, grub, 7z
@@ -33,16 +33,17 @@ fill_grub_config_template "$kubuntu" "KDE" "$workspace/part_files/boot/grub/grub
 fill_grub_config_template "$xubuntu" "XFCE" "$workspace/part_files/boot/grub/grub.cfg"
 
 ./create_offlinerepo.sh "$workspace/part_files/archives" "$kubuntu" $(grep '^[^#]' packages | cut -d'|' -f 2)
+./create_offlinerepo.sh "$workspace/part_files/archives" "$xubuntu" $(grep '^[^#]' packages | cut -d'|' -f 2)
 cp packages "$workspace/part_files/packages"
 echo "ubiquity ubiquity/keep-installed string $(grep '^[^#]' packages | cut -d'|' -f 2 | tr '\n' ' ')" >> "$workspace/part_files/preseed/lip.seed"
 
 rm -f "$workspace/part.img"
 truncate -s "$image_size" "$workspace/part.img"
 mkfs.vfat -n "LIPSTICK" "$workspace/part.img"
-MTOOLS_SKIP_CHECK=1 mcopy -i "$workspace/part.img" -b -s -v "$workspace/part_files"/* ::
+MTOOLS_SKIP_CHECK=1 mcopy -i "$workspace/part.img" -b -s -v "$workspace/part_files"/* "$workspace/part_files"/.git ::
 grub-mkimage --prefix "(hd0,msdos1)/boot/grub" --output "$workspace/grub.i386-pc.img" --format "i386-pc" part_msdos fat ext2 biosdisk
 dd if=/usr/lib/grub/i386-pc/boot.img of="$workspace/output.img" bs=446 count=1
 dd if="$workspace/grub.i386-pc.img" of="$workspace/output.img" bs=512 seek=1
 ddrescue --output-position=2048s --sparse "$workspace/part.img" "$workspace/output.img"
 printf "label: dos\nunit: sectors\n2048,+,b,*\n" | sfdisk "$workspace/output.img"
-echo "Used $(du -h "$workspace/part_files") of ${image_size}"
+echo "Used $(du -s -h "$workspace/part_files" | cut -f1) of ${image_size}"