summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-02-26 03:50:49 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2019-02-26 03:50:49 +0000
commiteab3e8a960749e6ced651b878de39526c46f9bdb (patch)
tree19c25243b805346a17bda9b8f60b65b638eb4d2f
parentAdding comment to debian sources.list in container debconf create script. (diff)
downloadcompute-tools-eab3e8a960749e6ced651b878de39526c46f9bdb.tar.xz
compute-tools-eab3e8a960749e6ced651b878de39526c46f9bdb.zip
Removing some dead code in container create scripts.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xshare/scripts/curl2
-rwxr-xr-xshare/scripts/debconf5
2 files changed, 1 insertions, 6 deletions
diff --git a/share/scripts/curl b/share/scripts/curl
index 80ccde6..6b8db26 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -271,8 +271,6 @@ then
do
if [ -x "${DEBCONF_SCRIPT}" ]
then
- # FIXME
- # debconf -o${SOFTWARE} "${DEBCONF_SCRIPT}"
"${DEBCONF_SCRIPT}"
fi
done
diff --git a/share/scripts/debconf b/share/scripts/debconf
index a78258e..e13e1f0 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -353,7 +353,6 @@ EOF
fi
# Removing resolv.conf
- #rm -f "${DIRECTORY}/etc/resolv.conf"
# FIXME: needs to stay for the moment
rm -f "${DIRECTORY}/etc/resolv.conf"
cp /etc/resolv.conf "${DIRECTORY}/etc"
@@ -887,8 +886,6 @@ for DEBCONF_SCRIPT in "/usr/share/${PROJECT}/${PROGRAM}/scripts/debconf.d"/*
do
if [ -x "${DEBCONF_SCRIPT}" ]
then
- # FIXME
- # debconf -o${SOFTWARE} "${DEBCONF_SCRIPT}"
"${DEBCONF_SCRIPT}"
fi
done
@@ -973,7 +970,7 @@ fi
Configure_system "${MACHINES}/${NAME}"
Configure_network "${MACHINES}/${NAME}"
-Configure_systemd_networkd "${MACHINES}/${NAME}" # FIXME
+Configure_systemd_networkd "${MACHINES}/${NAME}"
Cleanup_system "${MACHINES}/${NAME}"
Commands "${MACHINES}/${NAME}"