Compare commits

5 Commits

3 changed files with 9 additions and 23 deletions

View File

@@ -90,27 +90,6 @@ if [[ "${ID}" == 'elementary' ]]; then
network-manager \ network-manager \
openssh-{client,server} \ openssh-{client,server} \
popularity-contest popularity-contest
# elif [[ "${ID}" == 'debian' ]]; then
# apt \
# install \
# --yes \
# console-setup \
# cryptsetup \
# curl \
# dpkg-dev \
# efibootmgr \
# ethtool \
# firmware-{ast,atheros,bnx{2,2x},brcm80211,ipw2x00,iwlwifi,libertas,linux,realtek,zd1211} \
# flatpak \
# keyboard-configuration \
# linux-{headers,image}-amd64 \
# locales \
# nano \
# network-manager \
# openssh-{client,server} \
# popularity-contest \
# printer-driver-all \
# tasksel
elif [[ "${ID}" == 'fedora' ]]; then elif [[ "${ID}" == 'fedora' ]]; then
if [[ "${VERSION_ID}" -lt '41' ]]; then if [[ "${VERSION_ID}" -lt '41' ]]; then
dnf \ dnf \
@@ -171,8 +150,6 @@ EOF
apt install \ apt install \
--yes \ --yes \
dosfstools \
systemd-timesyncd \
zfs-initramfs zfs-initramfs
fi fi

View File

@@ -441,6 +441,7 @@ elif [[ "${ID}" == 'debian' ]]; then
--include=console-setup \ --include=console-setup \
--include=cryptsetup \ --include=cryptsetup \
--include=curl \ --include=curl \
--include=dosfstools \
--include=dpkg-dev \ --include=dpkg-dev \
--include=efibootmgr \ --include=efibootmgr \
--include=ethtool \ --include=ethtool \
@@ -454,7 +455,9 @@ elif [[ "${ID}" == 'debian' ]]; then
--include=openssh-{client,server} \ --include=openssh-{client,server} \
--include=popularity-contest \ --include=popularity-contest \
--include=printer-driver-all \ --include=printer-driver-all \
--include=systemd-timesyncd \
--include=tasksel \ --include=tasksel \
--include=zstd \
"${VERSION_CODENAME}" \ "${VERSION_CODENAME}" \
/mnt /mnt
fi fi
@@ -524,6 +527,8 @@ Suites: ${VERSION_CODENAME}-updates
Components: main non-free-firmware contrib Components: main non-free-firmware contrib
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
EOF EOF
rm /mnt/etc/apt/sources.list
fi fi
mount \ mount \

View File

@@ -88,6 +88,10 @@ EOF
audio,cdrom,dip,floppy,wheel,video,dialout \ audio,cdrom,dip,floppy,wheel,video,dialout \
${USERNAME} ${USERNAME}
else else
if [[ -z "$(cat /etc/group | grep 'lpadmin')" ]]; then
groupadd --gid 108 lpadmin
fi
usermod \ usermod \
-a \ -a \
-G \ -G \