3 Commits

4 changed files with 41 additions and 32 deletions

1
.gitignore vendored
View File

@@ -1,3 +1,2 @@
archive.sh archive.sh
system.conf system.conf
*kate-swp

View File

@@ -90,6 +90,27 @@ 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 \
@@ -150,6 +171,8 @@ EOF
apt install \ apt install \
--yes \ --yes \
dosfstools \
systemd-timesyncd \
zfs-initramfs zfs-initramfs
fi fi

View File

@@ -100,7 +100,7 @@ fi
timedatectl timedatectl
if [[ ! "$(hostname)" == "debian-live" ]]; then if [[ ! "${HOST}" == "debian-live" ]]; then
zgenhostid \ zgenhostid \
-f \ -f \
0x00bab10c 0x00bab10c
@@ -434,30 +434,23 @@ if [[ "${ID}" == 'elementary' ]]; then
/mnt /mnt
elif [[ "${ID}" == 'debian' ]]; then elif [[ "${ID}" == 'debian' ]]; then
mmdebstrap \ mmdebstrap \
--skip=check/empty \ --include=console-setup,\
--components=main,non-free-firmware,contrib \ cryptsetup,\
--mode=root \ curl,\
--format=directory \ dpkg-dev,\
--include=console-setup \ efibootmgr,\
--include=cryptsetup \ ethtool,\
--include=curl \ firmware-{ast,atheros,bnx{2,2x},brcm80211,ipw2x00,iwlwifi,libertas,linux,realtek,zd1211},\
--include=dosfstools \ flatpak,\
--include=dpkg-dev \ keyboard-configuration,\
--include=efibootmgr \ linux-{headers,image}-amd64,\
--include=ethtool \ locales,\
--include=firmware-{ast,atheros,bnx{2,2x},brcm80211,iwlwifi,libertas,linux,realtek,zd1211} \ nano,\
--include=flatpak \ network-manager,\
--include=keyboard-configuration \ openssh-{client,server},\
--include=linux-{headers,image}-amd64 \ popularity-contest,\
--include=locales \ printer-driver-all,\
--include=nano \ tasksel \
--include=network-manager \
--include=openssh-{client,server} \
--include=popularity-contest \
--include=printer-driver-all \
--include=systemd-timesyncd \
--include=tasksel \
--include=zstd \
"${VERSION_CODENAME}" \ "${VERSION_CODENAME}" \
/mnt /mnt
fi fi
@@ -527,8 +520,6 @@ 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,10 +88,6 @@ 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 \