tags: patch
Package: fai
Version: 2.8.2
My previous patch did not solve the Problem completely according to the
policy. We decided in irc therefore to remove the whole debconf support for
the fai package (only for the package at install time, not the debconf
features for client installation).
Just added a small message for the user that he is responsible for editing
the files manually.
Patch attached.
Binary files fai-2.8.2-unchanged/conf/.fai.conf.swp and fai-2.8.2_debconf-removed/conf/.fai.conf.swp differ
diff -Nur fai-2.8.2-unchanged/conf/fai.conf fai-2.8.2_debconf-removed/conf/fai.conf
--- fai-2.8.2-unchanged/conf/fai.conf 2005-04-06 16:26:09.000000000 +0200
+++ fai-2.8.2_debconf-removed/conf/fai.conf 2005-05-17 15:17:12.409885760 +0200
@@ -3,7 +3,7 @@
# /etc/fai/fai.conf -- configuration for FAI (Fully Automatic Installation)
# installserver must be the name seen by the install clients
-installserver=
+installserver=INSTALLSERVER
# the name of the Debian mirror
mirrorhost=MIRRORHOST
diff -Nur fai-2.8.2-unchanged/debian/config fai-2.8.2_debconf-removed/debian/config
--- fai-2.8.2-unchanged/debian/config 2005-04-08 16:32:33.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/config 1970-01-01 01:00:00.000000000 +0100
@@ -1,25 +0,0 @@
-#! /bin/bash
-
-set -e
-. /usr/share/debconf/confmodule
-
-# check if installserver value is already set, otherwise set default
-db_get fai/installserver
-if [ "$RET" = "" ]; then
- db_set fai/installserver $(hostname)
-fi
-
-db_input medium fai/installserver || true
-db_go || true
-
-# mirrorhost is by default the installserver
-db_get fai/installserver
-INSTALLSERVER=$RET
-
-db_get fai/mirrorhost
-if [ "$RET" = "" ]; then
- db_set fai/mirrorhost ftp.debian.org
-fi
-db_input medium fai/mirrorhost || true
-
-db_go || true
diff -Nur fai-2.8.2-unchanged/debian/po/CVS/Entries fai-2.8.2_debconf-removed/debian/po/CVS/Entries
--- fai-2.8.2-unchanged/debian/po/CVS/Entries 2005-04-25 23:37:58.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/po/CVS/Entries 1970-01-01 01:00:00.000000000 +0100
@@ -1,5 +0,0 @@
-/POTFILES.in/1.1/Sun Apr 3 13:01:41 2005//
-/fr.po/1.1/Mon Apr 25 10:46:09 2005//
-/templates.pot/1.4/Mon Apr 25 21:18:46 2005//
-/de.po/1.4/Mon Apr 25 21:18:39 2005//
-D
diff -Nur fai-2.8.2-unchanged/debian/po/CVS/Repository fai-2.8.2_debconf-removed/debian/po/CVS/Repository
--- fai-2.8.2-unchanged/debian/po/CVS/Repository 2005-04-02 21:34:39.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/po/CVS/Repository 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-debian/fai/debian/po
diff -Nur fai-2.8.2-unchanged/debian/po/CVS/Root fai-2.8.2_debconf-removed/debian/po/CVS/Root
--- fai-2.8.2-unchanged/debian/po/CVS/Root 2005-04-02 21:34:39.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/po/CVS/Root 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-/home/lange/.cvs_repository
diff -Nur fai-2.8.2-unchanged/debian/po/POTFILES.in fai-2.8.2_debconf-removed/debian/po/POTFILES.in
--- fai-2.8.2-unchanged/debian/po/POTFILES.in 2005-04-03 15:01:41.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/po/POTFILES.in 1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-[type: gettext/rfc822deb] templates
diff -Nur fai-2.8.2-unchanged/debian/po/de.po fai-2.8.2_debconf-removed/debian/po/de.po
--- fai-2.8.2-unchanged/debian/po/de.po 2005-04-25 23:18:39.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/po/de.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,120 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-08 16:29+0200\n"
-"PO-Revision-Date: 2005-04-02 10:36+0200\n"
-"Last-Translator: Michael Tautschnig <[EMAIL PROTECTED]>\n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ISO-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid "Set install server hostname."
-msgstr "Setzen des hostnames des install servers."
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid "FAI needs a name for the install server to be used."
-msgstr "FAI benötigt einen Namen des install servers."
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid ""
-"In most cases this will be the hostname of the machine where the FAI package "
-"is installed, so we use this as a default value."
-msgstr ""
-"Im Allgemeinen wird das der hostname der Machine sein, wo das FAI Paket "
-"installiert wird, also ist das der Standardwert"
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid ""
-"In case you want your install clients to use another install server, please "
-"provide it's hostname."
-msgstr ""
-"Falls Sie einen anderen install server benützen möchten, geben Sie bitte "
-"dessen hostname an."
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid "Set the hostname of the debian mirror to be used."
-msgstr "FAI benötigt einen Namen des install servers."
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid ""
-"FAI needs the hostname of the debian mirror used for creating the nfsroot "
-"and to get packages for the actual installation."
-msgstr ""
-"FAI benötigt den hostname eines Debian-Paketspiegles für die Erzeugung des "
-"nfsroot und für die eigentliche Installation."
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid ""
-"In case you are running your own debian mirror, and want to use this for "
-"FAI, please enter it's hostname here. In case you don't have an own debian "
-"mirror, you will most probably use ftp.debian.org for that, which we provide "
-"as a default."
-msgstr ""
-"Wenn Sie einen eigenen Debian-Paketspiegel betreiben, und diesen für FAI "
-"benützen möchten, geben Sie den hostname bitte hier ein. Ansonsten können "
-"Sie beispielsweise ftp.debian.org benützen."
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid "Run fai-setup script now?"
-msgstr "Soll fai-setup jetzt ausgeführt werden?"
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid ""
-"To be able to do installations with FAI, the script fai-setup needs to be "
-"run. In case you don't need to tweak the default FAI config any further, "
-"this can be done for you now."
-msgstr ""
-"Um tatsächlich Installationen mit FAI durchzuführen, muss fai-setup "
-"ausgeführt werden. Wenn Sie die Standardeinstellungen nicht verändern "
-"möchten, kann das jetzt automatisch gestartet werden."
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid ""
-"If you intend to have a look at and tweak the config files, it's perfectly "
-"okay to run the script fai-setup manually after you consider the "
-"configuration fitting for you."
-msgstr ""
-"Wenn Sie noch einen Blick auf die Konfigurationsdateien werfen möchten, "
-"können Sie fai-setup auch später manuell ausführen."
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid "Do you want the fai-setup script to be run now?"
-msgstr "Soll fai-setup jetzt ausgeführt werden?"
diff -Nur fai-2.8.2-unchanged/debian/po/fr.po fai-2.8.2_debconf-removed/debian/po/fr.po
--- fai-2.8.2-unchanged/debian/po/fr.po 2005-04-25 12:46:09.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/po/fr.po 1970-01-01 01:00:00.000000000 +0100
@@ -1,125 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: fai_2.8\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-08 16:29+0200\n"
-"PO-Revision-Date: 2005-04-16 11:16+0100\n"
-"Last-Translator: Steve Petruzzello <[EMAIL PROTECTED]>\n"
-"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=iso-8859-15\n"
-"Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: French\n"
-"X-Poedit-Country: SWITZERLAND\n"
-"X-Poedit-SourceCharset: iso-8859-1\n"
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid "Set install server hostname."
-msgstr "Nom d'hôte du serveur d'installation :"
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid "FAI needs a name for the install server to be used."
-msgstr "Veuillez indiquer le nom d'hôte du serveur d'installation."
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid ""
-"In most cases this will be the hostname of the machine where the FAI package "
-"is installed, so we use this as a default value."
-msgstr ""
-"Par défaut, ce sera le nom d'hôte de la machine sur laquelle FAI est "
-"installé."
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid ""
-"In case you want your install clients to use another install server, please "
-"provide it's hostname."
-msgstr ""
-"Dans le cas où vous voulez utiliser un autre serveur d'installation pour vos "
-"clients, veuillez indiquer son nom d'hôte."
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid "Set the hostname of the debian mirror to be used."
-msgstr "Miroir Debian à utiliser :"
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid ""
-"FAI needs the hostname of the debian mirror used for creating the nfsroot "
-"and to get packages for the actual installation."
-msgstr ""
-"Veuillez indiquer le nom d'hôte du miroir Debian utilisé pour créer la "
-"racine du système de fichiers NFS et qui sera la source des paquets "
-"installés."
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid ""
-"In case you are running your own debian mirror, and want to use this for "
-"FAI, please enter it's hostname here. In case you don't have an own debian "
-"mirror, you will most probably use ftp.debian.org for that, which we provide "
-"as a default."
-msgstr ""
-"Si vous souhaitez utiliser votre propre miroir Debian avec FAI, veuillez "
-"indiquer son nom d'hôte. Dans le cas contraire, vous devriez choisir le "
-"serveur par défaut « ftp.debian.org »."
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid "Run fai-setup script now?"
-msgstr "Faut-il exécuter le script de configuration de FAI maintenant ?"
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid ""
-"To be able to do installations with FAI, the script fai-setup needs to be "
-"run. In case you don't need to tweak the default FAI config any further, "
-"this can be done for you now."
-msgstr ""
-"Afin d'utiliser FAI, le script de configuration doit être exécuté. Si vous "
-"n'avez pas besoin de modifier la configuration par défaut de FAI, cela peut "
-"se faire immédiatement. "
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid ""
-"If you intend to have a look at and tweak the config files, it's perfectly "
-"okay to run the script fai-setup manually after you consider the "
-"configuration fitting for you."
-msgstr ""
-"Si vous voulez modifier les fichiers de configuration, vous pourrez exécuter "
-"vous-même le script de configuration ensuite."
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid "Do you want the fai-setup script to be run now?"
-msgstr ""
-"Veuillez choisir si le script de configuration doit être exécuté maintenant."
diff -Nur fai-2.8.2-unchanged/debian/po/templates.pot fai-2.8.2_debconf-removed/debian/po/templates.pot
--- fai-2.8.2-unchanged/debian/po/templates.pot 2005-04-25 23:18:46.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/po/templates.pot 1970-01-01 01:00:00.000000000 +0100
@@ -1,106 +0,0 @@
-#
-# Translators, if you are not familiar with the PO format, gettext
-# documentation is worth reading, especially sections dedicated to
-# this format, e.g. by running:
-# info -n '(gettext)PO Files'
-# info -n '(gettext)Header Entry'
-#
-# Some information specific to po-debconf are available at
-# /usr/share/doc/po-debconf/README-trans
-# or http://www.debian.org/intl/l10n/po-debconf/README-trans
-#
-# Developers do not need to manually edit POT or PO files.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-04-08 16:29+0200\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <[EMAIL PROTECTED]>\n"
-"Language-Team: LANGUAGE <[EMAIL PROTECTED]>\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=CHARSET\n"
-"Content-Transfer-Encoding: 8bit\n"
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid "Set install server hostname."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid "FAI needs a name for the install server to be used."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid ""
-"In most cases this will be the hostname of the machine where the FAI package "
-"is installed, so we use this as a default value."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:3
-msgid ""
-"In case you want your install clients to use another install server, please "
-"provide it's hostname."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid "Set the hostname of the debian mirror to be used."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid ""
-"FAI needs the hostname of the debian mirror used for creating the nfsroot "
-"and to get packages for the actual installation."
-msgstr ""
-
-#. Type: string
-#. Description
-#: ../templates:14
-msgid ""
-"In case you are running your own debian mirror, and want to use this for "
-"FAI, please enter it's hostname here. In case you don't have an own debian "
-"mirror, you will most probably use ftp.debian.org for that, which we provide "
-"as a default."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid "Run fai-setup script now?"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid ""
-"To be able to do installations with FAI, the script fai-setup needs to be "
-"run. In case you don't need to tweak the default FAI config any further, "
-"this can be done for you now."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid ""
-"If you intend to have a look at and tweak the config files, it's perfectly "
-"okay to run the script fai-setup manually after you consider the "
-"configuration fitting for you."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../templates:26
-msgid "Do you want the fai-setup script to be run now?"
-msgstr ""
diff -Nur fai-2.8.2-unchanged/debian/postinst fai-2.8.2_debconf-removed/debian/postinst
--- fai-2.8.2-unchanged/debian/postinst 2005-04-27 10:16:42.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/postinst 2005-05-17 15:13:53.245163400 +0200
@@ -33,29 +33,9 @@
case "$1" in
configure)
-
- . /usr/share/debconf/confmodule
- # set installserver hostname to a reasonable value with debconf
- db_get fai/installserver
- perl -pi -e "s/^installserver=.*\$/installserver=$RET/" /etc/fai/fai.conf || true
-
- # set mirrorhost in /etc/fai.conf and /etc/fai/sources.list as
- # defined in debconf db
- db_get fai/mirrorhost
- set +e
- grep -q MIRRORHOST /etc/fai/fai.conf
- if [ $? -eq 0 ] ; then
- perl -pi -e "s/MIRRORHOST/$RET/" /etc/fai/fai.conf
- else
- perl -pi -e "s/^mirrorhost=MIRRORHOST\$/mirrorhost=$RET/" /etc/fai/fai.conf
- fi
- perl -pi -e "s/MIRRORHOST/$RET/" /etc/fai/sources.list
- set -e
- db_get fai/run-faisetup-on-install || true
-
- echo "Now edit fai.conf, make-fai-nfsroot.conf and sources.list in /etc/fai and call fai-setup."
-
- ;;
+ echo
+ echo "Now edit fai.conf, make-fai-nfsroot.conf and sources.list in /etc/fai and call fai-setup. Especially, you'll have to replace the placeholders INSTALLSERVER and MIRRORHOST in the config files."
+ ;;
abort-upgrade|abort-remove|abort-deconfigure)
diff -Nur fai-2.8.2-unchanged/debian/templates fai-2.8.2_debconf-removed/debian/templates
--- fai-2.8.2-unchanged/debian/templates 2005-04-08 16:29:23.000000000 +0200
+++ fai-2.8.2_debconf-removed/debian/templates 1970-01-01 01:00:00.000000000 +0100
@@ -1,35 +0,0 @@
-Template: fai/installserver
-Type: string
-_Description: Set install server hostname.
- FAI needs a name for the install server to be used.
- .
- In most cases this will be the hostname of the machine where the FAI
- package is installed, so we use this as a default value.
- .
- In case you want your install clients to use another install server,
- please provide it's hostname.
-
-Template: fai/mirrorhost
-Type: string
-_Description: Set the hostname of the debian mirror to be used.
- FAI needs the hostname of the debian mirror used for creating
- the nfsroot and to get packages for the actual installation.
- .
- In case you are running your own debian mirror, and want to use this
- for FAI, please enter it's hostname here. In case you don't have
- an own debian mirror, you will most probably use ftp.debian.org
- for that, which we provide as a default.
-
-Template: fai/run-faisetup-on-install
-Type: boolean
-Default: false
-_Description: Run fai-setup script now?
- To be able to do installations with FAI, the script fai-setup
- needs to be run. In case you don't need to tweak the default
- FAI config any further, this can be done for you now.
- .
- If you intend to have a look at and tweak the config files, it's
- perfectly okay to run the script fai-setup manually after
- you consider the configuration fitting for you.
- .
- Do you want the fai-setup script to be run now?
