From b8d49ab662393f479cb412583f9a2ffd476226d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Mon, 8 Mar 2021 21:14:21 +0100 Subject: [PATCH 1/9] zzz --- kubuntu/computertruhe.seed | 24 ++++++++++++------------ kubuntu/kubuntu_late_command.sh | 5 +---- 2 files changed, 13 insertions(+), 16 deletions(-) diff --git a/kubuntu/computertruhe.seed b/kubuntu/computertruhe.seed index c10278d..aa564c5 100644 --- a/kubuntu/computertruhe.seed +++ b/kubuntu/computertruhe.seed @@ -40,24 +40,24 @@ d-i apt-setup/extras boolean true #d-i partman-auto/choose_recipe select atomic #d-i partman/default_filesystem string ext3 -#d-i partman/choose_partition select finish +d-i partman/choose_partition select finish # If one of the disks that are going to be automatically partitioned # contains an old LVM configuration, the user will normally receive a # warning. This can be preseeded away... -#d-i partman-lvm/device_remove_lvm boolean true +d-i partman-lvm/device_remove_lvm boolean true # The same applies to pre-existing software RAID array: -#d-i partman-md/device_remove_md boolean true +d-i partman-md/device_remove_md boolean true # And the same goes for the confirmation to write the lvm partitions. -#d-i partman-lvm/confirm boolean true -#d-i partman-lvm/confirm_nooverwrite boolean true +d-i partman-lvm/confirm boolean true +d-i partman-lvm/confirm_nooverwrite boolean true # Just in case, the positive answer to all other imagineable conformation questions: -#d-i partman-partitioning/confirm_write_new_label boolean true -#d-i partman/confirm boolean true -#d-i partman/confirm_nooverwrite boolean true -#d-i partman/confirm_write_new_label boolean true -#d-i partman-md/confirm boolean true +d-i partman-partitioning/confirm_write_new_label boolean true +d-i partman/confirm boolean true +d-i partman/confirm_nooverwrite boolean true +d-i partman/confirm_write_new_label boolean true +d-i partman-md/confirm boolean true # Time d-i time/zone string Europe/Berlin @@ -123,7 +123,7 @@ ubiquity ubiquity/keep-installed string icedtea6-plugin openoffice.org # packages and run commands in the target system. #d-i preseed/late_command string apt-install zsh; in-target chsh -s /bin/zsh # Script am Ende -d-i preseed/late_command string wget -O - http://netboot/kubuntu_late_command.sh | bash +#d-i preseed/late_command string wget -O - http://netboot/kubuntu_late_command.sh | bash # on target: -#d-i preseed/late_command string chroot /target bash /cdrom/setup/install/settings.sh +d-i preseed/late_command string chroot /target bash /cdrom/preseed/kubuntu_late_command.sh diff --git a/kubuntu/kubuntu_late_command.sh b/kubuntu/kubuntu_late_command.sh index 54ed89c..b7d69f8 100644 --- a/kubuntu/kubuntu_late_command.sh +++ b/kubuntu/kubuntu_late_command.sh @@ -10,7 +10,7 @@ export DEBIAN_FRONTEND=noninteractive DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive # Linux distro -script_distro='Linux Mint 20' +script_distro='Kubuntu Linux 20.4.0' # Additional packages packages=( @@ -177,9 +177,6 @@ force-confold force-confdef DPKG -e "Besten Spiegelserver für '${script_distro}' auswählen …" -mint-switch-to-local-mirror - e "Paketquellen aktualisieren …" apt update --yes --quiet From 91166daba89405e91528c117e3d7dbc4285f568d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Mon, 29 Mar 2021 19:50:45 +0200 Subject: [PATCH 2/9] proxy --- kubuntu/kubuntu_late_command.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/kubuntu/kubuntu_late_command.sh b/kubuntu/kubuntu_late_command.sh index b7d69f8..17c58e0 100644 --- a/kubuntu/kubuntu_late_command.sh +++ b/kubuntu/kubuntu_late_command.sh @@ -8,6 +8,9 @@ ### export DEBIAN_FRONTEND=noninteractive DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive +# ChCh apt proxy +export http_proxy=http://apt-proxy:3142 + # Linux distro script_distro='Kubuntu Linux 20.4.0' From 9735d4027650098279f6670d79eec4fcc7416814 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Fri, 2 Apr 2021 17:02:59 +0200 Subject: [PATCH 3/9] proxy in apt eingebaut --- kubuntu/kubuntu_late_command.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/kubuntu/kubuntu_late_command.sh b/kubuntu/kubuntu_late_command.sh index 17c58e0..de9f91f 100644 --- a/kubuntu/kubuntu_late_command.sh +++ b/kubuntu/kubuntu_late_command.sh @@ -8,8 +8,10 @@ ### export DEBIAN_FRONTEND=noninteractive DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive -# ChCh apt proxy -export http_proxy=http://apt-proxy:3142 + +# ChCh apt proxy benutzen + +echo 'Acquire::http::Proxy "http://172.23.92.240:3142";' > /etc/apt/apt.conf.d/00aptproxy # Linux distro @@ -30,7 +32,7 @@ packages=( keepassxc # Games - 0ad + #0ad beneath-a-steel-sky billard-gl blobby @@ -62,7 +64,8 @@ packages=( winetricks # System management - gparted + kpartx + oem-config # Tools f3 @@ -119,9 +122,9 @@ packages=( language-selector-common openoffice.org-hyphenation language-pack-ar - language-pack-gnome-ar + #language-pack-gnome-ar language-pack-fa - language-pack-gnome-fa + #language-pack-gnome-fa ) ### @@ -228,5 +231,8 @@ dconf update ### # Finalisation ### +e "Apt proxy wieder entfernen..." +rm /etc/apt/apt.conf.d/00aptproxy + e "Initiales Setup beendet." oem-config-prepare From f4708b897d6c73036a038bd6670cf45f4f088786 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Mon, 5 Apr 2021 20:32:51 +0200 Subject: [PATCH 4/9] apthttp --- kubuntu/kubuntu_late_command.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kubuntu/kubuntu_late_command.sh b/kubuntu/kubuntu_late_command.sh index de9f91f..a80fa54 100644 --- a/kubuntu/kubuntu_late_command.sh +++ b/kubuntu/kubuntu_late_command.sh @@ -11,7 +11,8 @@ DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive # ChCh apt proxy benutzen -echo 'Acquire::http::Proxy "http://172.23.92.240:3142";' > /etc/apt/apt.conf.d/00aptproxy +echo 'Acquire::https::Proxy "http://172.23.92.240:3142";' > /etc/apt/apt.conf.d/01aptproxy +echo 'Acquire::http::Proxy "http://172.23.92.240:3142";' >> /etc/apt/apt.conf.d/01aptproxy # Linux distro @@ -232,7 +233,7 @@ dconf update # Finalisation ### e "Apt proxy wieder entfernen..." -rm /etc/apt/apt.conf.d/00aptproxy +rm /etc/apt/apt.conf.d/01aptproxy e "Initiales Setup beendet." oem-config-prepare From c9b64f029aaf53369686da885f0b141c6ca30443 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Wed, 7 Apr 2021 14:16:18 +0200 Subject: [PATCH 5/9] =?UTF-8?q?Bedingte=20Ausf=C3=BChrung=20von=20Apt-prox?= =?UTF-8?q?y?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubuntu/kubuntu_late_command.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/kubuntu/kubuntu_late_command.sh b/kubuntu/kubuntu_late_command.sh index a80fa54..5b5112a 100644 --- a/kubuntu/kubuntu_late_command.sh +++ b/kubuntu/kubuntu_late_command.sh @@ -9,11 +9,11 @@ export DEBIAN_FRONTEND=noninteractive DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive -# ChCh apt proxy benutzen - -echo 'Acquire::https::Proxy "http://172.23.92.240:3142";' > /etc/apt/apt.conf.d/01aptproxy -echo 'Acquire::http::Proxy "http://172.23.92.240:3142";' >> /etc/apt/apt.conf.d/01aptproxy - +# ChCh apt proxy benutzen (bedingt = wenn da) +if [ ping -n 1 apt-cache ]; then + echo 'Acquire::https::Proxy "http://apt-cache:3142";' > /etc/apt/apt.conf.d/01aptproxy + echo 'Acquire::http::Proxy "http://apt-cache:3142";' >> /etc/apt/apt.conf.d/01aptproxy +fi # Linux distro script_distro='Kubuntu Linux 20.4.0' From b59d74f0fd2562d6f484d3a13b40f9728f17f917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Fri, 16 Apr 2021 19:00:01 +0200 Subject: [PATCH 6/9] =?UTF-8?q?apt=20proxy=20hei=C3=9Ft=20er?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kubuntu/kubuntu_late_command.sh | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/kubuntu/kubuntu_late_command.sh b/kubuntu/kubuntu_late_command.sh index 5b5112a..3eb9093 100644 --- a/kubuntu/kubuntu_late_command.sh +++ b/kubuntu/kubuntu_late_command.sh @@ -10,9 +10,13 @@ export DEBIAN_FRONTEND=noninteractive DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive # ChCh apt proxy benutzen (bedingt = wenn da) -if [ ping -n 1 apt-cache ]; then - echo 'Acquire::https::Proxy "http://apt-cache:3142";' > /etc/apt/apt.conf.d/01aptproxy - echo 'Acquire::http::Proxy "http://apt-cache:3142";' >> /etc/apt/apt.conf.d/01aptproxy +ping -c 1 apt-proxy +if [ "$?" -eq "0" ]; then + echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy + echo 'Acquire::http::Proxy "http://apt-proxy:3142";' >> /etc/apt/apt.conf.d/01aptproxy + e "Proxy Apt-Aktiv" +else + e "Kein Apt-Proxy" fi # Linux distro From d1aa897abfd29125d7f0c62bcfe5a76c12403a3e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Sat, 17 Apr 2021 21:10:59 +0200 Subject: [PATCH 7/9] Apt ohne sync. ping test geht nun --- kubuntu/kubuntu_late_command.sh | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/kubuntu/kubuntu_late_command.sh b/kubuntu/kubuntu_late_command.sh index 3eb9093..b35bb80 100644 --- a/kubuntu/kubuntu_late_command.sh +++ b/kubuntu/kubuntu_late_command.sh @@ -9,16 +9,6 @@ export DEBIAN_FRONTEND=noninteractive DPKG_CFG_FRAGMENT=/etc/dpkg/dpkg.cfg.d/non-interactive -# ChCh apt proxy benutzen (bedingt = wenn da) -ping -c 1 apt-proxy -if [ "$?" -eq "0" ]; then - echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy - echo 'Acquire::http::Proxy "http://apt-proxy:3142";' >> /etc/apt/apt.conf.d/01aptproxy - e "Proxy Apt-Aktiv" -else - e "Kein Apt-Proxy" -fi - # Linux distro script_distro='Kubuntu Linux 20.4.0' @@ -179,6 +169,18 @@ echo "\ " e "Starte initiales Setup für Rechner mit frisch installiertem '${script_distro}' …" +# ChCh apt proxy benutzen (bedingt = wenn da) +ping -c 1 apt-proxy +if [ "$?" -eq "0" ]; then + echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy + echo 'Acquire::http::Proxy "http://apt-proxy:3142";' >> /etc/apt/apt.conf.d/01aptproxy + e "Proxy Apt-Aktiv" +else + e "Kein Apt-Proxy" +fi +echo 'Dpkg::Options "--force-unsafe-io";' >> /etc/apt/apt.conf.d/01aptproxy + + ### # Automatic installation ### From c6932bb9ca6da3a12959969de4bbb09f384b59f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Sat, 24 Apr 2021 13:46:23 +0200 Subject: [PATCH 8/9] Passwort von oem auf oem --- kubuntu/computertruhe.seed | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/kubuntu/computertruhe.seed b/kubuntu/computertruhe.seed index aa564c5..c228d9e 100644 --- a/kubuntu/computertruhe.seed +++ b/kubuntu/computertruhe.seed @@ -76,10 +76,11 @@ d-i mirror/http/proxy string http://apt-proxy:3142 # LinuxMint will *demand* a user during installation, ignoring the value # of the passwd/make-user flag, so we need to provide the user data here. # You should not preseed the password in clear text, this is just an example! +# Set to 'oem' d-i passwd/user-fullname string OEM d-i passwd/username string oem -d-i passwd/user-password-crypted password $6$8Wk7hOnUGc1ffBRY$nefXDPeChvZGK3B/bA4Hzv91sOU8IqmXE4IJATV.BRFtaWJtBQqJKtBQO.e092nf4Jg1.4L2TH5TaLtFy02x1. -d-i passwd/user-password-again password $6$8Wk7hOnUGc1ffBRY$nefXDPeChvZGK3B/bA4Hzv91sOU8IqmXE4IJATV.BRFtaWJtBQqJKtBQO.e092nf4Jg1.4L2TH5TaLtFy02x1. +d-i passwd/user-password-crypted password $6$VxY8Sv9YSjh6nfrd$pIxEGR3UjMLQ5bjtw4AOU/SMD8BZmGzSWDhA6hJvnOyQdKZty3Yvpsms.3Nty28SQEMcwVFEESjYbZuut0X6I0. +d-i passwd/user-password-again password $6$VxY8Sv9YSjh6nfrd$pIxEGR3UjMLQ5bjtw4AOU/SMD8BZmGzSWDhA6hJvnOyQdKZty3Yvpsms.3Nty28SQEMcwVFEESjYbZuut0X6I0. d-i passwd/root-login boolean false d-i user-setup/encrypt-home boolean false d-i user-setup/allow-password-weak boolean true From f1743ea11b5113a84850f47004ca5842525b85ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20K=C3=B6pferl?= Date: Sun, 2 May 2021 20:27:33 +0200 Subject: [PATCH 9/9] Mint-Skript ebenfalls mit oem-config ausgestattet und apt-proxy verwenden, falls da --- mint/linux_mint.sh | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/mint/linux_mint.sh b/mint/linux_mint.sh index dd904ff..f1823d5 100755 --- a/mint/linux_mint.sh +++ b/mint/linux_mint.sh @@ -18,6 +18,7 @@ packages=( gimp inkscape pinta + krita # Office libreoffice @@ -26,7 +27,7 @@ packages=( keepassxc # Games - 0ad + #0ad beneath-a-steel-sky billard-gl blobby @@ -59,6 +60,7 @@ packages=( # System management gparted + oem-config # Tools f3 @@ -167,6 +169,18 @@ echo "\ " e "Starte initiales Setup für Rechner mit frisch installiertem '${script_distro}' …" +# apt proxy benutzen (bedingt = wenn da) +ping -c 1 apt-proxy +if [ "$?" -eq "0" ]; then + echo 'Acquire::https::Proxy "http://apt-proxy:3142";' > /etc/apt/apt.conf.d/01aptproxy + echo 'Acquire::http::Proxy "http://apt-proxy:3142";' >> /etc/apt/apt.conf.d/01aptproxy + e "Proxy Apt-Aktiv" +else + e "Kein Apt-Proxy" +fi +echo 'Dpkg::Options "--force-unsafe-io";' >> /etc/apt/apt.conf.d/01aptproxy + + ### # Automatic installation ### @@ -230,4 +244,8 @@ dconf update ### # Finalisation ### +e "Apt proxy wieder entfernen..." +rm /etc/apt/apt.conf.d/01aptproxy + e "Initiales Setup beendet." +oem-config-prepare