Browse Source

Don't copy /etc/network/interfaces to /target if netcfg/target_network_config=ifupdown; it's already been copied by the base-installer hook earlier, and copying it again makes it hard to modify /target/etc/network/interfaces in a preseed file (closes: #709017).

tags/1.119
Colin Watson 7 years ago
parent
commit
973e23e52c
2 changed files with 17 additions and 5 deletions
  1. +10
    -0
      debian/changelog
  2. +7
    -5
      finish-install.d/55netcfg-copy-config

+ 10
- 0
debian/changelog View File

@@ -1,3 +1,13 @@
netcfg (1.119) UNRELEASED; urgency=medium

* Don't copy /etc/network/interfaces to /target if
netcfg/target_network_config=ifupdown; it's already been copied by the
base-installer hook earlier, and copying it again makes it hard to
modify /target/etc/network/interfaces in a preseed file (closes:
#709017).

-- Colin Watson <cjwatson@debian.org> Thu, 28 Aug 2014 20:05:42 +0100

netcfg (1.118) unstable; urgency=high

* Fix support for entering an ESSID manually, it was previously


+ 7
- 5
finish-install.d/55netcfg-copy-config View File

@@ -69,10 +69,12 @@ case $RET in
;;
esac

# Copy /etc/network/interfaces to target. Note: there's nothing particular to
# be done if the /e/n/i option is chosen, since /e/n/i gets copied in any
# situation.
mkdir -p /target$(dirname $FILE_INTERFACES)
cp $FILE_INTERFACES /target$FILE_INTERFACES
case $RET in
$CONFIG_NM|$CONFIG_LOOPBACK)
# Copy /etc/network/interfaces to target.
mkdir -p /target$(dirname $FILE_INTERFACES)
cp $FILE_INTERFACES /target$FILE_INTERFACES
;;
esac

exit 0

Loading…
Cancel
Save