Compare commits

14 Commits

Author SHA1 Message Date
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
39065008aa Replaced debootstrap with mmdebstrap, added packages from install.sh to --include for mmdebstrap, and commented out relevent section in install.sh 2025-07-11 20:24:57 -04:00
3 changed files with 54 additions and 29 deletions

1
.gitignore vendored
View File

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

View File

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

View File

@@ -40,8 +40,8 @@ else
fi fi
if [[ "${ID}" == 'debian' ]]; then if [[ "${ID}" == 'debian' ]]; then
if [[ ! "${HOST}" == "debian-live" ]]; then if [[ ! "$(hostname)" == "debian-live" ]]; then
cat << EOF | tee /mnt/etc/apt/sources.list.d/contrib.sources &> /dev/null cat << EOF | tee /etc/apt/sources.list.d/contrib.sources 1> /dev/null
Enabled: yes Enabled: yes
Types: deb Types: deb
URIs: http://deb.debian.org/debian/ URIs: http://deb.debian.org/debian/
@@ -66,7 +66,7 @@ if [[ "${ID}" == 'debian' ]]; then
apt \ apt \
install \ install \
--yes \ --yes \
debootstrap \ mmdebstrap \
gdisk \ gdisk \
zfsutils-linux \ zfsutils-linux \
systemd-timesyncd systemd-timesyncd
@@ -100,7 +100,7 @@ fi
timedatectl timedatectl
if [[ ! "${HOST}" == "debian-live" ]]; then if [[ ! "$(hostname)" == "debian-live" ]]; then
zgenhostid \ zgenhostid \
-f \ -f \
0x00bab10c 0x00bab10c
@@ -428,11 +428,35 @@ mkdir \
/mnt/run/lock /mnt/run/lock
if [[ "${ID}" == 'elementary' ]]; then if [[ "${ID}" == 'elementary' ]]; then
debootstrap \ mmdebstrap \
--include='' \
"${UBUNTU_VERSION_CODENAME}" \ "${UBUNTU_VERSION_CODENAME}" \
/mnt /mnt
elif [[ "${ID}" == 'debian' ]]; then elif [[ "${ID}" == 'debian' ]]; then
debootstrap \ mmdebstrap \
--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 \
"${VERSION_CODENAME}" \ "${VERSION_CODENAME}" \
/mnt /mnt
fi fi
@@ -502,6 +526,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 \