Package: freedombox-setup
Severity: wishlist
Tags: patch

This patch adds a preseed file for Debian stretch. The only change from
preseed-jessie was the release name, and removing the extra repository
which is no longer required.

I also think the preseed files for wheezy and jessie can be removed, so
that change is included in the patch.
From ce9c5c5e8ee8e6c8e56db0c2bdd70ed6c06fbf72 Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalle...@mailbox.org>
Date: Tue, 24 Nov 2015 21:29:20 -0500
Subject: [PATCH 1/2] Update preseed file for stretch. Remove Petter's
 freedombox repository, since all packages are in Debian now.

---
 preseed/preseed-stretch.dat | 48 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 48 insertions(+)
 create mode 100644 preseed/preseed-stretch.dat

diff --git a/preseed/preseed-stretch.dat b/preseed/preseed-stretch.dat
new file mode 100644
index 0000000..9f0741c
--- /dev/null
+++ b/preseed/preseed-stretch.dat
@@ -0,0 +1,48 @@
+# Based on ftp://ftp.skolelinux.no/installer-wheezy.dat
+# To debug, boot with DEBCONF_DEBUG=developer as kernel argument
+
+# Skip the local user
+passwd passwd/make-user boolean false
+
+# if you want popcon enabled by default
+d-i     popularity-contest/participate boolean false
+
+# If you want to avoid the password question
+#d-i passwd/root-password-crypted password passwordhash
+
+# Avoid questions about mirrors, using manual setup
+choose-mirror-bin     mirror/codename string  stretch
+choose-mirror-bin     mirror/country          string  manual
+choose-mirror-bin     mirror/protocol select  http
+choose-mirror-bin     mirror/http/hostname    string  httpredir.debian.org
+choose-mirror-bin     mirror/http/directory   string  /debian/
+
+tasksel tasksel/first   multiselect     ssh-server
+
+# list extra packages to install here
+d-i     pkgsel/include string freedombox-setup
+
+grub-installer grub-installer/only_debian boolean true
+
+# Make sure DNS lookup work after resolvconf is installed
+# and set up the Freedombox.  Block init.d scripts from running using
+# policy-rc.d to make sure dnsmasq do not overwrite the resolv.conf
+# file we just inserted (and to keep services from starting in the chroot).
+d-i     preseed/late_command   string cp /etc/resolv.conf /target/etc/resolvconf/run/resolv.conf; SOURCE=false in-target /usr/lib/freedombox/setup
+
+# Avoid that last message about the install being complete.
+d-i finish-install/reboot_in_progress note
+
+# Set up partition, use guided with LVM, separate /var, /usr, /home, etc
+partman-auto    partman-auto/init_automatically_partition       select  60some_device_lvm__________lvm
+partman-auto    partman-auto/choose_recipe      select  /lib/partman/recipes/80multi
+partman-lvm partman-lvm/device_remove_lvm boolean true
+partman-lvm partman-lvm/confirm boolean true
+partman-lvm partman-lvm/confirm_nooverwrite boolean true
+partman partman/choose_partition Finish partitioning and write changes to disk
+# write changes
+partman partman/confirm boolean true
+partman partman/confirm_nooverwrite boolean true
+
+# Fix timezone to UTC to avoid one question during installation
+tzsetup-udeb    time/zone       select  Etc/UTC
-- 
2.6.2


From 45124a3d03b1385767d86ceb06993dfc514835c9 Mon Sep 17 00:00:00 2001
From: James Valleroy <jvalle...@mailbox.org>
Date: Tue, 24 Nov 2015 21:37:53 -0500
Subject: [PATCH 2/2] Remove preseed files for wheezy and jessie. FreedomBox
 packages are no longer available for those releases.

---
 preseed/preseed-jessie.dat | 57 ----------------------------------------------
 preseed/preseed-wheezy.dat | 56 ---------------------------------------------
 2 files changed, 113 deletions(-)
 delete mode 100644 preseed/preseed-jessie.dat
 delete mode 100644 preseed/preseed-wheezy.dat

