Removing a few fixmes that are not needed anymore.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>

4 files changed, 2 insertions, 26 deletions

diff --git a/share/man/container-create-debconf.1.txt b/share/man/container-create-debconf.1.txt
index 18eedbc..ecc30a6 100644
--- a/share/man/container-create-debconf.1.txt
+++ b/share/man/container-create-debconf.1.txt
@@ -54,7 +54,7 @@ The intenion of this script is to create the initial container to that extend th
 can take over.
 
 As an analogy, think of debian-installer: d-i sets up your system to make it ready to boot and connect to the network. Everything
-after that is out of scope. Same goes for this script. (FIXME)
+after that is out of scope. Same goes for this script.
 
 FUNCTIONS
 ~~~~~~~~~
@@ -72,9 +72,6 @@ This container creation script can be used under two different names: debian and
 
 Alternative, calling it under the debconf name is equal to the debian mode.
 
-INTERACTIVE/NONINTERACTIVE
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-FIXME
 
 PRESEEDING
 ~~~~~~~~~~
diff --git a/share/scripts/debconf b/share/scripts/debconf
index e13e1f0..fbabab4 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -353,7 +353,6 @@ EOF
 	fi
 
 	# Removing resolv.conf
-	# FIXME: needs to stay for the moment
 	rm -f "${DIRECTORY}/etc/resolv.conf"
 	cp /etc/resolv.conf "${DIRECTORY}/etc"
 
@@ -496,9 +495,6 @@ EOF
 		rm -f "${DIRECTORY}/preseed.cfg"
 	fi
 
-	# FIXME: All packages of priority of essential need to be reconfigured to reflect choices from preseeding
-	# -> fix: use two-stage bootstrap (foreign) and inject preseeds in between
-
 	# Manual hack to workaround broken preseeding in locales package
 	if [ -n "${PRESEED_FILE}" ]
 	then
@@ -553,16 +549,6 @@ EOF
 		fi
 	done
 
-	# FIXME: Install additional packages after lxc-support has been run.
-	# This is suboptimal, ideally we should install all packages but not run the maintainer scripts,
-	# then run lxc-support, and run the maintainer scripts. This way, lxc-support would see
-	# all the installed packages and could skip those scripts entirely when a certain package is not
-	# installed. Unfortunately, that is not possible in any reasonable way with apt.
-	# FTR: The only known workaround for now would be to first apt install --download-only all
-	# packages, then unpack them with dpkg, run lxc-support, and dpkg --configure them.
-	# For the time being, it's better to have lxc-support see no packages at all and be run before
-	# packages are installed, than the other way around.
-	# Workaround: We're running lxc-support at the end of the template again.
 	if [ -n "${PACKAGES}" ]
 	then
 		Chroot "${DIRECTORY}" "apt --option Dpkg::Options::=--force-confnew --yes install ${PACKAGES}"
@@ -792,8 +778,6 @@ Commands ()
 {
 	DIRECTORY="${1}"
 
-	# config (FIXME)
-
 	# maximum of 15 characters, prefix is 'veth-'
 	HOSTNAME_SHORT="$(echo ${NAME} | cut -c-8)"
 	HOST_INTERFACE_NAME="$(echo ${NETWORK1_VETH:-veth-${HOSTNAME_SHORT}-0})"
diff --git a/share/scripts/debconf.d/0002-preseed-debconf b/share/scripts/debconf.d/0002-preseed-debconf
index 086fffc..9aca6bf 100755
--- a/share/scripts/debconf.d/0002-preseed-debconf
+++ b/share/scripts/debconf.d/0002-preseed-debconf
@@ -58,7 +58,7 @@ do
 	# preseed file has includes
 	INCLUDE_PRESEED_FILES="$(grep '^ *compute-tools *container/include-preseed-files' ${PRESEED_FILE} | awk '{ $1=$2=$3=""; print $0 }' | sed -e 's|,| |g')"
 
-	# FIXME: we're supporting only *ONE* include layer for now, so no nested/recursive includes just yet
+	# only one include layer is supported, no nested/recursive includes
 	for FILE in ${INCLUDE_PRESEED_FILES}
 	do
 		if [ -e "${FILE}" ]
diff --git a/share/scripts/debconf.d/0003-debconf b/share/scripts/debconf.d/0003-debconf
index d7a1e35..684261a 100755
--- a/share/scripts/debconf.d/0003-debconf
+++ b/share/scripts/debconf.d/0003-debconf
@@ -669,11 +669,6 @@ EOF
 
 Network_defaults ()
 {
-	# FIXME:
-	#   * use interfaces.d where possible
-	#   * respect pre-existing interfaces (or interfaces.d)
-	#   * add support for bridges (make interface configuration more generic?)
-
 	HOSTNAME_SHORT="$(echo veth-$(echo ${NAME} | cut -c-8)-0)"
 	VETH_NAME="${HOSTNAME_SHORT}"