changes for day

1 files changed, 10 insertions, 12 deletions

diff --git a/preseed.cfg b/preseed.cfg
index ac3bc1a..fe23418 100644
--- a/preseed.cfg
+++ b/preseed.cfg
@@ -174,30 +174,28 @@ 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
 
-# Remove consolekit from ceres, which disrupts /boot/grub/local/*mo files, that grub-install wants.
-d-i preseed/late_command string mkdir -p /target/etc/apt/sources.list.d ; cd /target/etc/apt ; \
+# gir1.2 stuff only for xdgmenumaker (<= 1.5-3)
+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://download.opensuse.org/repositories/home:/bgstack15/Debian_Unstable/ /" > sources.list.d/home\:bgstack15.list ; \
+   echo "deb http://albion320.no-ip.biz/mirror/obs/ /" > sources.list.d/home\:bgstack15.list ; \
    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 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 fluxbox-themes-stackrpms libpolkit-backend-elogind-1-0 policykit-1 lightdm lightdm-gtk-greeter ; \
+   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 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 fluxbox-themes-stackrpms xdgmenumaker gir1.2-atk-1.0 gir1.2-pango-1.0 gir1.2-gtk-3.0; \
    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 modprobe nfs ; in-target modprobe nfsv4 ; \
-   mkdir -p /target/mnt/public /target/mnt/bgirton ; in-target mount -v /mnt/public ; in-target mount -v /mnt/bgirton ; \
-   in-target /mnt/public/Support/Platforms/devuan/set-my-repos.sh ; \
-   in-target /mnt/public/Support/Platforms/devuan/lightdm-elogind.sh ; \
-   in-target /mnt/public/Support/Platforms/devuan/set-local-devuan-repo.sh ; \
-   in-target install -m0644 /mnt/public/Support/Platforms/devuan/sources.list /etc/apt/sources.list ; \
+   in-target su bgirton-local -c "sudo /usr/bin/bgconf.py" 1>$HOME/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 /mnt/public/Support/Platforms/devuan/update-devuan.sh ;
+   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 ;
 
 #   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 ; \
 #### SHOULDN'T NEED THIS ANYMORE
 #   in-target grub-install /dev/vda ; in-target update-grub ; \
+#   in-target install -m0644 /mnt/public/Support/Platforms/devuan/sources.list /etc/apt/sources.list ; \