diff --git a/assemble_image.sh b/assemble_image.sh index 5e591155700d75d375870154cb9d2d2f661b83ca..d5908a4bf893a8dcff207ec9cfa81c2687c6385f 100755 --- a/assemble_image.sh +++ b/assemble_image.sh @@ -3,8 +3,9 @@ set -e set -x -image_size="3G" -iso_file="ubuntu-18.04.1-desktop-amd64.iso" +image_size="5G" +kubuntu="kubuntu-18.04.1-desktop-amd64.iso" +xubuntu="xubuntu-18.04.1-desktop-amd64.iso" workspace="/workspace/" # mtools, ddrescure, fdisk, grub, 7z @@ -17,13 +18,14 @@ rsync -av /usr/share/grub/themes "$workspace/part_files"/grub mkdir -p "$workspace/part_files"/grub/fonts/ rsync -av /usr/share/grub/unicode.pf2 "$workspace/part_files"/grub/fonts/ -7z x "$iso_file" -o"$workspace/part_files" EFI/ -7z x "$iso_file" -o"$workspace/part_files" boot/grub/x86_64-efi +7z x "$kubuntu" -o"$workspace/part_files" EFI/ +7z x "$kubuntu" -o"$workspace/part_files" boot/grub/x86_64-efi mv "$workspace/part_files"/grub/* "$workspace/part_files"/boot/grub/ rm -rf "$workspace/part_files"/grub -cp "$iso_file" "$workspace/part_files/kubuntu.iso" +cp "$kubuntu" "$workspace/part_files/kubuntu.iso" +cp "$xubuntu" "$workspace/part_files/xubuntu.iso" ./create_offlinerepo.sh "$workspace/part_files/archive" "$kubuntu" $(sed '/^#/d' packages | cut -d'|' -f 2) cp packages "$workspace/part_files/packages"