netcfg: add wireless-tools if wireless connection type.

This commit is contained in:
Ark74 2022-11-22 10:00:28 -06:00
parent 1fdc144dab
commit e685f6eb65
2 changed files with 25 additions and 3 deletions

View file

@ -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:58.138150737 -0600
+++ netcfg-1.176+11.0trisquel2/finish-install.d/55netcfg-copy-config__ 2022-11-21 19:21:50.646130993 -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 NM_IS_INSTALLED=true
else else
NM_IS_INSTALLED=false NM_IS_INSTALLED=false
+ chroot /target apt-get -y install ifupdown + chroot /target apt-get -y install ifupdown
+ if [ $NETCFG_CONNECTION_TYPE="wireless" ]; then
+ chroot /target apt-get -y install wireless-tools
+ fi
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"

View file

@ -17,7 +17,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # 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' EXTERNAL='deb-src http://ftp.debian.org/debian stable main'
REPOKEY=648ACFD622F3D138 REPOKEY=648ACFD622F3D138
NETINST=true NETINST=true