Compare commits

16 Commits

Author SHA1 Message Date
d706c613f3 Removed commented out section for installing packages now handled by 'partition.sh' 2025-07-11 22:07:29 -04:00
8ed4ca0653 Added condition to create 'lpadmin' group if missing 2025-07-11 22:06:42 -04:00
adf5b299bb Added 'zstd' to list of packages to install into chroot 2025-07-11 22:05:54 -04:00
aa422f434e '/mnt/etc/apt/sources.list' will get removed due to being redundent and not in deb822(?) format 2025-07-11 21:32:53 -04:00
66204958d9 Moved 'dosfstool' and 'systemd-timesyncd' package installation from 'install.sh' to 'partition.sh' 2025-07-11 21:30:53 -04:00
2ddb6bdfb8 Added '--format=directory' for 'mmdebstrap' 2025-07-11 21:28:39 -04:00
fca5e6c6fc Added '--mode=root' for 'mmdebstrap' 2025-07-11 21:28:11 -04:00
7135728394 Removed 'firmware-ipw2x00' package from installation list due to license agreement issues with 'mmdebstrap' 2025-07-11 21:23:39 -04:00
f0bfcbad56 Added '--components=main,non-free-firmware,contrib' for 'mmdebstrap' 2025-07-11 21:22:28 -04:00
2fdc93d9a1 Added '*kate-swp' to '.gitignore' 2025-07-11 21:20:39 -04:00
fc18016a9e Put packages back on sepeate lines, each with their own --include= preceding them 2025-07-11 21:13:25 -04:00
aafbd7ef8f MAde all packages for --include in mmdebstrap one line 2025-07-11 21:01:42 -04:00
fcf09e2ffc Added --skip=check/empty to mmdebstrap 2025-07-11 21:00:45 -04:00
cda85111e7 Changed a hostname lookup from the ${HOST} variable to the hostname command 2025-07-11 20:48:36 -04:00
d1e3cedd1f Changed a hostname lookup from the ${HOST} variable to the hostname command 2025-07-11 20:47:43 -04:00
d85a175989 Fixed contrib.sources not writing to correct path. Changed tee's redirection from &> to 1> 2025-07-11 20:46:31 -04:00
4 changed files with 34 additions and 43 deletions

1
.gitignore vendored
View File

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

View File

@@ -90,27 +90,6 @@ if [[ "${ID}" == 'elementary' ]]; then
network-manager \
openssh-{client,server} \
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
if [[ "${VERSION_ID}" -lt '41' ]]; then
dnf \
@@ -171,8 +150,6 @@ EOF
apt install \
--yes \
dosfstools \
systemd-timesyncd \
zfs-initramfs
fi

View File

@@ -40,8 +40,8 @@ else
fi
if [[ "${ID}" == 'debian' ]]; then
if [[ ! "${HOST}" == "debian-live" ]]; then
cat << EOF | tee /mnt/etc/apt/sources.list.d/contrib.sources &> /dev/null
if [[ ! "$(hostname)" == "debian-live" ]]; then
cat << EOF | tee /etc/apt/sources.list.d/contrib.sources 1> /dev/null
Enabled: yes
Types: deb
URIs: http://deb.debian.org/debian/
@@ -100,7 +100,7 @@ fi
timedatectl
if [[ ! "${HOST}" == "debian-live" ]]; then
if [[ ! "$(hostname)" == "debian-live" ]]; then
zgenhostid \
-f \
0x00bab10c
@@ -434,23 +434,30 @@ if [[ "${ID}" == 'elementary' ]]; then
/mnt
elif [[ "${ID}" == 'debian' ]]; then
mmdebstrap \
--include=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 \
--skip=check/empty \
--components=main,non-free-firmware,contrib \
--mode=root \
--format=directory \
--include=console-setup \
--include=cryptsetup \
--include=curl \
--include=dosfstools \
--include=dpkg-dev \
--include=efibootmgr \
--include=ethtool \
--include=firmware-{ast,atheros,bnx{2,2x},brcm80211,iwlwifi,libertas,linux,realtek,zd1211} \
--include=flatpak \
--include=keyboard-configuration \
--include=linux-{headers,image}-amd64 \
--include=locales \
--include=nano \
--include=network-manager \
--include=openssh-{client,server} \
--include=popularity-contest \
--include=printer-driver-all \
--include=systemd-timesyncd \
--include=tasksel \
--include=zstd \
"${VERSION_CODENAME}" \
/mnt
fi
@@ -520,6 +527,8 @@ Suites: ${VERSION_CODENAME}-updates
Components: main non-free-firmware contrib
Signed-By: /usr/share/keyrings/debian-archive-keyring.gpg
EOF
rm /mnt/etc/apt/sources.list
fi
mount \

View File

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