##// END OF EJS Templates
fixes
fixes

Fichier de la dernière révision:

r569:c84998d2e8c2
r669:682120bd8eb1
Show More
14-fstab.sh
116 lines | 4.8 KiB | application/x-sh | BashLexer
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141 #
# Setup fstab and initramfs
#
# Load utility functions
. ./functions.sh
# Install and setup fstab
install_readonly files/mount/fstab "${ETC_DIR}/fstab"
# Add usb/sda disk root partition to fstab
if [ "$ENABLE_SPLITFS" = true ] && [ "$ENABLE_CRYPTFS" = false ] ; then
sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/fstab"
fi
# Add encrypted root partition to fstab and crypttab
if [ "$ENABLE_CRYPTFS" = true ] ; then
# Replace fstab root partition with encrypted partition mapping
sed -i "s/mmcblk0p2/mapper\/${CRYPTFS_MAPPING}/" "${ETC_DIR}/fstab"
# Add encrypted partition to crypttab and fstab
install_readonly files/mount/crypttab "${ETC_DIR}/crypttab"
drtyhlpr
Fix: DTB for all
r258 echo "${CRYPTFS_MAPPING} /dev/mmcblk0p2 none luks,initramfs" >> "${ETC_DIR}/crypttab"
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141
if [ "$ENABLE_SPLITFS" = true ] ; then
Unknown
USBBOOT is Back...
r568 # Add usb/sda1 disk to crypttab
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141 sed -i "s/mmcblk0p2/sda1/" "${ETC_DIR}/crypttab"
fi
fi
Unknown
USBBOOT is Back...
r568 if [ "$ENABLE_USBBOOT" = true ] ; then
sed -i "s/mmcblk0p1/sda1/" "${ETC_DIR}/fstab"
sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/fstab"
# Add usb/sda2 disk to crypttab
sed -i "s/mmcblk0p2/sda2/" "${ETC_DIR}/crypttab"
fi
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141 # Generate initramfs file
Unknown
Dropbear initramfs...
r501 if [ "$ENABLE_INITRAMFS" = true ] ; then
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141 if [ "$ENABLE_CRYPTFS" = true ] ; then
# Include initramfs scripts to auto expand encrypted root partition
if [ "$EXPANDROOT" = true ] ; then
install_exec files/initramfs/expand_encrypted_rootfs "${ETC_DIR}/initramfs-tools/scripts/init-premount/expand_encrypted_rootfs"
install_exec files/initramfs/expand-premount "${ETC_DIR}/initramfs-tools/scripts/local-premount/expand-premount"
install_exec files/initramfs/expand-tools "${ETC_DIR}/initramfs-tools/hooks/expand-tools"
fi
Unknown
formating and dropbear fix for static ip
r569
if [ "$ENABLE_DHCP" = false ] ; then
# Get cdir from NET_ADDRESS e.g. 24
cdir=$(${NET_ADDRESS} | cut -d '/' -f2)
# Convert cdir ro netmask e.g. 24 to 255.255.255.0
NET_MASK=$(cdr2mask "$cdir")
# Write static ip settings to "${ETC_DIR}"/initramfs-tools/initramfs.conf
sed -i "\$aIP=${NET_ADDRESS}::${NET_GATEWAY}:${NET_MASK}:${HOSTNAME}:" "${ETC_DIR}"/initramfs-tools/initramfs.conf
# Regenerate initramfs
chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
fi
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141
Unknown
Dropbear initramfs...
r501 if [ "$CRYPTFS_DROPBEAR" = true ]; then
Unknown
formating and dropbear fix for static ip
r569 if [ -n "$CRYPTFS_DROPBEAR_PUBKEY" ] && [ -f "$CRYPTFS_DROPBEAR_PUBKEY" ] ; then
install_readonly "${CRYPTFS_DROPBEAR_PUBKEY}" "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub >> "${ETC_DIR}"/dropbear-initramfs/authorized_keys
else
# Create key
chroot_exec /usr/bin/dropbearkey -t rsa -f /etc/dropbear-initramfs/id_rsa.dropbear
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Convert dropbear key to openssh key
chroot_exec /usr/lib/dropbear/dropbearconvert dropbear openssh /etc/dropbear-initramfs/id_rsa.dropbear /etc/dropbear-initramfs/id_rsa
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Get Public Key Part
chroot_exec /usr/bin/dropbearkey -y -f /etc/dropbear-initramfs/id_rsa.dropbear | chroot_exec tee /etc/dropbear-initramfs/id_rsa.pub
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Delete unwanted lines
sed -i '/Public/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
sed -i '/Fingerprint/d' "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Trust the new key
cat "${ETC_DIR}"/dropbear-initramfs/id_rsa.pub > "${ETC_DIR}"/dropbear-initramfs/authorized_keys
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Save Keys - convert with putty from rsa/openssh to puttkey
cp -f "${ETC_DIR}"/dropbear-initramfs/id_rsa "${BASEDIR}"/dropbear_initramfs_key.rsa
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Get unlock script
install_exec files/initramfs/crypt_unlock.sh "${ETC_DIR}"/initramfs-tools/hooks/crypt_unlock.sh
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Enable Dropbear inside initramfs
printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=y\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
Unknown
Dropbear initramfs...
r501
Unknown
formating and dropbear fix for static ip
r569 # Enable Dropbear inside initramfs
sed -i "54 i sleep 5" "${R}"/usr/share/initramfs-tools/scripts/init-premount/dropbear
fi
Unknown
Dropbear initramfs...
r501 else
# Disable SSHD inside initramfs
printf "#\n# DROPBEAR: [ y | n ]\n#\n\nDROPBEAR=n\n" >> "${ETC_DIR}/initramfs-tools/initramfs.conf"
fi
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141
drtyhlpr
fix: typos in DTB for all
r261 # Add cryptsetup modules to initramfs
printf "#\n# CRYPTSETUP: [ y | n ]\n#\n\nCRYPTSETUP=y\n" >> "${ETC_DIR}/initramfs-tools/conf-hook"
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141 # Dummy mapping required by mkinitramfs
Unknown
https://www.shellcheck.net/...
r336 echo "0 1 crypt $(echo "${CRYPTFS_CIPHER}" | cut -d ':' -f 1) ffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff 0 7:0 4096" | chroot_exec dmsetup create "${CRYPTFS_MAPPING}"
drtyhlpr
Updated: Moved fstab stuff to new file 14-fstab.sh
r141
# Generate initramfs with encrypted root partition support
chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
# Remove dummy mapping
chroot_exec cryptsetup close "${CRYPTFS_MAPPING}"
else
# Generate initramfs without encrypted root partition support
chroot_exec mkinitramfs -o "/boot/firmware/initramfs-${KERNEL_VERSION}" "${KERNEL_VERSION}"
fi
fi