changes for day

1 files changed, 22 insertions, 26 deletions

diff --git a/preseed.cfg b/preseed.cfg
index 6aa2723..10331e8 100644
--- a/preseed.cfg
+++ b/preseed.cfg
@@ -10,10 +10,11 @@
 #    2017-08-08 Added notifyemail to --extra-args
 #    2017-10-29 major revision to use local repository
 #    2019-06-25 fork from centos7-ks.cfg
-#    2019-12-29 fix up repos and in-target conclusion stuff
+#    2018-12-29 fix up repos and in-target conclusion stuff
 #    2020-02-27 heavy rewrite to use ascii 2.1
+#    2021-05-16 bump to chimaera which upgrades self to ceres
 # Usage with virt-install:
-#    vm=d2-04a ; time sudo virt-install -n "${vm}" --memory 2048 --vcpus=1 --os-variant=debiantesting -v --disk path=/var/lib/libvirt/images/"${vm}".qcow2,size=20 -l /mnt/public/Support/SetupsBig/Linux/devuan_ascii_2.1_amd64_dvd-1.iso --initrd-inject=/mnt/public/Support/Platforms/devuan/preseed/preseed.cfg --extra-args "hostname=${vm} NOTIFYEMAIL=bgstack15@gmail.com interface=auto" --debug --network type=bridge,source=br0 --noautoconsole
+#    vm=d2-04a ; time sudo virt-install -n "${vm}" --memory 2048 --vcpus=1 --os-variant=debiantesting -v --disk path=/var/lib/libvirt/images/"${vm}".qcow2,size=20 -l /mnt/public/Support/SetupsBig/Linux/devuan_chimaera_4.0.alpha-20210510_amd64_netinstall.iso --initrd-inject=/mnt/public/Support/Platforms/devuan/preseed/preseed.cfg --extra-args "hostname=${vm} NOTIFYEMAIL=bgstack15@gmail.com interface=auto" --debug --network type=bridge,source=br0 --noautoconsole
 #    vm=d2-04a; sudo virsh destroy "${vm}"; sudo virsh undefine --remove-all-storage "${vm}";
 # Reference:
 #    https://sysadmin.compxtreme.ro/automatically-set-the-hostname-during-kickstart-installation/
@@ -36,10 +37,10 @@
 #    sudo debconf-get-selections -c /mnt/public/Support/Platforms/devuan/preseed/preseed.cfg
 #    on d2-03a: sudo debconf-get-selections --installer
 #    https://serverfault.com/questions/593388/unable-to-nfs-mount-in-debian-preseed-target/593389
+#    https://preseed.debian.net/debian-preseed/sid/amd64-main-full.txt
 # Improve:
 #    discover how to send email, using postfix or sendmail. Don't care which, but exclude exim4.
 #    echo "$( hostname ) has IP $( ip -4 -o a s eth0 | awk '{print $4}' | sed -r -e 's/\/.*$//' )" | 
-#    2020-02-24 add the kernel lines: console=ttyS0 console=tty1. Get this to work; use grub.cfg and "linux" line, not "kernel"
 
 d-i debian-installer/country string US
 d-i debian-installer/keymap select us
@@ -59,6 +60,7 @@ d-i hw-detect/load_firmware boolean false
 
 #d-i apt-setup/enable-source-repositories boolean false
 # ORIGINAL d-i apt-setup/services-select multiselect security updates, release updates, backported software
+d-i apt-setup/services-select multiselect release updates
 d-i apt-setup/contrib boolean true
 d-i apt-setup/disable-cdrom-entries boolean true
 d-i apt-setup/non-free boolean true
@@ -105,7 +107,7 @@ tasksel tasksel/first multiselect none
 #   screen spice-vdagent strace sudo tcpdump vim vlc volumeicon-alsa waterfox \
 #   xfce4-terminal xfe xserver-xorg-video-qxl fluxbox-themes-stackrpms
 #d-i pkgsel/include string cifs-utils curl grub lightdm vim sudo vlc screen p7zip nfs-common
