Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mkimage-profiles
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ximper Linux
mkimage-profiles
Commits
2d53a9af
Commit
2d53a9af
authored
Jul 03, 2020
by
Anton Midyukov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
net-eth, oem: use/oem/vnc for disable NetworkManager control eth0
Network interface managed by NetworkManager is not activated when alterator-setup is launched.
parent
cd88c10e
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
5 deletions
+11
-5
50-net-eth
features.in/net-eth/rootfs/image-scripts.d/50-net-eth
+8
-4
config.mk
features.in/oem/config.mk
+3
-1
No files found.
features.in/net-eth/rootfs/image-scripts.d/50-net-eth
View file @
2d53a9af
...
...
@@ -6,11 +6,15 @@
fatal
()
{
echo
"error:
$*
"
>
&2
;
exit
1
;
}
# simple etcnet configurations are also picked up by NM
if
type
-t
NetworkManager
>
&/dev/null
||
type
-t
connmand
>
&/dev/null
;
then
NMCTL
=
yes
if
[
-n
"
$GLOBAL_NMCTL
"
]
;
then
NMCTL
=
"
$GLOBAL_NMCTL
"
else
NMCTL
=
no
if
type
-t
NetworkManager
>
&/dev/null
||
type
-t
connmand
>
&/dev/null
;
then
NMCTL
=
yes
else
NMCTL
=
no
fi
fi
ETCNET_IFDIR
=
"/etc/net/ifaces"
...
...
features.in/oem/config.mk
View file @
2d53a9af
...
...
@@ -7,6 +7,8 @@ use/oem: use/services use/branding
@$(call add,DEFAULT_SERVICES_ENABLE,$$(OEM_TARGET))
@$(call xport,OEM_TARGET)
use/oem/vnc: use/oem use/x11-vnc
use/oem/vnc: use/oem use/x11-vnc
use/net-eth/dhcp
@$(call add,THE_PACKAGES,alterator-setup-x11vnc)
@$(call set,OEM_TARGET,setup-vnc)
@$(call set,NMCTL,no)
@$(call xport,NMCTL)
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment