Replaced debootstrap with mmdebstrap, added packages from install.sh to --include for mmdebstrap, and commented out relevent section in install.sh
				
					
				
			This commit is contained in:
		
							
								
								
									
										42
									
								
								install.sh
									
									
									
									
									
								
							
							
						
						
									
										42
									
								
								install.sh
									
									
									
									
									
								
							@@ -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 \
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										24
									
								
								partition.sh
									
									
									
									
									
								
							
							
						
						
									
										24
									
								
								partition.sh
									
									
									
									
									
								
							@@ -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
 | 
				
			||||||
@@ -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
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user