-d-i pkgsel/include string openssh-server
+d-i pkgsel/include string openssh-server wget curl
 
 d-i pkgsel/upgrade select none
 
@@ -152,6 +154,7 @@ d-i partman-lvm/confirm_nooverwrite boolean true
 d-i partman-md/confirm_nooverwrite boolean true
 #d-i partman/mount_style select uuid
 d-i partman-partitioning/confirm_write_new_label boolean true
+d-i partman-auto-lvm/guided_size string 100%
 
 # Uncomment this to add multiarch configuration for i386
 #d-i apt-setup/multiarch string i386
@@ -172,28 +175,21 @@ d-i shared/ldapns/ldap-server	string	ldapi:///ipa.smith122.com
 d-i openssh-server/password-authentication	boolean	true
 d-i openssh-server/permit-root-login	boolean	false
 
-d-i preseed/late_command string mkdir -p /target/etc/apt/sources.list.d /target/mnt/bgirton /target/mnt/public ; cd /target/etc/apt ; \
-   in-target wget -O /Release.gpg http://albion320.no-ip.biz/mirror/devuan/dists/ceres/Release.gpg ; in-target apt-key add /Release.gpg ; \
-   echo "deb http://albion320.no-ip.biz/mirror/devuan ceres main contrib non-free" > sources.list ; \
-   in-target wget -O /smith122deb.gpg http://albion320.no-ip.biz/smith122/repo/deb/smith122deb.gpg ; in-target apt-key add /smith122deb.gpg ; \
-   echo "deb http://albion320.no-ip.biz/smith122/repo/deb/ /" > sources.list.d/smith122deb.list ; \
-   echo "deb http://albion320.no-ip.biz/smith122/repo/devuan-deb/ /" > sources.list.d/devuan-deb.list ; \
-   in-target wget -O /Release.key http://albion320.no-ip.biz/mirror/obs/Release.key ; in-target apt-key add /Release.key ; \
-   echo "deb http://albion320.no-ip.biz/mirror/obs/ /" > sources.list.d/home\:bgstack15.list ; \
+d-i preseed/late_command string mkdir -p /target/etc/apt/sources.list.d /target/mnt/bgirton /target/mnt/public /target/etc/apt/sources.list.d /target/root/input ; touch /target/etc/apt/sources.list.d/empty ; cd /target/etc/apt ; \
+   in-target apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" gpg grub-pc sudo ; \
+   in-target curl --no-progress-meter --output /root/set-local-devuan-repo.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/scripts/set-local-devuan-repo.sh ; in-target sh /root/set-local-devuan-repo.sh ; \
+   in-target curl --no-progress-meter --output /root/input/52apt-file-stackrpms.conf http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/scripts/input/52apt-file-stackrpms.conf ; in-target curl --no-progress-meter --output /root/set-my-repos.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/scripts/set-my-repos.sh ; in-target sh /root/set-my-repos.sh || : ; \
+   in-target rm /etc/apt/trusted.gpg.d/ceres.gpg || : ; \
+   in-target curl --no-progress-meter http://albion320.no-ip.biz/smith122/certs/ca-ipa.smith122.com.crt --output /usr/local/share/ca-certificates/ca-ipa.smith122.com.crt && in-target update-ca-certificates || : ; \
+   in-target apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" alsamixergui alttab bgconf bgscripts bgscripts-core ca-certificates cifs-utils curl desktop-base fluxbox fluxbox-themes-stackrpms freeipa-client freeipa-helper git grub-pc gtk3-nocsd gtk3-nooverlayscrollbar krb5-auth-dialog logout-manager man mlocate net-tools newmoon nfs-common ntpdate oddjob-mkhomedir=0.0.1-1 p7zip parted postfix qemu-guest-agent rsync scite screen spice-vdagent strace sudo tcpdump ublock-origin-combined vim vlc volumeicon-alsa xdgmenumaker xfce4-terminal xfe xserver-xorg-input-libinput xserver-xorg-video-qxl ; \
+   in-target apt-mark hold oddjob-mkhomedir ; \
+   rm -f /target/etc/apt/sources.list.d/empty || : ; \
+   in-target sed -i -r -e '/^\s*linux/s/(\s*console=.{1,7}[0-9])*\s*$/ console=tty0 console=ttyS0/;' /boot/grub/grub.cfg || : ; \
+   in-target sed -i -r -e '/^\s*kernel/s/(\s*console=.{1,7}[0-9])*\s*$/ console=tty0 console=ttyS0/;' /boot/grub/menu.lst || : ; \
+   in-target sed -i -r -e '$aT0:23:respawn:/sbin/getty -L ttyS0 9600 vt100' /etc/inittab ; \
    in-target apt-get update ; \
    in-target apt-get purge -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" consolekit exim4\* lxqt\* udev ; \
-   in-target apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" alsamixergui alttab apt-transport-https bgconf bgscripts bgscripts-core cifs-utils curl fluxbox freeipa-client git grub lightdm lightdm-gtk-greeter mlocate net-tools nfs-common ntpdate oddjob-mkhomedir=0.0.1-1 openssh-server p7zip palemoon-ublock-origin parted qemu-guest-agent rsync scite screen spice-vdagent strace sudo tcpdump vim vlc volumeicon-alsa xfce4-terminal xfe xserver-xorg-video-qxl fluxbox-themes-stackrpms xdgmenumaker man logout-manager freeipa-helper krb5-auth-dialog gtk3-nocsd gtk3-nooverlayscrollbar ; \
-   in-target apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" palemoon waterfox ; \
-   in-target wget http://albion320.no-ip.biz/smith122/certs/ca-ipa.smith122.com.crt -O /usr/local/share/ca-certificates/ca-ipa.smith122.com.crt && update-ca-certificates || : ; \
+   in-target curl --no-progress-meter --output /root/lightdm-elogind.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/scripts/lightdm-elogind.sh ; in-target sh /root/lightdm-elogind.sh -y ; \
    in-target su bgirton-local -c "sudo /usr/bin/bgconf.py -d 10 1>/home/bgirton-local/clone.log 2>&1" ; \
-   in-target wget -O /root/set-my-repos.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/set-my-repos.sh ; in-target sh /root/set-my-repos.sh ; \
-   in-target wget -O /root/lightdm-elogind.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/lightdm-elogind.sh ; in-target sh /root/lightdm-elogind.sh ; \
-   in-target wget -O /root/set-local-devuan-repo.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/set-local-devuan-repo.sh ; in-target sh /root/set-local-devuan-repo.sh ; \
-   in-target apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" postfix ; \
-   in-target wget -O /root/update-devuan.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/update-devuan.sh ; in-target sh /root/update-devuan.sh preseed ; \
-   in-target sed -i -r -e '/^\s*linux/s/(\s*console=.{1,7}[0-9])*\s*$/ console=tty0 console=ttyS0/;' /boot/grub/grub.cfg | grep -E '^\s*linux' ; \
-   in-target sed -i -r -e '/^\s*kernel/s/(\s*console=.{1,7}[0-9])*\s*$/ console=tty0 console=ttyS0/;' /boot/grub/menu.lst ; \
-   in-target sed -i -r -e '$aT0:23:respawn:/sbin/getty -L ttyS0 9600 vt100' /etc/inittab ;
-
-#### SHOULDN'T NEED THIS ANYMORE
-#   in-target install -m0644 /mnt/public/Support/Platforms/devuan/sources.list /etc/apt/sources.list ; \
+   in-target wget -O /root/update-devuan.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/scripts/update-devuan.sh ; in-target sh /root/update-devuan.sh preseed ; \
+   in-target curl --no-progress-meter --output /root/send-mail-ip-address.sh http://albion320.no-ip.biz/smith122/Support/Platforms/devuan/scripts/send-mail-ip-address.sh ; in-target sh /root/send-mail-ip-address.sh bgstack15@gmail.com ;