4 Commits

2 changed files with 45 additions and 27 deletions

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 \

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,29 @@ 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 \
--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 \
"${VERSION_CODENAME}" \ "${VERSION_CODENAME}" \
/mnt /mnt
fi fi