diff --git a/helpers/DATA/netcfg/ifupdown.patch b/helpers/DATA/netcfg/ifupdown.patch index aa58be0..616dd74 100644 --- a/helpers/DATA/netcfg/ifupdown.patch +++ b/helpers/DATA/netcfg/ifupdown.patch @@ -1,10 +1,32 @@ --- netcfg-1.176+11.0trisquel2/finish-install.d/55netcfg-copy-config 2022-11-21 19:21:58.138150737 -0600 +++ netcfg-1.176+11.0trisquel2/finish-install.d/55netcfg-copy-config__ 2022-11-21 19:21:50.646130993 -0600 -@@ -22,6 +22,7 @@ +@@ -17,19 +17,23 @@ + exit 0 + fi + ++# The type of the connection used during installation ++NETCFG_CONNECTION_TYPE=$(cat $FILE_NETCFG_CONNECTION_TYPE | \ ++ grep "connection type" | cut -d ':' -f2 | sed 's/ //g') ++NETCFG_CONNECTION_SECURITY=$(cat $FILE_NETCFG_CONNECTION_TYPE | \ ++ grep "security" | cut -d ':' -f2 | sed 's/ //g') ++ + # Flag to determine whether Network Manager is installed. + if in-target sh -c "dpkg-query -s network-manager 2>/dev/null | grep -q '^Status: install ok installed'"; then NM_IS_INSTALLED=true else NM_IS_INSTALLED=false + chroot /target apt-get -y install ifupdown ++ if [ $NETCFG_CONNECTION_TYPE="wireless" ]; then ++ chroot /target apt-get -y install wireless-tools ++ fi fi - # The type of the connection used during installation +-# The type of the connection used during installation +-NETCFG_CONNECTION_TYPE=$(cat $FILE_NETCFG_CONNECTION_TYPE | \ +- grep "connection type" | cut -d ':' -f2 | sed 's/ //g') +-NETCFG_CONNECTION_SECURITY=$(cat $FILE_NETCFG_CONNECTION_TYPE | \ +- grep "security" | cut -d ':' -f2 | sed 's/ //g') +- + # netcfg/target_network_config question values + CONFIG_NM="nm_config" + CONFIG_INTERFACES="ifupdown" diff --git a/helpers/make-netcfg b/helpers/make-netcfg index abd33f3..27fce6b 100644 --- a/helpers/make-netcfg +++ b/helpers/make-netcfg @@ -17,7 +17,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2.2 +VERSION=2.3 EXTERNAL='deb-src http://ftp.debian.org/debian stable main' REPOKEY=648ACFD622F3D138 NETINST=true