Compare commits

5 Commits

4 changed files with 27 additions and 4 deletions

View File

@@ -26,6 +26,7 @@ nano \
network-manager \ network-manager \
openssh-{client,server} \ openssh-{client,server} \
popularity-contest \ popularity-contest \
rsync \
zfs-initramfs \ zfs-initramfs \
zstd\ zstd\
) )
@@ -95,11 +96,25 @@ elif [[ "${1}" == '--skel' ]]; then
/etc/skel \ /etc/skel \
/mnt/etc /mnt/etc
elif [[ "${1}" == '--elementary' ]]; then elif [[ "${1}" == '--elementary' ]]; then
cp \ rsync \
-pogAXtlHrDx \
/etc/os-release \ /etc/os-release \
/mnt/etc /mnt/etc
cp \ rsync \
-pogAXtlHrDx \
/etc/apt/trusted.gpg.d/{elementary,patches}.key.asc \ /etc/apt/trusted.gpg.d/{elementary,patches}.key.asc \
/mnt/etc/apt/trusted.gpg.d/ /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 fi

View File

@@ -44,7 +44,7 @@ if [[ "${ID}" == 'fedora' ]]; then
printf \ printf \
"@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \ "@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
tee /var/spool/cron/root &> /dev/null tee /var/spool/cron/root &> /dev/null
elif [[ "${ID}" == 'debian' ]]; then elif [[ "${ID}" == 'debian' ]] || [[ "${ID}" == 'elementary' ]]; then
printf \ printf \
"@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \ "@reboot\tsudo -u ${username} '${baseDir}/finalize.sh'\n@reboot\t/usr/bin/home-fix.sh\n" | \
tee /var/spool/cron/crontabs/root &> /dev/null tee /var/spool/cron/crontabs/root &> /dev/null

View File

@@ -97,10 +97,16 @@ else
groupadd --gid 108 lpadmin groupadd --gid 108 lpadmin
fi fi
groups='audio,cdrom,dip,floppy,plugdev,sudo,video,dialout,lpadmin'
if [[ "${ID}" == 'debian' ]]; then
groups+=',netdev'
fi
usermod \ usermod \
-a \ -a \
-G \ -G \
audio,cdrom,dip,floppy,netdev,plugdev,sudo,video,dialout,lpadmin \ ${groups} \
${username} ${username}
fi fi

View File

@@ -74,6 +74,8 @@ fi
if [[ "${ID}" == 'debian' ]]; then if [[ "${ID}" == 'debian' ]]; then
"${baseDir}/debian.sh" --network-interfaces "${baseDir}/debian.sh" --network-interfaces
elif [[ "${ID}" == 'elementary' ]]; then
"${baseDir}/elementary.sh" --network
fi fi
if [[ "${ID}" == 'elementary' ]]; then if [[ "${ID}" == 'elementary' ]]; then