[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#568292: auto-install: pulls netcfg into images that should not have it

tag 568292 patch

On Wednesday 03 February 2010, Frans Pop wrote:
> The package should be reworked so that it works together with netcfg if
> it is included in the initrd, but should also work correctly when netcfg
> gets installed later by anna.
> The dependency on netcfg should then be dropped.

Or if the dependency is required for menu ordering, then there should be an 
alternative udeb whose only function is to queue auto-install for images 
that don't have netcfg.

The attached (untested) patch should do this. Unless there are comments 
I'll commit this and make the necessary changes in the pkg-lists files.

diff --git a/packages/auto-install/debian-installer-startup.d/S60auto-install-nonet b/packages/auto-install/debian-installer-startup.d/S60auto-install-nonet
new file mode 100755
index 0000000..3545f2a
--- /dev/null
+++ b/packages/auto-install/debian-installer-startup.d/S60auto-install-nonet
@@ -0,0 +1,5 @@
+#! /bin/sh
+. /usr/share/debconf/confmodule
+if db_get auto-install/enable && [ "$RET" = true ]; then
+	anna-install auto-install
diff --git a/packages/auto-install/debian/auto-install-nonet.install b/packages/auto-install/debian/auto-install-nonet.install
new file mode 100644
index 0000000..93b4ff2
--- /dev/null
+++ b/packages/auto-install/debian/auto-install-nonet.install
@@ -0,0 +1 @@
+debian-installer-startup.d lib
diff --git a/packages/auto-install/debian/control b/packages/auto-install/debian/control
index 280d53d..c93b3fa 100644
--- a/packages/auto-install/debian/control
+++ b/packages/auto-install/debian/control
@@ -19,3 +19,11 @@ Depends: ${misc:Depends}, netcfg, preseed-common (>= 1.42)
 XC-Package-Type: udeb
 XB-Installer-Menu-Item: 1900
 Description: Support for automatic installs
+ For inclusion in images that have netcfg.
+Package: auto-install-nonet
+Architecture: all
+Depends: ${misc:Depends}, preseed-common (>= 1.42)
+XC-Package-Type: udeb
+Description: Support for automatic installs
+ For inclusion in images that don't have netcfg.

Reply to: