diff --git a/helpers/DATA/network-manager/define_trisquel_for_i386.patch b/helpers/DATA/network-manager/define_trisquel_for_i386.patch new file mode 100644 index 0000000..874e20a --- /dev/null +++ b/helpers/DATA/network-manager/define_trisquel_for_i386.patch @@ -0,0 +1,13 @@ +diff --git a/debian/rules b/debian/rules +index 0740cdee..cde335f9 100755 +--- a/debian/rules ++++ b/debian/rules +@@ -2,7 +2,7 @@ + + include /usr/share/dpkg/architecture.mk + +-ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes) $(DEB_HOST_ARCH), yes i386) ++ifeq ($(shell dpkg-vendor --is Ubuntu && echo yes || dpkg-vendor --is Trisquel && echo yes) $(DEB_HOST_ARCH), yes i386) + BUILD_PACKAGES += -Nnetwork-manager + NETPLAN += --disable-netplan + endif diff --git a/helpers/make-network-manager b/helpers/make-network-manager index 8569129..8b1761d 100644 --- a/helpers/make-network-manager +++ b/helpers/make-network-manager @@ -1,5 +1,6 @@ #!/bin/sh # +# Copyright (C) 2024 Luis Guzmán # Copyright (C) 2020 Ruben Rodriguez # # This program is free software; you can redistribute it and/or modify @@ -17,7 +18,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # -VERSION=2 +VERSION=3 COMPONENT=main . ./config @@ -30,6 +31,9 @@ sed '/send fqdn/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i sed '/HOSTNAME4_TAG/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i src/core/dhcp/nm-dhcp-dhclient-utils.c sed '/FQDN_TAG/s|added by NetworkManager|Enable at /etc/dhcp/dhclient.conf|' -i src/core/dhcp/nm-dhcp-dhclient-utils.c +# Patch debian/rules to match Trisquel on i386 build. +patch_p1 $DATA/define_trisquel_for_i386.patch + changelog "Do not send hostname on dhcp, plus other features" package