Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
P
package-helpers
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Model registry
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
trisquel
package-helpers
Commits
26711fb8
Commit
26711fb8
authored
1 year ago
by
Luis Guzmán
Browse files
Options
Downloads
Patches
Plain Diff
ifupdown: clear helper as upstream synched fixes.
parent
bc3425a4
No related branches found
No related tags found
1 merge request
!1235
ifupdown: clear helper as upstream synched fixes.
Pipeline
#1136
passed
1 year ago
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch
+0
-42
0 additions, 42 deletions
...fupdown/fix_invalid_lines_from_resolved_integration.patch
helpers/make-ifupdown
+3
-3
3 additions, 3 deletions
helpers/make-ifupdown
with
3 additions
and
45 deletions
helpers/DATA/ifupdown/fix_invalid_lines_from_resolved_integration.patch
deleted
100644 → 0
+
0
−
42
View file @
bc3425a4
* Remove invalid lines from resolved integration scripts (LP: #1907878)
-- Heinrich Schuchardt <heinrich.schuchardt@canonical.com> Sun, 15 May 2022 15:35:51 +0200
--
diff -Nru ifupdown-0.8.36+nmu1ubuntu3/debian/if-down.d/resolved ifupdown-0.8.36+nmu1ubuntu4/debian/if-down.d/resolved
--- ifupdown-0.8.36+nmu1ubuntu3/debian/if-down.d/resolved 2020-07-28 11:55:18.000000000 +0200
+++ ifupdown-0.8.36+nmu1ubuntu4/debian/if-down.d/resolved 2022-05-15 15:28:28.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Script fragment to make ifupdown supply DNS infromation to resolved
+# Script fragment to make ifupdown supply DNS information to resolved
#
case "$ADDRFAM" in
@@ -9,7 +9,6 @@
esac
if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then
- mystatedir statedir ifindex interface
interface=$IFACE
if [ ! "$interface" ]; then
return
diff -Nru ifupdown-0.8.36+nmu1ubuntu3/debian/if-up.d/resolved ifupdown-0.8.36+nmu1ubuntu4/debian/if-up.d/resolved
--- ifupdown-0.8.36+nmu1ubuntu3/debian/if-up.d/resolved 2022-04-17 23:21:44.000000000 +0200
+++ ifupdown-0.8.36+nmu1ubuntu4/debian/if-up.d/resolved 2022-05-15 15:29:07.000000000 +0200
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# Script fragment to make ifupdown supply DNS infromation to resolved
+# Script fragment to make ifupdown supply DNS information to resolved
#
case "$ADDRFAM" in
@@ -9,8 +9,6 @@
esac
if systemctl is-enabled systemd-resolved > /dev/null 2>&1; then
- mystatedir statedir ifindex interface
-
interface=$IFACE
if [ ! "$interface" ]; then
return
This diff is collapsed.
Click to expand it.
helpers/make-ifupdown
+
3
−
3
View file @
26711fb8
...
...
@@ -17,10 +17,10 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
VERSION
=
0
VERSION
=
1
.
./config
patch
--no-backup-if-mismatch
-p1
<
$DATA
/fix_invalid_lines_from_resolved_integration.patch
# Previously fixed LP: #1907878
changelog
"
Manually apply LP: #1907878 on aramo
"
changelog
"
Clean helper from manually patching previous bugs.
"
package
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment