Compare commits
5 Commits
13f87e00dd
...
0b562b0ccf
| Author | SHA1 | Date | |
|---|---|---|---|
|
0b562b0ccf
|
|||
|
99f90d47c8
|
|||
|
74f884f7a0
|
|||
|
fd1a033bd9
|
|||
|
44c7813b22
|
@@ -26,6 +26,7 @@ nano \
|
||||
network-manager \
|
||||
openssh-{client,server} \
|
||||
popularity-contest \
|
||||
rsync \
|
||||
zfs-initramfs \
|
||||
zstd\
|
||||
)
|
||||
@@ -95,11 +96,25 @@ elif [[ "${1}" == '--skel' ]]; then
|
||||
/etc/skel \
|
||||
/mnt/etc
|
||||
elif [[ "${1}" == '--elementary' ]]; then
|
||||
cp \
|
||||
rsync \
|
||||
-pogAXtlHrDx \
|
||||
/etc/os-release \
|
||||
/mnt/etc
|
||||
|
||||
cp \
|
||||
rsync \
|
||||
-pogAXtlHrDx \
|
||||
/etc/apt/trusted.gpg.d/{elementary,patches}.key.asc \
|
||||
/mnt/etc/apt/trusted.gpg.d/
|
||||
elif [[ "${1}" == '--network' ]]; then
|
||||
mkdir \
|
||||
-p \
|
||||
/mnt/run/systemd/resolve/
|
||||
|
||||
mount \
|
||||
--bind \
|
||||
/run/systemd/resolve/stub-resolv.conf \
|
||||
/mnt/run/systemd/resolve/stub-resolv.conf
|
||||
|
||||
touch \
|
||||
/etc/NetworkManager/conf.d/10-globally-managed-devices.conf
|
||||
fi
|
||||
|
||||
@@ -44,7 +44,7 @@ if [[ "${ID}" == 'fedora' ]]; then
|
||||
printf \
|
||||
"@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
|
||||
tee /var/spool/cron/root &> /dev/null
|
||||
elif [[ "${ID}" == 'debian' ]]; then
|
||||
elif [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
|
||||
printf \
|
||||
"@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
|
||||
tee /var/spool/cron/crontabs/root &> /dev/null
|
||||
|
||||
@@ -97,10 +97,16 @@ else
|
||||
groupadd --gid 108 lpadmin
|
||||
fi
|
||||
|
||||
groups='audio,cdrom,dip,floppy,plugdev,sudo,video,dialout,lpadmin'
|
||||
|
||||
if [[ "${ID}" == 'debian' ]]; then
|
||||
groups+=',netdev'
|
||||
fi
|
||||
|
||||
usermod \
|
||||
-a \
|
||||
-G \
|
||||
audio,cdrom,dip,floppy,netdev,plugdev,sudo,video,dialout,lpadmin \
|
||||
${groups} \
|
||||
${username}
|
||||
fi
|
||||
|
||||
|
||||
@@ -74,6 +74,8 @@ fi
|
||||
|
||||
if [[ "${ID}" == 'debian' ]]; then
|
||||
"${baseDir}/debian.sh" --network-interfaces
|
||||
elif [[ "${ID}" == 'elementary' ]]; then
|
||||
"${baseDir}/elementary.sh" --network
|
||||
fi
|
||||
|
||||
if [[ "${ID}" == 'elementary' ]]; then
|
||||
|
||||
Reference in New Issue
Block a user