From 29076e143c1e53593c35b45f0ee1db0e8b20f38b Mon Sep 17 00:00:00 2001
From: valentin <valentinb@fsmpi.rwth-aachen.de>
Date: Sun, 17 Oct 2021 15:22:39 +0200
Subject: [PATCH] fixed bug in create_offlinerepo; remark in assemble image
---
assemble_image.sh | 3 ++-
create_offlinerepo.sh | 2 +-
packages | 2 +-
3 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/assemble_image.sh b/assemble_image.sh
index 7b23636..9f36ace 100755
--- a/assemble_image.sh
+++ b/assemble_image.sh
@@ -3,7 +3,7 @@
set -e
set -x
-image_size="6400M"
+image_size="6600M"
img1="kubuntu-20.04.3-desktop-amd64.iso"
img2="kubuntu-21.10-desktop-amd64.iso"
bootimg="$img1"
@@ -43,6 +43,7 @@ cp packages "$workspace/part_files/packages"
rm -f "$workspace/part.img"
truncate -s "$image_size" "$workspace/part.img"
mkfs.vfat -n "LIPSTICK" "$workspace/part.img"
+# Note: in *ubuntu 21.10 mcopy has a bug and option "-b" should be removed.
MTOOLS_SKIP_CHECK=1 mcopy -i "$workspace/part.img" -b -s -v "$workspace/part_files"/* "$workspace/part_files"/.git ::
rm -rf "$workspace/part_files"
grub-mkimage --prefix "(hd0,msdos1)/boot/grub" --output "$workspace/grub.i386-pc.img" --format "i386-pc" part_msdos fat ext2 biosdisk
diff --git a/create_offlinerepo.sh b/create_offlinerepo.sh
index d1cf9b9..6cd847a 100755
--- a/create_offlinerepo.sh
+++ b/create_offlinerepo.sh
@@ -36,7 +36,7 @@ apt-get -o Dir="$workspace"/offlinerepo/squashfs-root update
{
apt-get -o Dir="$workspace"/offlinerepo/squashfs-root upgrade --print-uris -qq
apt-get -o Dir="$workspace"/offlinerepo/squashfs-root install --reinstall --print-uris -qq $packages
-} | cut -d"'" -f2 | while read url; do wget -q -nc -P "$dest" "$url"; done
+} | cut -s -d"'" -f2 | while read url; do wget -q -nc -P "$dest" "$url"; done
apt-get -o Dir="$workspace"/offlinerepo/squashfs-root install --reinstall --print-uris -qq $packages
mkdir -p "$dest/dists/$DISTRIB_CODENAME/lip/binary-amd64"
diff --git a/packages b/packages
index cba47a4..8a59238 100644
--- a/packages
+++ b/packages
@@ -29,7 +29,7 @@
P |wxmaxima|wxmaxima: Graphische Benutzeroberfläche für das Maxima Computer Algebra System
p |liblapack-dev|LAPACK: Eine Standard-Numerik-Bibliothek für Physiker und Numeriker
P |spyder spyder3|spyder: Python IDE (die, die in Anaconda benutzt wird)
- P |jupyter-notebook|Python (Jupyter) Notebooks (Python 2 & 3)
+ P |jupyter-notebook|Python (Jupyter) Notebooks
i|postgresql|postgresql: Datenbank-Server. Nett um in der Datenbanken-Vorlesungen Dinge auszuprobieren
I|dia|dia: Graphisches Tool, um UML/ER Diagramme für die Vorlesungen Softwaretechnik und Datenbanken anzufertigen
I|ghc|ghc: Glaskow Haskell Compiler für die Vorlesung Programmierung
--
GitLab