changes for day

1 files changed, 17 insertions, 11 deletions

diff --git a/preseed.cfg b/preseed.cfg
index 41ccb20..b11ad14 100644
--- a/preseed.cfg
+++ b/preseed.cfg
@@ -10,6 +10,7 @@
 #    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
 # 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.0.0-beta_amd64_DVD.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}";
@@ -66,15 +67,17 @@ d-i apt-setup/cdrom/set-first boolean false
 d-i apt-setup/cdrom/set-next boolean false
 
 # my repos and ceres
-d-i apt-setup/local0/comment string smith122deb
-d-i apt-setup/local0/key string http://albion320.no-ip.biz/smith122/repo/deb/smith122deb.gpg
+d-i apt-setup/local0/comment    string smith122deb
+d-i apt-setup/local0/key        string http://albion320.no-ip.biz/smith122/repo/deb/smith122deb.gpg
 d-i apt-setup/local0/repository string http://albion320.no-ip.biz/smith122/repo/deb/ /
-d-i apt-setup/local1/comment string devuan-deb
-d-i apt-setup/local1/key string http://albion320.no-ip.biz/smith122/repo/deb/smith122deb.gpg
+d-i apt-setup/local1/comment    string devuan-deb
+d-i apt-setup/local1/key        string http://albion320.no-ip.biz/smith122/repo/deb/smith122deb.gpg
 d-i apt-setup/local1/repository string http://albion320.no-ip.biz/smith122/repo/devuan-deb/ /
-d-i apt-setup/local2/comment string ceres
-d-i apt-setup/local2/key string https://pkgmaster.devuan.org/merged/dists/ceres/Release.gpg
-d-i apt-setup/local2/repository string http://pkgmaster.devuan.org/merged ceres main contrib non-free
+d-i apt-setup/local2/comment    string ceres
+d-i apt-setup/local2/key        string http://albion320.no-ip.biz/mirror/devuan/dists/ceres/Release.gpg
+d-i apt-setup/local2/repository string http://albion320.no-ip.biz/mirror/devuan ceres main contrib non-free
+#d-i apt-setup/local2/key        string http://pkgmaster.devuan.org/merged/dists/ceres/Release.gpg
+#d-i apt-setup/local2/repository string http://pkgmaster.devuan.org/merged ceres main contrib non-free
 # if for some reason I really need to turn off the gpg key check:
 #d-i debian-installer/allow_unauthenticated boolean false
 
@@ -85,7 +88,7 @@ tasksel tasksel/first multiselect standard, ssh-server
 d-i pkgsel/include string \
    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.1-1 openssh-server \
+   mlocate net-tools nfs-common ntpdate oddjob-mkhomedir=0.0.1-1 openssh-server \
    p7zip palemoon palemoon-ublock-origin parted qemu-guest-agent rsync scite \
    screen spice-vdagent strace sudo tcpdump vim vlc volumeicon-alsa waterfox \
    xfce4-terminal xfe xserver-xorg-video-qxl
@@ -154,10 +157,13 @@ d-i openssh-server/password-authentication	boolean	true
 d-i openssh-server/permit-root-login	boolean	false
 
 # Remove consolekit from ceres, which disrupts /boot/grub/local/*mo files, that grub-install wants.
-d-i preseed/late_command string in-target apt-get purge -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" consolekit exim4\* lxqt\* ; \
-   apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" postfix ; \
+d-i preseed/late_command string in-target apt-get purge -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" consolekit exim4\* lxqt\* udev ; \
    in-target grub-install /dev/vda ; in-target update-grub ; \
    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 su bgirton-local -c "sudo /usr/bin/bgconf.py" 1>/root/clone.log 2>&1 ; \
    in-target sed -i -r -e '/^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
\ No newline at end of file
+   in-target sed -i -r -e '$aT0:23:respawn:/sbin/getty -L ttyS0 9600 vt100' /etc/inittab ; \
+   in-target mkdir -p /mnt/public /mnt/bgirton ; in-target mount -v /mnt/public ; mount -v /mnt/bgirton ; \
+   in-target /mnt/public/Support/Platforms/devuan/set-my-repos.sh ; \
+   in-target install -m0644 /mnt/public/Support/Platforms/devuan/sources.list /etc/apt/sources.list ; \
+   in-target apt-get install -q -y -o Dpkg::Options::="--force-confdef" -o Dpkg::Options::="--force-confold" postfix ;