various fixes

[distro-setup] / distro-end

diff --git a/distro-end b/distro-end
index d72adea591e501549cfd1669e4fd6c210dd31fd0..41b9104d436fa75d6d960e1d7cb78e528957cb1f 100755 (executable)
--- a/distro-end
+++ b/distro-end
@@ -922,11 +922,35 @@ deb http://us.archive.ubuntu.com/ubuntu/ xenial-updates main
 deb http://us.archive.ubuntu.com/ubuntu/ xenial-security main
 EOF
     curl http://archive.ubuntu.com/ubuntu/project/ubuntu-archive-keyring.gpg | s apt-key add -
+
+    s dd of=/etc/apt/preferences.d/flidas-bionic <<EOF
+Package: *
+Pin: release a=bionic
+Pin-Priority: -100
+
+Package: *
+Pin: release a=bionic-updates
+Pin-Priority: -100
+
+Package: *
+Pin: release a=bionic-security
+Pin-Priority: -100
+EOF
+
+    # this will be needed if we want to pin something,
+    # but until then, better off disabled
+#     s dd of=/etc/apt/sources.list.d/bionic.list 2>/dev/null <<EOF
+# deb http://us.archive.ubuntu.com/ubuntu/ bionic main
+# deb http://us.archive.ubuntu.com/ubuntu/ bionic-updates main
+# deb http://us.archive.ubuntu.com/ubuntu/ bionic-security main
+# EOF
+
+
     p update
 
     t=$(mktemp -d)
     cd $t
-    aptitude download debootstrap
+    aptitude download debootstrap/xenial
     ex *
     ex data.tar.gz
     s cp ./usr/share/debootstrap/scripts/* /usr/share/debootstrap/scripts