xCAT/confluent
2
0
Fork 0
mirror of https://github.com/xcat2/confluent.git synced 2026-08-03 16:07:00 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #249 from Obihoernchen/merge

Browse Source 
Comment out the MERGE statement in syncfiles
This commit is contained in:
Jarrod Johnson
2026-07-20 12:53:41 -04:00
committed by GitHub
parent 12ef3fc529 73c5b9cebf
commit 9128f774ea
12 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
confluent_osdeploy/el7-diskless/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/el7/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/el8-diskless/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/el8/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/el9-diskless/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/suse15-diskless/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/suse15/profiles/hpc/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/suse15/profiles/server/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/ubuntu18.04/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/ubuntu20.04-diskless/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/ubuntu20.04/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group
confluent_osdeploy/ubuntu22.04/profiles/default/syncfiles
+1 -1
View File
@@ -24,6 +24,6 @@
# Entries under MERGE: will attempt to be intelligently merged. This supports /etc/group and /etc/passwd
# Any supporting entries in /etc/shadow or /etc/gshadow are added automatically, with password disabled
# It also will not inject 'system' ids (under 1,000 usually) as those tend to be local and rpm managed.
MERGE:
# MERGE:
# /etc/passwd
# /etc/group