diff --git a/preseed/preseed-jessie.dat b/preseed/preseed-jessie.dat
deleted file mode 100644
index 6b7b825..0000000
--- a/preseed/preseed-jessie.dat
+++ /dev/null
@@ -1,57 +0,0 @@
-# Based on ftp://ftp.skolelinux.no/installer-wheezy.dat
-# To debug, boot with DEBCONF_DEBUG=developer as kernel argument
-
-# Skip the local user
-passwd passwd/make-user boolean false
-
-# if you want popcon enabled by default
-d-i     popularity-contest/participate boolean false
-
-# If you want to avoid the password question
-#d-i passwd/root-password-crypted password passwordhash
-
-# Avoid questions about mirrors, using manual setup
-choose-mirror-bin     mirror/codename string  jessie
-choose-mirror-bin     mirror/country          string  manual
-choose-mirror-bin     mirror/protocol select  http
-choose-mirror-bin     mirror/http/hostname    string  httpredir.debian.org
-choose-mirror-bin     mirror/http/directory   string  /debian/
-
-# Add Petters freedombox repository
-apt-setup apt-setup/cdrom/set-first boolean false
-apt-setup apt-setup/use_mirror boolean true
-
-apt-setup apt-setup/local0/repository string http://www.reinholdtsen.name/freedombox wheezy main
-apt-setup apt-setup/local0/comment string Freedombox wheezy repository
-apt-setup apt-setup/local0/source  boolean true
-apt-setup apt-setup/local0/key     string  http://www.reinholdtsen.name/freedombox/BE1A583D.asc
-
-tasksel tasksel/first   multiselect     ssh-server
-
-# list extra packages to install here
-d-i     pkgsel/include string freedombox-setup
-
-grub-installer grub-installer/only_debian boolean true
-
-# Make sure DNS lookup work after resolvconf is installed
-# and set up the Freedombox.  Block init.d scripts from running using
-# policy-rc.d to make sure dnsmasq do not overwrite the resolv.conf
-# file we just inserted (and to keep services from starting in the chroot).
-d-i     preseed/late_command   string cp /etc/resolv.conf /target/etc/resolvconf/run/resolv.conf; SOURCE=false in-target /usr/lib/freedombox/setup
-
-# Avoid that last message about the install being complete.
-d-i finish-install/reboot_in_progress note
-
-# Set up partition, use guided with LVM, separate /var, /usr, /home, etc
-partman-auto    partman-auto/init_automatically_partition       select  60some_device_lvm__________lvm
-partman-auto    partman-auto/choose_recipe      select  /lib/partman/recipes/80multi
-partman-lvm partman-lvm/device_remove_lvm boolean true
-partman-lvm partman-lvm/confirm boolean true
-partman-lvm partman-lvm/confirm_nooverwrite boolean true
-partman partman/choose_partition Finish partitioning and write changes to disk
-# write changes
-partman partman/confirm boolean true
-partman partman/confirm_nooverwrite boolean true
-
-# Fix timezone to UTC to avoid one question during installation
-tzsetup-udeb    time/zone       select  Etc/UTC
diff --git a/preseed/preseed-wheezy.dat b/preseed/preseed-wheezy.dat
deleted file mode 100644
index bdc3a8d..0000000
--- a/preseed/preseed-wheezy.dat
+++ /dev/null
@@ -1,56 +0,0 @@
-# Based on ftp://ftp.skolelinux.no/installer-wheezy.dat
-# To debug, boot with DEBCONF_DEBUG=developer as kernel argument
-
-# Skip the local user
-passwd passwd/make-user boolean false
-
-# if you want popcon enabled by default
-d-i     popularity-contest/participate boolean false
-
-# If you want to avoid the password question
-#d-i passwd/root-password-crypted password passwordhash
-
-# Avoid questions about mirrors, using manual setup
-choose-mirror-bin     mirror/country          string  manual
-choose-mirror-bin     mirror/protocol select  http
-choose-mirror-bin     mirror/http/hostname    string  httpredir.debian.org
-choose-mirror-bin     mirror/http/directory   string  /debian/
-
-# Add Petters freedombox repository
-apt-setup apt-setup/cdrom/set-first boolean false
-apt-setup apt-setup/use_mirror boolean true
-
-apt-setup apt-setup/local0/repository string http://www.reinholdtsen.name/freedombox wheezy main
-apt-setup apt-setup/local0/comment string Freedombox wheezy repository
-apt-setup apt-setup/local0/source  boolean true
-apt-setup apt-setup/local0/key     string  http://www.reinholdtsen.name/freedombox/BE1A583D.asc
-
-tasksel tasksel/first   multiselect     ssh-server
-
-# list extra packages to install here
-d-i     pkgsel/include string freedombox-setup
-
-grub-installer grub-installer/only_debian boolean true
-
-# Make sure DNS lookup work after resolvconf is installed
-# and set up the Freedombox.  Block init.d scripts from running using
-# policy-rc.d to make sure dnsmasq do not overwrite the resolv.conf
-# file we just inserted (and to keep services from starting in the chroot).
-d-i     preseed/late_command   string cp /etc/resolv.conf /target/etc/resolvconf/run/resolv.conf; SOURCE=false in-target /usr/lib/freedombox/setup
-
-# Avoid that last message about the install being complete.
-d-i finish-install/reboot_in_progress note
-
-# Set up partition, use guided with LVM, separate /var, /usr, /home, etc
-partman-auto    partman-auto/init_automatically_partition       select  60some_device_lvm__________lvm
-partman-auto    partman-auto/choose_recipe      select  /lib/partman/recipes/80multi
-partman-lvm partman-lvm/device_remove_lvm boolean true
-partman-lvm partman-lvm/confirm boolean true
-partman-lvm partman-lvm/confirm_nooverwrite boolean true
-partman partman/choose_partition Finish partitioning and write changes to disk
-# write changes
-partman partman/confirm boolean true
-partman partman/confirm_nooverwrite boolean true
-
-# Fix timezone to UTC to avoid one question during installation
-tzsetup-udeb    time/zone       select  Etc/UTC
-- 
2.6.2

Attachment: signature.asc
Description: OpenPGP digital signature

Reply via email to