Project 'ximper/installer-distro-ximper' was moved to 'ximperlinux/installer-distro-ximper'. Please update any links and bookmarks that may still have the old path.
Commit dd540bcf authored by Mikhail Efremov's avatar Mikhail Efremov

stage3: Don't overwrite default-groups config file

There can be file with another set of groups already. So merge these files.
parent d67d8b18
...@@ -2,8 +2,11 @@ ...@@ -2,8 +2,11 @@
. install2-init-functions . install2-init-functions
DF_FILE="$destdir/usr/share/install3/default-groups"
mkdir -p $destdir/usr/share/install3/ mkdir -p $destdir/usr/share/install3/
cat > $destdir/usr/share/install3/default-groups <<__EOF__
cat > /tmp/default-groups_a <<__EOF__
wheel wheel
proc proc
cdwriter cdwriter
...@@ -20,3 +23,11 @@ vboxusers ...@@ -20,3 +23,11 @@ vboxusers
vmusers vmusers
users users
__EOF__ __EOF__
if [ -s "$DF_FILE" ]; then
sed 's/[[:blank:]]/\n/g' "$DF_FILE" >/tmp/default-groups_b
sort -u /tmp/default-groups_a /tmp/default-groups_b >"$DF_FILE"
rm /tmp/default-groups_a /tmp/default-groups_b
else
mv /tmp/default-groups_a "$DF_FILE"
fi
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment